Support Android 35

lucasnlm · Jul 6, 2024 · fc2be23 · fc2be23
1 parent bfa75a1
commit fc2be23
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 28 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -13,8 +13,8 @@ android {
 
     defaultConfig {
         // versionCode and versionName must be hardcoded to support F-droid
-        versionCode = 1706041
-        versionName = "17.6.4"
+        versionCode = 1707001
+        versionName = "17.7.0"
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
         compileSdk = libs.versions.compileSdk.get().toInt()

diff --git a/app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt b/app/src/main/java/dev/lucasnlm/antimine/GameActivity.kt
@@ -93,14 +93,15 @@ class GameActivity :
     }
 
     @SuppressLint("MissingSuperCall")
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
-        intent?.run(::handleIntent)
+        intent.run(::handleIntent)
 
         GameContext.zoom = 1.0f
         GameContext.zoomLevelAlpha = 1.0f
     }
 
+    @SuppressLint("DefaultLocale")
     private fun Int.toL10nString() = String.format("%d", this)
 
     private fun showGameWarning(
@@ -154,7 +155,7 @@ class GameActivity :
             when {
                 queryParamDifficulty != null -> {
                     val upperDifficulty = queryParamDifficulty.uppercase()
-                    val difficulty = Difficulty.values().firstOrNull { it.id == upperDifficulty }
+                    val difficulty = Difficulty.entries.firstOrNull { it.id == upperDifficulty }
                     if (difficulty == null) {
                         gameViewModel.loadLastGame()
                     } else {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,50 +1,50 @@
 [versions]
 minSdk = "21"
-targetSdk = "34"
+targetSdk = "35"
 wearTargetSdk = "33"
 wearMinSdk = "25"
-compileSdk = "34"
+compileSdk = "35"
 
 acra = "5.11.2"
-activityKtx = "1.8.1"
+activityKtx = "1.9.0"
 amplitude = "2.32.1"
-appcompat = "1.6.1"
-billingKtx = "6.1.0"
+appcompat = "1.7.0"
+billingKtx = "7.0.0"
 bugsnagAndroid = "5.31.2"
 constraintlayout = "2.1.4"
-coreKtx = "1.12.0"
-coreKtxVersion = "1.5.0"
-coreSplashscreen = "1.1.0-alpha02"
-espressoCore = "3.5.1"
-fragmentKtx = "1.6.2"
+coreKtx = "1.13.1"
+coreKtxVersion = "1.6.1"
+coreSplashscreen = "1.1.0-rc01"
+espressoCore = "3.6.1"
+fragmentKtx = "1.8.1"
 gdx = "1.12.1"
 google-coreKtx = "1.8.1"
 junit = "4.13.2"
-junitVersion = "1.1.5"
+junitVersion = "1.2.1"
 koinAndroid = "3.1.2"
 konfettiXml = "2.0.3"
 kotlinxCoroutinesCore = "1.7.3"
-lifecycleViewmodelKtx = "2.6.2"
-material = "1.10.0"
+lifecycleViewmodelKtx = "2.8.3"
+material = "1.12.0"
 mockitoCore = "4.6.1"
 mockitoKotlin = "2.1.0"
 mockk = "1.13.5"
 multidex = "2.0.1"
 okhttp = "4.10.0"
-orchestrator = "1.4.2"
-playServicesAds = "22.6.0"
-playServicesAuth = "20.7.0"
-playServicesGames = "23.1.0"
-playServicesInstantapps = "18.0.1"
+orchestrator = "1.5.0"
+playServicesAds = "23.2.0"
+playServicesAuth = "21.2.0"
+playServicesGames = "23.2.0"
+playServicesInstantapps = "18.1.0"
 preferenceKtx = "1.2.1"
 recyclerview = "1.3.2"
 robolectric = "4.5.1"
-runner = "1.5.2"
+runner = "1.6.1"
 
 # Plugins
-android = "8.1.4"
-kotlin = "1.9.20"
-googleServices = "4.4.0"
+android = "8.5.0"
+kotlin = "1.9.22"
+googleServices = "4.4.2"
 wear = "1.3.0"
 
 [libraries]

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Oct 07 16:06:38 BRT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists