yayan 9 months ago
parent
commit
bb43921a05

+ 3 - 2
app/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
     alias(libs.plugins.jetbrainsKotlinPluginSerialization)
     id("kotlin-parcelize")
     alias(libs.plugins.googleDevtoolsKsp)
+    alias(libs.plugins.kotlinCompose)
 }
 
 android {
@@ -17,12 +18,12 @@ android {
         }
     }
     namespace = "io.nexilis.alpha"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "io.nexilis.alpha"
         minSdk = 24
-        targetSdk = 34
+//        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
 

+ 1 - 0
build.gradle.kts

@@ -6,4 +6,5 @@ plugins {
     alias(libs.plugins.jetbrainsKotlinPluginSerialization) apply false
     alias(libs.plugins.googleDaggerHiltAndroid) apply false
     alias(libs.plugins.googleDevtoolsKsp) apply false
+    alias(libs.plugins.kotlinCompose) apply false
 }

+ 1 - 1
cpaas-lite/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 
 android {
     namespace = "io.nexilis.service"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 23

+ 16 - 16
cpaas-lite/src/main/java/io/nexilis/service/data/repositories/MessageRepository.kt

@@ -112,22 +112,22 @@ class MessageRepository @Inject constructor(
                                 }
                             }
                         }
-                    }
-                    if (workInfo.state.isFinished) {
-                        val messageId = workInfo.outputData.getString("message_id") ?: ""
-                        val pin = workInfo.outputData.getString("opposite_pin") ?: ""
-                        val status = workInfo.outputData.getInt("status", 0)
-                        Log.d(
-                            tag,
-                            "update from work:$messageId:$pin:$status"
-                        )
-                        apiScope.launch(Dispatchers.IO) {
-                            if (messageId.isNotEmpty()) {
-                                messageStatusDao.updateStatus(
-                                    status,
-                                    messageId = messageId,
-                                    pin = pin
-                                )
+                        if (workInfo.state.isFinished) {
+                            val messageId = workInfo.outputData.getString("message_id") ?: ""
+                            val pin = workInfo.outputData.getString("opposite_pin") ?: ""
+                            val status = workInfo.outputData.getInt("status", 0)
+                            Log.d(
+                                tag,
+                                "update from work:$messageId:$pin:$status"
+                            )
+                            apiScope.launch(Dispatchers.IO) {
+                                if (messageId.isNotEmpty()) {
+                                    messageStatusDao.updateStatus(
+                                        status,
+                                        messageId = messageId,
+                                        pin = pin
+                                    )
+                                }
                             }
                         }
                     }

+ 15 - 14
gradle/libs.versions.toml

@@ -1,27 +1,27 @@
 [versions]
 agp = "8.7.1"
-kotlin = "1.9.23"
-ksp = "1.9.23-1.0.20"
-coreKtx = "1.13.1"
+kotlin = "2.0.21"
+ksp = "2.0.21-1.0.26"
+coreKtx = "1.15.0"
 junit = "4.13.2"
-junitVersion = "1.1.5"
+junitVersion = "1.2.1"
 espressoCore = "3.6.1"
-lifecycleRuntimeKtx = "2.8.2"
-activityCompose = "1.9.0"
-composeBom = "2024.06.00"
+lifecycleRuntimeKtx = "2.8.7"
+activityCompose = "1.9.3"
+composeBom = "2024.10.01"
 hilt = "2.49"
 hiltNavigation = "1.2.0"
 gms = "4.3.15"
-navigation = "2.7.7"
+navigation = "2.8.3"
 coil = "2.6.0"
-constraintLayout = "1.0.1"
-paging = "3.3.0"
-serializationJson = "1.6.2"
-coroutines = "1.8.0"
+constraintLayout = "1.1.0"
+paging = "3.3.2"
+serializationJson = "1.7.3"
+coroutines = "1.9.0"
 exif = "1.3.7"
 room = "2.6.1"
 okhttp = "4.12.0"
-work = "2.9.0"
+work = "2.10.0"
 firebaseBom = "33.2.0"
 
 [libraries]
@@ -71,4 +71,5 @@ androidLibrary = { id = "com.android.library", version.ref = "agp" }
 jetbrainsKotlinPluginSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 googleDaggerHiltAndroid = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 googleDevtoolsKsp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
-googleGmsGoogleServices = { id = "com.google.gms.google-services", version.ref = "gms" }
+googleGmsGoogleServices = { id = "com.google.gms.google-services", version.ref = "gms" }
+kotlinCompose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }