Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
14 changes: 7 additions & 7 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ androidTargetSdk = "37"
agp = "9.2.1"
dokka = "2.2.0"
gradleMavenPublishPlugin = "0.36.0"
kotlin = "2.3.21"
kotlinxCoroutines = "1.10.2"
kotlin = "2.4.10"
kotlinxCoroutines = "1.11.0"

# Android
activitycompose = "1.13.0"
androidx-core = "1.18.0"
androidx-core = "1.19.0"
androidx-startup = "1.2.0"
compose-bom = "2026.03.00"
compose-bom = "2026.06.01"
constraintlayout = "2.2.1"

# Material
Expand All @@ -27,7 +27,7 @@ materialIconsExtendedAndroid = "1.7.8"

# Google Maps Platform
mapsecrets = "2.0.1"
mapsktx = "6.0.1"
mapsktx = "6.2.0"

# Testing
androidCore = "1.7.0"
Expand All @@ -36,8 +36,8 @@ espresso = "3.7.0"
junit = "4.13.2"
junitktx = "1.3.0"
leakcanaryAndroid = "2.14"
mockk = "1.14.9"
org-jacoco-core = "0.8.14"
mockk = "1.14.11"
org-jacoco-core = "0.8.15"
jacoco-plugin = "0.2.1"
robolectric = "4.16.1"
screenshot = "0.0.1-alpha14"
Expand Down
6 changes: 3 additions & 3 deletions maps-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

buildFeatures {
Expand All @@ -77,7 +77,7 @@ android {

kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_1_8)
jvmTarget.set(JvmTarget.JVM_11)
freeCompilerArgs.addAll(
"-opt-in=kotlin.RequiresOptIn"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -383,20 +383,8 @@ private enum class ClusteringType {
}

data class MyItem(
val itemPosition: LatLng,
val itemTitle: String,
val itemSnippet: String,
val itemZIndex: Float,
) : ClusterItem {
override fun getPosition(): LatLng =
itemPosition

override fun getTitle(): String =
itemTitle

override fun getSnippet(): String =
itemSnippet

override fun getZIndex(): Float =
itemZIndex
}
override val position: LatLng,
override val title: String,
override val snippet: String,
override val zIndex: Float,
) : ClusterItem
6 changes: 3 additions & 3 deletions maps-compose-utils/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

buildFeatures {
Expand All @@ -54,7 +54,7 @@ android {

kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_1_8)
jvmTarget.set(JvmTarget.JVM_11)
freeCompilerArgs.addAll(
"-Xexplicit-api=strict",
"-opt-in=kotlin.RequiresOptIn"
Expand Down
6 changes: 3 additions & 3 deletions maps-compose-widgets/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

buildFeatures {
Expand All @@ -62,7 +62,7 @@ android {

kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_1_8)
jvmTarget.set(JvmTarget.JVM_11)
freeCompilerArgs.addAll(
"-Xexplicit-api=strict",
"-opt-in=kotlin.RequiresOptIn"
Expand Down
6 changes: 3 additions & 3 deletions maps-compose/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

buildFeatures {
Expand All @@ -61,7 +61,7 @@ android {

kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_1_8)
jvmTarget.set(JvmTarget.JVM_11)
freeCompilerArgs.addAll(
"-Xexplicit-api=strict",
"-opt-in=kotlin.RequiresOptIn"
Expand Down
Loading