diff --git a/app/src/main/java/com/esri/arcgismaps/kotlin/sampleviewer/model/room/AppDatabase.kt b/app/src/main/java/com/esri/arcgismaps/kotlin/sampleviewer/model/room/AppDatabase.kt index e6d791ac9..43655573b 100644 --- a/app/src/main/java/com/esri/arcgismaps/kotlin/sampleviewer/model/room/AppDatabase.kt +++ b/app/src/main/java/com/esri/arcgismaps/kotlin/sampleviewer/model/room/AppDatabase.kt @@ -44,7 +44,7 @@ abstract class AppDatabase : RoomDatabase() { context.applicationContext, AppDatabase::class.java, "arcgis_maps_kotlin_samples_database" - ).fallbackToDestructiveMigration().build() + ).fallbackToDestructiveMigration(true).build() INSTANCE = instance instance } diff --git a/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/convention/AndroidCompose.kt b/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/convention/AndroidCompose.kt index feef379ec..be21e4159 100644 --- a/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/convention/AndroidCompose.kt +++ b/build-logic/convention/src/main/java/com/esri/arcgismaps/kotlin/build_logic/convention/AndroidCompose.kt @@ -16,7 +16,7 @@ internal fun Project.configureAndroidCompose( } composeOptions { - kotlinCompilerExtensionVersion = libs.findVersion("kotlinCompilerExt").get().toString() + kotlinCompilerExtensionVersion = libs.findVersion("kotlinVersion").get().toString() } dependencies { diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts index a0e8ee8d0..ca166af2d 100644 --- a/gradle-plugins/build.gradle.kts +++ b/gradle-plugins/build.gradle.kts @@ -18,5 +18,10 @@ gradlePlugin { } dependencies { - implementation(libs.kotlinx.serialization.json) + // `kotlin-dsl` applied here uses embedded Kotlin version 1.9.23 for gradle wrapper 8.9 + // https://docs.gradle.org/current/userguide/compatibility.html#kotlin + // This is needed as newer versions of kotlinx-serialization has been compiled using Kotlin 2.0+ + // https://github.com/Kotlin/kotlinx.serialization/releases + // Sample modules do not use kotlin-dsl, instead uses latest kotlin serialization from libs versions. + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3") } diff --git a/gradle.properties b/gradle.properties index ed515f7b7..dc86dce5a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,4 +23,3 @@ kotlin.code.style=official # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true -android.enableJetifier=true \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 35b8726c9..3909a1c86 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,28 +6,26 @@ arcgisMapsKotlinVersion = "200.8.0-4564" ### Android versions androidGradlePlugin = "8.7.3" lifecycle = "2.8.7" -androidTools = "31.7.3" +androidTools = "31.9.1" appcompat = "1.7.0" -constraintLayoutVersion = "2.2.0" -kotlinxSerializationJson = "1.6.0" +constraintLayoutVersion = "2.2.1" +kotlinxSerializationJson = "1.8.1" accompanistSystemuicontroller = "0.32.0" workVersion = "2.10.0" -datastorePreferences = "1.1.1" -roomVersion = "2.6.1" +datastorePreferences = "1.1.4" +roomVersion = "2.7.0" ### Kotlin versions -kotlinVersion = "2.0.0" -coreKtx = "1.15.0" -ktxActivity = "1.9.1" -ksp = "2.0.0-1.0.21" -kotlinCompilerExt = "1.5.12" -commonsIoVersion = "2.15.1" +kotlinVersion = "2.1.20" +coreKtx = "1.16.0" +ksp = "2.1.20-1.0.32" +commonsIoVersion = "2.18.0" ### Compose versions -composeBom = "2024.12.01" -activityCompose = "1.9.3" +composeBom = "2025.04.00" +activityCompose = "1.10.1" material = "1.12.0" -navigationCompose = "2.8.5" +navigationCompose = "2.8.9" ### Testing versions junit = "4.13.2" @@ -37,11 +35,11 @@ espressoCore = "3.6.1" ### Application Verions versionCode = "2008000" versionName = "200.8.0" -minSdk = "26" +minSdk = "28" targetSdk = "35" ### Third party libraries -arcore = "1.47.0" +arcore = "1.48.0" playServicesLocation = "21.3.0" [libraries]