Skip to content

Commit

Permalink
🚀 Release 1.3.2 (132002)
Browse files Browse the repository at this point in the history
• Update Dependencies
• Update Submodules
• Bump Java to 23
• Bump versionCode to 132002 (1.3.2)
• Update compileSdkPreview to Baklava (Android 16)
• Update buildToolsVersion to 36.0.0-rc1
  • Loading branch information
AkosPaha01 authored Nov 20, 2024
2 parents 66c376b + 1fd9328 commit 6981cb3
Show file tree
Hide file tree
Showing 16 changed files with 107 additions and 60 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

- uses: nttld/setup-ndk@v1
with:
ndk-version: r27
ndk-version: r27c

- name: Get Commit Message
id: commitMessage
Expand All @@ -34,7 +34,7 @@ jobs:
- name: Setup JDK
uses: actions/setup-java@v4
with:
java-version: 22
java-version: 23
distribution: temurin

- name: Cache Gradle dependencies
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
signingKey: ${{ secrets.SIGNING_KEY }}
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
buildToolsVersion: '35.0.0'
buildToolsVersion: '36.0.0-rc1'


- name: List files
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/playstore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:

- uses: nttld/setup-ndk@v1
with:
ndk-version: r27
ndk-version: r27c

- name: Setup JDK
uses: actions/setup-java@v4
with:
java-version: 22
java-version: 23
distribution: temurin

- name: Cache Gradle dependencies
Expand Down Expand Up @@ -57,11 +57,12 @@ jobs:
run: echo -n -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > /usr/local/lib/android/sdk/licenses/android-sdk-preview-license

- name: Build Bundle
id: buildBundle
uses: gradle/gradle-build-action@v3
id: buildAllApks
uses: gradle/actions/setup-gradle@v4
with:
gradle-version: wrapper
arguments: bundleRelease
gradle-version: wrapper
- name: bundleRelease the project
run: ./gradlew bundleRelease

- name: Sign artifact
id: signArtifact
Expand All @@ -72,7 +73,7 @@ jobs:
signingKey: ${{ secrets.SIGNING_KEY }}
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
buildToolsVersion: '35.0.0'
buildToolsVersion: '36.0.0-rc1'


- name: Upload Artifact
Expand Down
6 changes: 5 additions & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions .idea/deploymentTargetSelector.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 7 additions & 4 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/runConfigurations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 7 additions & 11 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import org.jetbrains.kotlin.config.JvmTarget

plugins {
id("com.android.application")
kotlin("kapt")
Expand All @@ -9,17 +7,17 @@ plugins {

android {
namespace = "de.dertyp7214.rboardthemecreator"
compileSdk = 35
compileSdkPreview = "Baklava"

buildToolsVersion = "35.0.0"
buildToolsVersion = "36.0.0 rc1"
buildFeatures.buildConfig = true

defaultConfig {
applicationId = "de.dertyp7214.rboardthemecreator"
minSdk = 26
targetSdk = 35
versionCode = 131004
versionName = "1.3.1"
versionCode = 132002
versionName = "1.3.2"

vectorDrawables.useSupportLibrary = true
}
Expand All @@ -39,12 +37,12 @@ android {
}
compileOptions {
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = JavaVersion.VERSION_22
targetCompatibility = JavaVersion.VERSION_22
sourceCompatibility = JavaVersion.current()
targetCompatibility = JavaVersion.current()
}

kotlinOptions {
jvmTarget = JvmTarget.JVM_22.toString()
jvmTarget = JavaVersion.current().toString()
freeCompilerArgs += listOf(
"-P",
"plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true",
Expand Down Expand Up @@ -77,8 +75,6 @@ dependencies {
implementation(libs.prdownloader)
implementation(libs.androidx.browser)
implementation(libs.androidx.webkit)
implementation(libs.preferencesplus)
implementation(libs.flagkit.android)
implementation(libs.pikolo)
implementation(libs.vectorchildfinder)
androidTestImplementation(libs.androidx.junit)
Expand Down
40 changes: 40 additions & 0 deletions app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<resources translatable="false">
<string name="app_name">منشئ ثيمات Rboard</string>
<string name="share_theme">مشاركة الثيم</string>
<string name="generate_theme">اصنع لي ثيم من فضلك</string>
<string name="dark">داكن</string>
<string name="share_generate_theme">هل يمكنك مشاركة ثيمي من فضلك؟</string>
<string name="monet">Monet</string>
<string name="tertiary">لون إضافي ثالث</string>
<string name="hide_secondary_label">إخفاء التسمية الثانوية</string>
<string name="amoled">أموليد</string>
<string name="unreleased">هذا التطبيق غير مُطلق، بعض الميزات قد لا تعمل. يرجى عدم الإبلاغ عن أي أخطاء في المجموعة الرئيسية.</string>
<string name="notice">إشعار</string>
<string name="update_ready">التحديث جاهز، هل تريد تثبيته؟</string>
<string name="update">تحديث</string>
<string name="install_gboard">هل تريد تثبيت Gboard؟</string>
<string name="gboard_not_installed">Gboard غير مثبت</string>
<string name="install_rboard">هل تريد تثبيت Rboard؟</string>
<string name="rboard_not_installed">Rboard غير مثبت</string>
<string name="default_notification_channel_id">قناة الإشعارات</string>
<string name="download_notification_channel_id">قناة تنزيل الإشعارات</string>
<string name="channel_name">إشعارات الدفع</string>
<string name="channel_description">للتحديثات والمعلومات.</string>
<string name="channel_name_download">إشعارات التنزيل</string>
<string name="channel_description_download">لإشعارات التنزيل</string>
<string name="download_update">جارٍ تنزيل التحديث</string>
<string name="download_update_progress">جارٍ تنزيل التحديث (%s)</string>
<string name="download_complete">اكتمل التنزيل</string>
<string name="download_error">خطأ أثناء التنزيل</string>
<string name="error">خطأ</string>
<string name="name">اسم الثيم</string>
<string name="addToManager">إضافة الثيم</string>
<string name="author">المؤلف</string>
<string name="colorWheel">عجلة الألوان</string>
<string name="hexPicker">اختيار HEX</string>
<string name="pickColor">اختر لونًا</string>
<string name="pick">اختر</string>
<string name="cancel">إلغاء</string>
<string name="hex">HEX</string>
<string name="template">قالب</string>
</resources>
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ buildscript {
classpath(libs.gradle)
classpath(libs.r8)
//noinspection DifferentKotlinGradleVersion
classpath(kotlin("gradle-plugin", version = "2.1.0-RC2"))
classpath(libs.kotlin.gradle.plugin)
}
}
Expand Down
2 changes: 1 addition & 1 deletion colorutilsc
40 changes: 18 additions & 22 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,40 +1,38 @@
[versions]
activity-ktx = "1.9.1"
activity-ktx = "1.10.0-beta01"
android-shell = "1.0.0"
appcompat = "1.7.0"
browser = "1.8.0"
commons-text = "1.12.0"
constraintlayout = "2.2.0-alpha14"
core = "1.13.1"
core-ktx = "1.13.1"
desugar_jdk_libs_nio = "2.1.0"
constraintlayout = "2.2.0"
core = "1.15.0"
core-ktx = "1.15.0"
desugar_jdk_libs_nio = "2.1.3"
espresso-core = "3.6.1"
firebase-bom = "33.2.0"
firebase-analytics-ktx = "22.1.0"
firebase-messaging-ktx = "24.0.1"
flagkit-android = "1.0.2"
fragment-ktx = "1.8.2"
firebase-bom = "33.6.0"
firebase-analytics-ktx = "22.1.2"
firebase-messaging-ktx = "24.1.0"
fragment-ktx = "1.8.5"
github-ksp = "5.0.0-SNAPSHOT"
gradle = "8.7.0-alpha07"
gradle = "8.9.0-alpha02"
gson = "2.11.0"
insetter = "0.6.1"
junit = "1.2.1"
junit-junit = "4.13.2"
kotlin-gradle-plugin = "2.0.20"
kotlin-reflect = "2.0.20"
kotlin-gradle-plugin = "2.1.0-RC2"
kotlin-reflect = "2.1.0-RC2"
material = "1.12.0"
navigation-ui-ktx = "2.8.0-rc01"
navigation-fragment-ktx = "2.8.0-rc01"
navigation-ui-ktx = "2.9.0-alpha03"
navigation-fragment-ktx = "2.9.0-alpha03"
legacy-support-v4 = "1.0.0"
pikolo = "2.0.2"
prdownloader = "v0.6.0"
preference-ktx = "1.2.1"
preferencesplus = "1.1"
r8 = "8.6.27"
r8 = "8.8.19"
simple-item-decoration = "1.0.0"
vectorchildfinder = "1.0.0"
webkit = "1.12.0-beta01"
kspPlugin = "2.0.20-1.0.24"
webkit = "1.13.0-alpha01"
kspPlugin = "2.1.0-RC2-1.0.28"

[libraries]
android-shell = { module = "com.jaredrummler:android-shell", version.ref = "android-shell" }
Expand All @@ -58,7 +56,6 @@ firebase-analytics = { module = "com.google.firebase:firebase-analytics", versio
firebase-analytics-ktx = { module = "com.google.firebase:firebase-analytics-ktx", version.ref = "firebase-analytics-ktx" }
firebase-messaging = { module = "com.google.firebase:firebase-messaging", version.ref = "firebase-messaging-ktx" }
firebase-messaging-ktx = { module = "com.google.firebase:firebase-messaging-ktx", version.ref = "firebase-messaging-ktx" }
flagkit-android = { module = "com.github.murgupluoglu:flagkit-android", version.ref = "flagkit-android" }
glide = { module = "com.github.bumptech.glide:glide", version.ref = "github-ksp" }
glide-ksp = { module = "com.github.bumptech.glide:ksp", version.ref = "github-ksp" }
gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
Expand All @@ -71,11 +68,10 @@ kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "
material = { module = "com.google.android.material:material", version.ref = "material" }
pikolo = { module = "com.github.madrapps:pikolo", version.ref = "pikolo" }
prdownloader = { module = "de.dertyp7214:PRDownloader", version.ref = "prdownloader" }
preferencesplus = { module = "de.dertyp7214:PreferencesPlus", version.ref = "preferencesplus" }
r8 = { module = "com.android.tools:r8", version.ref = "r8" }
simple-item-decoration = { module = "com.bignerdranch.android:simple-item-decoration", version.ref = "simple-item-decoration" }
vectorchildfinder = { module = "com.github.devsideal:VectorChildFinder", version.ref = "vectorchildfinder" }
firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebase-bom" }

[plugins]
ksp = { id = "com.google.devtools.ksp", version.ref = "kspPlugin" }
ksp = { id = "com.google.devtools.ksp", version.ref = "kspPlugin" }
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Aug 27 20:34:15 CEST 2024
#Wed Nov 20 13:12:21 CET 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rootProject.name = "Rboard Theme Creator"
include ':app'
include ':colorutilsc'
include ':rboardcomponents'
include(":app")
include(":colorutilsc")
include(":rboardcomponents")

0 comments on commit 6981cb3

Please sign in to comment.