update deps, compile/target android vers

pebble-dev · Nov 12, 2024 · 39192af · 39192af
1 parent 94589c3
commit 39192af
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -30,7 +30,7 @@ android {
     if (System.getenv("ANDROID_NDK_HOME") != null) {
         ndkPath = System.getenv("ANDROID_NDK_HOME")
     }
-    compileSdk = 34
+    compileSdk = 35
 
     sourceSets {
         getByName("main") {
@@ -45,7 +45,7 @@ android {
     defaultConfig {
         applicationId = "io.rebble.cobble"
         minSdk = 29
-        targetSdk = 34
+        targetSdk = 35
         versionCode = flutterVersionCode.toInt()
         versionName = flutterVersionName
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

diff --git a/android/app/src/main/kotlin/io/rebble/cobble/log/LogSendingTask.kt b/android/app/src/main/kotlin/io/rebble/cobble/log/LogSendingTask.kt
@@ -63,7 +63,7 @@ private fun generateDebugInfo(context: Context, rwsId: String): String {
         null
     }
     val allowedPermissions = context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_PERMISSIONS)
-            .requestedPermissions.map {
+            .requestedPermissions?.map {
                 it to (context.checkSelfPermission(it) == PackageManager.PERMISSION_GRANTED)
             }
     return """
@@ -82,7 +82,7 @@ private fun generateDebugInfo(context: Context, rwsId: String): String {
     RWS ID:
     $rwsId
     Allowed Permissions:
-    ${allowedPermissions.joinToString("\n") { (permission, result) -> "$permission: $result" }}
+    ${allowedPermissions?.joinToString("\n") { (permission, result) -> "$permission: $result" }}
     Notification listening enabled: ${context.hasNotificationAccessPermission()}
     """.trimIndent()
 }

diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
@@ -1,41 +1,41 @@
 [versions]
-activityCompose = "1.9.2"
+activityCompose = "1.9.3"
 android-minSdk = "29"
 android-targetSdk = "34"
-androidxVersion = "1.13.1"
+androidxVersion = "1.15.0"
 coroutinesVersion = "1.8.1"
 daggerVersion = "2.51.1"
 gradle = "8.7.2"
-koinVersion = "4.0.0-RC2"
-kotlin = "2.0.20-Beta2"
+koinVersion = "4.0.0"
+kotlin = "2.1.0-RC"
 kotlinxDatetime = "0.6.0"
 kotlinxSerializationJson = "1.7.1"
-ksp = "2.0.20-Beta2-1.0.23"
+ksp = "2.1.0-RC-1.0.27"
 libpebblecommonVersion = "0.1.26"
 errorproneVersion = "2.26.1"
 rruleVersion = "1.0.3"
 spotbugsVersion = "4.8.6"
 atomicfu = "0.25.0"
 
 protoliteWellKnownTypes = "18.0.0"
-room = "2.7.0-alpha08"
-room-sqlite = "2.5.0-alpha08"
+room = "2.7.0-alpha11"
+room-sqlite = "2.5.0-alpha11"
 datastore = "1.1.1"
-androidxTest = "1.6.1"
+androidxTest = "1.7.2"
 timberVersion = "5.0.1"
 uuidVersion = "0.8.4"
-compose-lib = "1.7.0-beta02"
-compose-nav = "2.7.0-alpha07"
+compose-lib = "1.7.0"
+compose-nav = "2.8.0-alpha08"
 compose-viewmodel = "2.8.0"
 reorderable = "2.3.3"
 
 appcompat = "1.7.0"
 ktorVersion = "2.3.12"
-workManagerVersion = "2.9.0"
+workManagerVersion = "2.10.0"
 junit = "4.13.2"
 junitVersion = "1.2.1"
 espressoCore = "3.6.1"
-material = "1.10.0"
+material = "1.12.0"
 
 [plugins]
 multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }