Merge branch 'dev'

Author: denny0223

app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "app.opass.ccip"
         minSdk = 24
         targetSdk = 36
-        versionCode = 60
-        versionName = "3.9.0"
+        versionCode = 61
+        versionName = "3.9.1"
 
         manifestPlaceholders["manifestApplicationId"] = "$applicationId"
     }
@@ -27,7 +27,7 @@ android {
         release {
             isMinifyEnabled = false
             proguardFiles(
-                getDefaultProguardFile("proguard-android.txt"),
+                getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro",
             )
         }
@@ -43,10 +43,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
-
     lint {
         lintConfig = file("lint.xml")
     }
@@ -56,6 +52,12 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+    }
+}
+
 dependencies {
 
     // AndroidX

gradle.properties

@@ -18,3 +18,13 @@ org.gradle.configuration-cache=true
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+android.defaults.buildfeatures.resvalues=true
+android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
+android.enableAppCompileTimeRClass=false
+android.usesSdkInManifest.disallowed=false
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.r8.optimizedResourceShrinking=false
+android.builtInKotlin=false
+android.newDsl=false

gradle/libs.versions.toml

@@ -1,26 +1,26 @@
 [versions]
-androidGradlePlugin = "8.12.0"
+androidGradlePlugin = "9.2.0"
 appcompat = "1.7.1"
 cardview = "1.0.0"
-coil = "3.3.0"
+coil = "3.4.0"
 constraintlayout = "2.2.1"
 converterGson = "3.0.0"
-core = "1.16.0"
+core = "1.18.0"
 coroutinesVersion = "1.10.2"
 firebaseAnalytics = "22.5.0"
 flexbox = "3.0.0"
-fragment = "1.8.8"
-gson = "2.13.1"
-kotlin = "2.2.0"
-lifecycleVersion = "2.9.2"
+fragment = "1.8.9"
+gson = "2.14.0"
+kotlin = "2.2.10"
+lifecycleVersion = "2.10.0"
 markwonVersion = "4.6.2"
-material = "1.12.0"
-okhttp = "5.1.0"
-onesignal = "5.1.35"
-playServices = "4.4.3"
+material = "1.13.0"
+okhttp = "5.3.2"
+onesignal = "5.8.0"
+playServices = "4.4.4"
 recyclerview = "1.4.0"
 retrofit = "3.0.0"
-swiperefreshlayout = "1.1.0"
+swiperefreshlayout = "1.2.0"
 viewpager2 = "1.1.0"
 zxingAndroidEmbedded = "4.3.0"
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,8 +1,8 @@
 #Wed Aug 06 14:17:58 CST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME