Skip to content

Sample Viewer: Update dependencies #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 24, 2025
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ internal fun Project.configureAndroidCompose(
}

composeOptions {
kotlinCompilerExtensionVersion = libs.findVersion("kotlinCompilerExt").get().toString()
kotlinCompilerExtensionVersion = libs.findVersion("kotlinVersion").get().toString()
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.arcgismaps

import kotlinx.serialization.encodeToString
import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.json.Json
import org.gradle.api.Plugin
import org.gradle.api.Project
Expand All @@ -16,7 +16,12 @@ import java.io.File
*/
class CopySampleFilesTask : Plugin<Project> {

private val json = Json { prettyPrint = true }
@OptIn(ExperimentalSerializationApi::class)
private val json = Json {
prettyPrint = true
@Suppress("JsonIgnoreUnknownKeys")
explicitNulls = false
}

override fun apply(project: Project) {
project.tasks.register<Copy>("copyCodeFiles") {
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
30 changes: 14 additions & 16 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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]
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 3 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Mon Nov 04 09:26:16 PST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading