Resolve Gradle warnings, downgrade AGP

afarber · afarber · commit 382226d6286f · 2025-10-28T15:35:00.000+01:00
diff --git a/README.md b/README.md
@@ -47,6 +47,7 @@ Explore the example applications to see OpenMapView in action:
 - [Example06Clicks](examples/Example06Clicks) - Map click and long-click listeners
 - [Example07DraggableMarkers](examples/Example07DraggableMarkers) - Draggable markers with drag event listeners
 - [Example08Circles](examples/Example08Circles) - Circles with various radii, styling, and z-index ordering
+- [Example09Overlays](examples/Example09Overlays) - Tile overlays with transparency control (OpenSeaMap, OpenRailwayMap, Hiking Trails, OpenSnowMap)
 
 ![Example05Camera Demo](examples/Example05Camera/screenshot.gif)
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,9 +1,13 @@
 // Auto-detect version from Git tag (e.g., "v0.2.0" -> "0.2.0")
 fun getGitVersion(): String {
-    val process = Runtime.getRuntime().exec("git describe --tags --abbrev=0")
+    val process = ProcessBuilder("git", "describe", "--tags", "--abbrev=0")
+        .redirectOutput(ProcessBuilder.Redirect.PIPE)
+        .redirectError(ProcessBuilder.Redirect.PIPE)
+        .start()
+    process.waitFor()
     val output = process.inputStream.bufferedReader().readText().trim()
     val cleanVersion = output.removePrefix("v")
-    return if (cleanVersion.isNotEmpty()) cleanVersion else "0.0.1-SNAPSHOT"
+    return cleanVersion.ifEmpty { "0.0.1-SNAPSHOT" }
 }
 
 ext["libVersion"] = try {
@@ -14,13 +18,13 @@ ext["libVersion"] = try {
 }
 
 plugins {
-    id("com.android.library") version "8.13.0" apply false
-    id("com.android.application") version "8.13.0" apply false
-    id("org.jetbrains.kotlin.android") version "2.0.21" apply false
-    id("org.jetbrains.kotlin.plugin.compose") version "2.0.21" apply false
-    id("com.diffplug.spotless") version "6.25.0" apply false
+    id("com.android.library") version "8.11.1" apply false
+    id("com.android.application") version "8.11.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.21" apply false
+    id("org.jetbrains.kotlin.plugin.compose") version "2.2.21" apply false
+    id("com.diffplug.spotless") version "8.0.0" apply false
     id("org.jetbrains.dokka") version "2.1.0" apply false
-    id("com.gradleup.nmcp.aggregation") version "0.1.2"
+    id("com.gradleup.nmcp.aggregation") version "1.2.0"
 }
 
 nmcpAggregation {
diff --git a/examples/Example01Pan/build.gradle.kts b/examples/Example01Pan/build.gradle.kts
@@ -28,8 +28,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+        }
     }
 
     buildFeatures {
@@ -65,7 +67,7 @@ spotless {
         )
         trimTrailingWhitespace()
         endWithNewline()
-        indentWithSpaces(4)
+        leadingTabsToSpaces(4)
         licenseHeaderFile(rootProject.file("spotless.license.kt"), "(package|import)")
     }
     kotlinGradle {
diff --git a/examples/Example02Zoom/build.gradle.kts b/examples/Example02Zoom/build.gradle.kts
@@ -28,8 +28,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+        }
     }
 
     buildFeatures {
@@ -65,7 +67,7 @@ spotless {
         )
         trimTrailingWhitespace()
         endWithNewline()
-        indentWithSpaces(4)
+        leadingTabsToSpaces(4)
         licenseHeaderFile(rootProject.file("spotless.license.kt"), "(package|import)")
     }
     kotlinGradle {
diff --git a/examples/Example03Markers/build.gradle.kts b/examples/Example03Markers/build.gradle.kts
@@ -28,8 +28,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+        }
     }
 
     buildFeatures {
@@ -65,7 +67,7 @@ spotless {
         )
         trimTrailingWhitespace()
         endWithNewline()
-        indentWithSpaces(4)
+        leadingTabsToSpaces(4)
         licenseHeaderFile(rootProject.file("spotless.license.kt"), "(package|import)")
     }
     kotlinGradle {
diff --git a/examples/Example04Polylines/build.gradle.kts b/examples/Example04Polylines/build.gradle.kts
@@ -28,8 +28,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+        }
     }
 
     buildFeatures {
@@ -65,7 +67,7 @@ spotless {
         )
         trimTrailingWhitespace()
         endWithNewline()
-        indentWithSpaces(4)
+        leadingTabsToSpaces(4)
         licenseHeaderFile(rootProject.file("spotless.license.kt"), "(package|import)")
     }
     kotlinGradle {
diff --git a/examples/Example05Camera/build.gradle.kts b/examples/Example05Camera/build.gradle.kts
@@ -28,8 +28,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+        }
     }
 
     buildFeatures {
@@ -65,7 +67,7 @@ spotless {
         )
         trimTrailingWhitespace()
         endWithNewline()
-        indentWithSpaces(4)
+        leadingTabsToSpaces(4)
         licenseHeaderFile(rootProject.file("spotless.license.kt"), "(package|import)")
     }
     kotlinGradle {
diff --git a/examples/Example06Clicks/build.gradle.kts b/examples/Example06Clicks/build.gradle.kts
@@ -28,8 +28,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+        }
     }
 
     buildFeatures {
@@ -65,7 +67,7 @@ spotless {
         )
         trimTrailingWhitespace()
         endWithNewline()
-        indentWithSpaces(4)
+        leadingTabsToSpaces(4)
         licenseHeaderFile(rootProject.file("spotless.license.kt"), "(package|import)")
     }
     kotlinGradle {
diff --git a/examples/Example07DraggableMarkers/build.gradle.kts b/examples/Example07DraggableMarkers/build.gradle.kts
@@ -28,8 +28,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+        }
     }
 
     buildFeatures {
@@ -65,7 +67,7 @@ spotless {
         )
         trimTrailingWhitespace()
         endWithNewline()
-        indentWithSpaces(4)
+        leadingTabsToSpaces(4)
         licenseHeaderFile(rootProject.file("spotless.license.kt"), "(package|import)")
     }
     kotlinGradle {
diff --git a/examples/Example08Circles/build.gradle.kts b/examples/Example08Circles/build.gradle.kts
@@ -28,8 +28,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+        }
     }
 
     buildFeatures {
@@ -65,7 +67,7 @@ spotless {
         )
         trimTrailingWhitespace()
         endWithNewline()
-        indentWithSpaces(4)
+        leadingTabsToSpaces(4)
         licenseHeaderFile(rootProject.file("spotless.license.kt"), "(package|import)")
     }
     kotlinGradle {
diff --git a/examples/Example09Overlays/README.md b/examples/Example09Overlays/README.md
@@ -2,6 +2,8 @@
 
 This example demonstrates the tile overlay system in OpenMapView, showing how to add multiple tile layers on top of the base map from public OpenStreetMap services.
 
+![Example09Overlays Demo](screenshot.gif)
+
 ## Features Demonstrated
 
 - Multiple tile overlays from public OSM services
diff --git a/examples/Example09Overlays/build.gradle.kts b/examples/Example09Overlays/build.gradle.kts
@@ -28,8 +28,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+        }
     }
 
     buildFeatures {
@@ -65,7 +67,7 @@ spotless {
         )
         trimTrailingWhitespace()
         endWithNewline()
-        indentWithSpaces(4)
+        leadingTabsToSpaces(4)
         licenseHeaderFile(rootProject.file("spotless.license.kt"), "(package|import)")
     }
     kotlinGradle {
diff --git a/examples/Example09Overlays/screenshot.gif b/examples/Example09Overlays/screenshot.gif
diff --git a/examples/Example09Overlays/src/main/kotlin/de/afarber/openmapview/example09overlays/MainActivity.kt b/examples/Example09Overlays/src/main/kotlin/de/afarber/openmapview/example09overlays/MainActivity.kt
@@ -19,7 +19,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
@@ -202,28 +201,30 @@ fun MapViewScreen() {
         Card(
             modifier =
             Modifier
-                .align(Alignment.TopCenter)
-                .fillMaxWidth()
-                .padding(16.dp),
-            elevation = CardDefaults.cardElevation(defaultElevation = 8.dp),
+                .align(Alignment.TopEnd)
+                .padding(12.dp),
+            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
         ) {
             Column(
-                modifier = Modifier.padding(16.dp),
-                verticalArrangement = Arrangement.spacedBy(8.dp),
+                modifier = Modifier
+                    .padding(12.dp),
+                verticalArrangement = Arrangement.spacedBy(4.dp),
             ) {
                 Text(
                     text = "Tile Overlays",
-                    style = MaterialTheme.typography.titleMedium,
+                    style = MaterialTheme.typography.titleSmall,
                 )
 
                 // Overlay toggles
                 overlays.forEachIndexed { index, state ->
                     Row(
-                        modifier = Modifier.fillMaxWidth(),
                         horizontalArrangement = Arrangement.SpaceBetween,
                         verticalAlignment = Alignment.CenterVertically,
                     ) {
-                        Text(text = state.name)
+                        Text(
+                            text = state.name,
+                            style = MaterialTheme.typography.bodySmall,
+                        )
                         Switch(
                             checked = state.isVisible,
                             onCheckedChange = { enabled ->
@@ -233,12 +234,12 @@ fun MapViewScreen() {
                     }
                 }
 
-                Spacer(modifier = Modifier.height(8.dp))
+                Spacer(modifier = Modifier.height(4.dp))
 
                 // Transparency slider
                 Text(
                     text = "Transparency: ${(transparency * 100).toInt()}%",
-                    style = MaterialTheme.typography.bodyMedium,
+                    style = MaterialTheme.typography.bodySmall,
                 )
                 Slider(
                     value = transparency,
diff --git a/openmapview/build.gradle.kts b/openmapview/build.gradle.kts
@@ -27,8 +27,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+        }
     }
 
     sourceSets {
@@ -50,6 +52,13 @@ android {
             enableUnitTestCoverage = true
         }
     }
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
 }
 
 dependencies {
@@ -84,7 +93,7 @@ spotless {
         ktlint("1.3.1")
         trimTrailingWhitespace()
         endWithNewline()
-        indentWithSpaces(4)
+        leadingTabsToSpaces(4)
         licenseHeaderFile(rootProject.file("spotless.license.kt"), "(package|import)")
     }
     kotlinGradle {

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,10 @@ android {`
`28`	`28`	`targetCompatibility = JavaVersion.VERSION_17`
`29`	`29`	`}`
`30`	`30`
`31`		`- kotlinOptions {`
`32`		`- jvmTarget = "17"`
	`31`	`+ kotlin {`
	`32`	`+ compilerOptions {`
	`33`	`+ jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)`
	`34`	`+ }`
`33`	`35`	`}`
`34`	`36`
`35`	`37`	`buildFeatures {`
`@@ -65,7 +67,7 @@ spotless {`
`65`	`67`	`)`
`66`	`68`	`trimTrailingWhitespace()`
`67`	`69`	`endWithNewline()`
`68`		`- indentWithSpaces(4)`
	`70`	`+ leadingTabsToSpaces(4)`
`69`	`71`	`licenseHeaderFile(rootProject.file("spotless.license.kt"), "(package\|import)")`
`70`	`72`	`}`
`71`	`73`	`kotlinGradle {`