Debug Release 3.9.2 (392006)

🔧 New dependencies changes: • Update Activity(-ktx) to 1.9.0 • Update Browser to 1.8.0 • Update Commons-text to 1.12.0 • Update Core(-ktx) to 1.13.0 • Update Gradle to 8.5.0-alpha06 • Update Firebase-bom to 32.8.1 • Update Firebase-analytics(-ktx) to 21.6.2 • Update Fragment(-ktx) to 1.8.0-alpha02 • Update Kotlin to 1.9.23 • Update Ui-tooling to 1.6.6 🗂️ Others Changes: • Update versionCode to 392006 (3.9.2) • Update buildToolsVersion to 35.0.0-rc3 • Update Gradle to 8.7 • Update Workflow File • Fix Theme Changer Crash Below Android 15 • Improve Hungarian Translation
DerTyp7214 · Apr 23, 2024 · 4b95fe8 · 4b95fe8
2 parents a2fb448 + d5d8b18
commit 4b95fe8
Show file tree

Hide file tree

Showing 13 changed files with 134 additions and 117 deletions.
diff --git a/.github/workflows/buildCi.yml b/.github/workflows/buildCi.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r26c
+          ndk-version: r26d
 
       - name: Get Commit Message
         id: commitMessage
@@ -31,7 +31,7 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 20
+          java-version: 21
           distribution: temurin
 
       - name: Cache Gradle dependencies
@@ -85,7 +85,7 @@ jobs:
           signingKey: ${{ secrets.SIGNING_KEY }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
-          buildToolsVersion: '35.0.0-rc1'
+          buildToolsVersion: '35.0.0-rc3'
 
       - name: Delete old APK
         run: rm app/build/outputs/apk/debug/app-debug.apk

diff --git a/.github/workflows/buildPro.yml b/.github/workflows/buildPro.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 20
+          java-version: 21
           distribution: temurin
 
       - name: Cache Gradle dependencies
@@ -74,7 +74,7 @@ jobs:
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
         env:
-          buildToolsVersion: '35.0.0-rc1'
+          buildToolsVersion: '35.0.0-rc3'
 
       - name: List files
         run: ls app/build/outputs/apk/pro

diff --git a/.github/workflows/buildRelease.yml b/.github/workflows/buildRelease.yml
@@ -24,7 +24,7 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r26c
+          ndk-version: r26d
 
       - name: Get Commit Message
         id: commitMessage
@@ -33,7 +33,7 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 20
+          java-version: 21
           distribution: temurin
 
       - name: Cache Gradle dependencies
@@ -89,7 +89,7 @@ jobs:
           signingKey: ${{ secrets.SIGNING_KEY }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
-          buildToolsVersion: '35.0.0-rc1'
+          buildToolsVersion: '35.0.0-rc3'
 
       - name: List files
         run: ls app/build/outputs/apk/release

diff --git a/.github/workflows/deployToGoogle.yml b/.github/workflows/deployToGoogle.yml
@@ -25,12 +25,12 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r26c
+          ndk-version: r26d
 
       - name: Setup JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 20
+          java-version: 21
           distribution: temurin
 
       - name: Cache Gradle dependencies
@@ -75,7 +75,7 @@ jobs:
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
         env:
-          buildToolsVersion: '35.0.0-rc1'
+          buildToolsVersion: '35.0.0-rc3'
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml
@@ -23,12 +23,12 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r26c
+          ndk-version: r26d
 
       - name: Setup JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 20
+          java-version: 21
           distribution: temurin
 
       - name: Cache Gradle dependencies

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -13,7 +13,7 @@ plugins {
 }
 
 android {
-    buildToolsVersion = "35.0.0 rc1"
+    buildToolsVersion = "35.0.0 rc3"
     compileSdkPreview = "VanillaIceCream"
     buildFeatures.dataBinding = true
     buildFeatures.viewBinding = true
@@ -25,7 +25,7 @@ android {
         applicationId = "de.dertyp7214.rboardthememanager"
         minSdk = 31
         targetSdk = 34
-        versionCode = 392002
+        versionCode = 392006
         versionName = "3.9.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -55,16 +55,16 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_20
-        targetCompatibility = JavaVersion.VERSION_20
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
     kotlinOptions {
-        jvmTarget = JvmTarget.JVM_20.description
+        jvmTarget = JvmTarget.JVM_21.description
     }
 
     tasks.withType<KotlinCompile> {
         kotlinOptions {
-            jvmTarget = JvmTarget.JVM_20.description
+            jvmTarget = JvmTarget.JVM_21.description
         }
     }
 

diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt
@@ -7,6 +7,7 @@ import android.content.Intent
 import android.content.Intent.ACTION_SEND
 import android.graphics.RenderEffect
 import android.graphics.Shader
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.View
@@ -123,7 +124,11 @@ class MainActivity : AppCompatActivity() {
         }
 
         fun popInstance() {
-            instances.removeLast().finish()
+            if (Build.VERSION.SDK_INT >= 35) {
+                instances.removeLast().finish()
+            } else {
+                instances.removeLastOrNull()?.finish()
+            }
         }
     }
 

diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/PreferencesActivity.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/PreferencesActivity.kt
@@ -1,6 +1,7 @@
 package de.dertyp7214.rboardthememanager.screens
 
 import android.annotation.SuppressLint
+import android.os.Build
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
@@ -33,7 +34,11 @@ class PreferencesActivity : AppCompatActivity() {
         }
 
         fun popInstance() {
-            instances.removeLast().finish()
+            if (Build.VERSION.SDK_INT >= 35) {
+                instances.removeLast().finish()
+            } else {
+                instances.removeLastOrNull()?.finish()
+            }
         }
     }