From 31ddb8693adad46704a59adb7c4dad28b65260f2 Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@westnordost.de>
Date: Thu, 23 May 2024 19:08:16 +0200
Subject: [PATCH] update kotlin + gradle + agp

---
 app/build.gradle.kts                                       | 7 ++-----
 .../streetcomplete/quests/smoothness/SmoothnessItem.kt     | 2 +-
 build.gradle.kts                                           | 4 ++--
 buildSrc/build.gradle.kts                                  | 4 ++--
 gradle/wrapper/gradle-wrapper.properties                   | 2 +-
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 10edc6bdd9..5ea291eba5 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -5,7 +5,8 @@ import java.util.Properties
 plugins {
     id("com.android.application")
     kotlin("android")
-    kotlin("plugin.serialization") version "1.9.23"
+    kotlin("plugin.serialization") version "2.0.0"
+    kotlin("plugin.compose") version "2.0.0"
 }
 
 android {
@@ -69,10 +70,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.12"
-    }
-
     bundle {
         language {
             enableSplit = false // because language is selectable in-app
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/smoothness/SmoothnessItem.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/smoothness/SmoothnessItem.kt
index 8a796bc298..858eecc82d 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/smoothness/SmoothnessItem.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/smoothness/SmoothnessItem.kt
@@ -49,7 +49,7 @@ fun Smoothness.asItem(context: Context, surface: String): DisplayItem<Smoothness
 }
 
 /** return fitting vehicle type emoji that corresponds to the "usable by" column in the wiki */
-val Smoothness.icon get(): @DrawableRes Int = when (this) {
+val Smoothness.icon @DrawableRes get(): Int = when (this) {
     EXCELLENT ->     R.drawable.ic_smoothness_skateboard
     GOOD ->          R.drawable.ic_smoothness_scooter
     INTERMEDIATE ->  R.drawable.ic_smoothness_city_bike
diff --git a/build.gradle.kts b/build.gradle.kts
index d5fda83b3d..ac51a90f51 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,8 +4,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        val kotlinVersion = "1.9.23"
-        classpath("com.android.tools.build:gradle:8.3.2")
+        val kotlinVersion = "2.0.0"
+        classpath("com.android.tools.build:gradle:8.4.1")
         classpath(kotlin("gradle-plugin", version = kotlinVersion))
     }
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index bcdec54493..a0783bad8c 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -8,8 +8,8 @@ dependencies {
     implementation("de.westnordost:countryboundaries:2.1")
     implementation("com.esotericsoftware.yamlbeans:yamlbeans:1.15")
     implementation("org.jsoup:jsoup:1.15.3")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
-    implementation("com.charleskorn.kaml:kaml:0.58.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
+    implementation("com.charleskorn.kaml:kaml:0.59.0")
     implementation("org.jetbrains:markdown:0.7.0")
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 36c9baf650..cbf1b3ea9f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME