Quellcode durchsuchen

upgrade gradle + agp

yayan vor 9 Monaten
Ursprung
Commit
6c0bd55d36

+ 4 - 0
app/build.gradle.kts

@@ -94,6 +94,10 @@ dependencies {
     ksp(libs.com.google.hilt.android.compiler)
     implementation(libs.androidx.hilt.navigation)
 
+    implementation(platform(libs.firebase.bom))
+    implementation(libs.firebase.messaging)
+    implementation(libs.firebase.analytics)
+
     implementation(project(":cpaas-lite"))
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)

+ 1 - 1
app/src/main/java/io/nexilis/alpha/ui/main/Profile.kt

@@ -153,7 +153,7 @@ fun Profile(contentPadding: PaddingValues = PaddingValues(0.dp), me: Buddy) {
             headlineContent = { Text("Version", style = MaterialTheme.typography.bodySmall) },
             supportingContent = {
                 Text(
-                    Api.version(),
+                    Api.version() ?: "",
                     style = MaterialTheme.typography.titleMedium
                 )
             },

+ 3 - 3
cpaas-lite/src/main/java/io/nexilis/service/Api.kt

@@ -156,12 +156,12 @@ class Api {
             }
         }
 
-        fun version(): String {
-            return nuSDKService.getInstance(pass).sGetVersion()
+        fun version(): String? {
+            return nuSDKService.getInstance(pass)?.sGetVersion()
         }
 
         fun isConnected(): Boolean {
-            return nuSDKService.getInstance(pass).nGetCLXConnState() == 1.toByte()
+            return nuSDKService.getInstance(pass)?.nGetCLXConnState() == 1.toByte()
         }
     }
 }

+ 4 - 3
gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.1.2"
+agp = "8.7.1"
 kotlin = "1.9.23"
 ksp = "1.9.23-1.0.20"
 coreKtx = "1.13.1"
@@ -11,7 +11,7 @@ activityCompose = "1.9.0"
 composeBom = "2024.06.00"
 hilt = "2.49"
 hiltNavigation = "1.2.0"
-gms = "4.3.14"
+gms = "4.3.15"
 navigation = "2.7.7"
 coil = "2.6.0"
 constraintLayout = "1.0.1"
@@ -22,7 +22,7 @@ exif = "1.3.7"
 room = "2.6.1"
 okhttp = "4.12.0"
 work = "2.9.0"
-firebaseBom = "32.7.2"
+firebaseBom = "33.2.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -62,6 +62,7 @@ okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhtt
 androidx-work = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "work" }
 firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebaseBom" }
 firebase-messaging = { group = "com.google.firebase", name = "firebase-messaging-ktx" }
+firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }

+ 2 - 2
gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Aug 08 11:29:53 WIB 2024
+#Thu Oct 31 14:13:46 WIB 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists