Target Android 15

LiveTL · Aug 11, 2024 · 0135f83 · 0135f83
1 parent 4fd6276
commit 0135f83
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
@@ -80,6 +80,6 @@ jobs:
           serviceAccountJsonPlainText: ${{ secrets.GOOGLE_PLAY_SERVICE_ACCOUNT_JSON }}
           packageName: com.livetl.android
           releaseFiles: ${{ env.SIGNED_RELEASE_FILE }}
-          mappingFile: app/build/outputs/mapping/playstoreRelease/mapping.txt
+          # mappingFile: app/build/outputs/mapping/playstoreRelease/mapping.txt
           track: ${{ env.GOOGLE_PLAY_TRACK }}
           whatsNewDirectory: distribution/whatsnew
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -15,13 +15,13 @@ plugins {
 val appPackageName = "com.livetl.android"
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = appPackageName
 
     defaultConfig {
         applicationId = appPackageName
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 301
         versionName = "9.0.0"
     }
@@ -72,14 +72,14 @@ android {
     }
 }
 
+val jvmTarget = 17
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(jvmTarget))
     }
 }
-
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(jvmTarget)
 }
 
 dependencies {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -47,7 +47,7 @@ hilt-gradle = { module = "com.google.dagger:hilt-android-gradle-plugin", version
 hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt_version" }
 hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt_version" }
 
-navigation-compose = "androidx.navigation:navigation-compose:2.8.0-beta06"
+navigation-compose = "androidx.navigation:navigation-compose:2.8.0-beta07"
 hilt-navigation = "androidx.hilt:hilt-navigation-compose:1.2.0"
 
 logcat = { module = "com.squareup.logcat:logcat", version = "0.1" }