Upgrade to Kotlin 2.2.20

core/api/core.api

@@ -20,7 +20,7 @@ public final class dev/fritz2/core/Id {
 public abstract interface class dev/fritz2/core/Inspector {
 	public abstract fun getData ()Ljava/lang/Object;
 	public abstract fun getPath ()Ljava/lang/String;
-	public abstract fun map (Ldev/fritz2/core/Lens;)Ldev/fritz2/core/Inspector;
+	public fun map (Ldev/fritz2/core/Lens;)Ldev/fritz2/core/Inspector;
 }
 
 public final class dev/fritz2/core/Inspector$DefaultImpls {
@@ -40,12 +40,12 @@ public final class dev/fritz2/core/InspectorKt {
 }
 
 public abstract interface class dev/fritz2/core/Lens {
-	public abstract fun apply (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun apply (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun get (Ljava/lang/Object;)Ljava/lang/Object;
 	public abstract fun getId ()Ljava/lang/String;
-	public abstract fun plus (Ldev/fritz2/core/Lens;)Ldev/fritz2/core/Lens;
+	public fun plus (Ldev/fritz2/core/Lens;)Ldev/fritz2/core/Lens;
 	public abstract fun set (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun withNullParent ()Ldev/fritz2/core/Lens;
+	public fun withNullParent ()Ldev/fritz2/core/Lens;
 }
 
 public final class dev/fritz2/core/Lens$DefaultImpls {

examples/masterdetail/build.gradle.kts

@@ -1,5 +1,3 @@
-import com.google.devtools.ksp.gradle.KspTask
-import com.google.devtools.ksp.gradle.KspTaskMetadata
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 plugins {
@@ -24,6 +22,7 @@ kotlin {
                 implementation(project(":core"))
                 implementation(KotlinX.serialization.json)
             }
+            kotlin.srcDir("build/generated/ksp/metadata/commonMain/kotlin")
         }
         jvmMain {
             dependencies {
@@ -36,6 +35,12 @@ kotlin {
     }
 }
 
-// KSP support for Lens generation
-dependencies.kspCommonMainMetadata(project(":lenses-annotation-processor"))
-kotlin.sourceSets.commonMain { tasks.withType<KspTaskMetadata> { kotlin.srcDir(destinationDirectory) } }
+dependencies {
+    add("kspCommonMainMetadata", project(":lenses-annotation-processor"))
+}
+
+project.tasks.withType(KotlinCompilationTask::class.java).configureEach {
+    if(name != "kspCommonMainKotlinMetadata") {
+        dependsOn("kspCommonMainKotlinMetadata")
+    }
+}

examples/nestedmodel/build.gradle.kts

@@ -1,5 +1,3 @@
-import com.google.devtools.ksp.gradle.KspTask
-import com.google.devtools.ksp.gradle.KspTaskMetadata
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 plugins {
@@ -23,6 +21,7 @@ kotlin {
             dependencies {
                 implementation(project(":core"))
             }
+            kotlin.srcDir("build/generated/ksp/metadata/commonMain/kotlin")
         }
         jvmMain {
             dependencies {
@@ -35,6 +34,12 @@ kotlin {
     }
 }
 
-// KSP support for Lens generation
-dependencies.kspCommonMainMetadata(project(":lenses-annotation-processor"))
-kotlin.sourceSets.commonMain { tasks.withType<KspTaskMetadata> { kotlin.srcDir(destinationDirectory) } }
+dependencies {
+    add("kspCommonMainMetadata", project(":lenses-annotation-processor"))
+}
+
+project.tasks.withType(KotlinCompilationTask::class.java).configureEach {
+    if(name != "kspCommonMainKotlinMetadata") {
+        dependsOn("kspCommonMainKotlinMetadata")
+    }
+}

examples/tictactoe/build.gradle.kts

@@ -1,5 +1,4 @@
-import com.google.devtools.ksp.gradle.KspTask
-import com.google.devtools.ksp.gradle.KspTaskMetadata
+
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 plugins {
@@ -29,6 +28,7 @@ kotlin {
             dependencies {
                 implementation(project(":core"))
             }
+            kotlin.srcDir("build/generated/ksp/metadata/commonMain/kotlin")
         }
         jsMain {
             dependencies {
@@ -37,6 +37,12 @@ kotlin {
     }
 }
 
-// KSP support for Lens generation
-dependencies.kspCommonMainMetadata(project(":lenses-annotation-processor"))
-kotlin.sourceSets.commonMain { tasks.withType<KspTaskMetadata> { kotlin.srcDir(destinationDirectory) } }
+dependencies {
+    add("kspCommonMainMetadata", project(":lenses-annotation-processor"))
+}
+
+project.tasks.withType(KotlinCompilationTask::class.java).configureEach {
+    if(name != "kspCommonMainKotlinMetadata") {
+        dependsOn("kspCommonMainKotlinMetadata")
+    }
+}

examples/todomvc/build.gradle.kts

@@ -1,5 +1,4 @@
-import com.google.devtools.ksp.gradle.KspTask
-import com.google.devtools.ksp.gradle.KspTaskMetadata
+
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 plugins {
@@ -24,6 +23,7 @@ kotlin {
             dependencies {
                 implementation(project(":core"))
             }
+            kotlin.srcDir("build/generated/ksp/metadata/commonMain/kotlin")
         }
         jsMain {
             dependencies {
@@ -32,6 +32,12 @@ kotlin {
     }
 }
 
-// KSP support for Lens generation
-dependencies.kspCommonMainMetadata(project(":lenses-annotation-processor"))
-kotlin.sourceSets.commonMain { tasks.withType<KspTaskMetadata> { kotlin.srcDir(destinationDirectory) } }
+dependencies {
+    add("kspCommonMainMetadata", project(":lenses-annotation-processor"))
+}
+
+project.tasks.withType(KotlinCompilationTask::class.java).configureEach {
+    if(name != "kspCommonMainKotlinMetadata") {
+        dependsOn("kspCommonMainKotlinMetadata")
+    }
+}

examples/validation/build.gradle.kts

@@ -1,5 +1,4 @@
-import com.google.devtools.ksp.gradle.KspTask
-import com.google.devtools.ksp.gradle.KspTaskMetadata
+
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 plugins {
@@ -24,6 +23,7 @@ kotlin {
                 implementation(project(":core"))
                 implementation(KotlinX.datetime)
             }
+            kotlin.srcDir("build/generated/ksp/metadata/commonMain/kotlin")
         }
         jvmMain {
             dependencies {
@@ -36,6 +36,12 @@ kotlin {
     }
 }
 
-// KSP support for Lens generation
-dependencies.kspCommonMainMetadata(project(":lenses-annotation-processor"))
-kotlin.sourceSets.commonMain { tasks.withType<KspTaskMetadata> { kotlin.srcDir(destinationDirectory) } }
+dependencies {
+    add("kspCommonMainMetadata", project(":lenses-annotation-processor"))
+}
+
+project.tasks.withType(KotlinCompilationTask::class.java).configureEach {
+    if(name != "kspCommonMainKotlinMetadata") {
+        dependsOn("kspCommonMainKotlinMetadata")
+    }
+}

examples/validation/src/commonMain/kotlin/dev/fritz2/examples/validation/Validator.kt

@@ -3,6 +3,7 @@ package dev.fritz2.examples.validation
 import dev.fritz2.core.Lens
 import dev.fritz2.validation.ValidationMessage
 import dev.fritz2.validation.validation
+import kotlin.time.Clock
 import kotlinx.datetime.*
 
 enum class Status(val inputClass: String, val messageClass: String) {
@@ -14,6 +15,7 @@ data class Message(override val path: String, val status: Status, val text: Stri
     override val isError: Boolean = status > Status.Valid
 }
 
+@kotlin.time.ExperimentalTime
 val personValidator = validation<Person, Message> { inspector ->
     // validate name
     val name = inspector.map(Person.name())

examples/validation/src/jsMain/kotlin/dev/fritz2/examples/validation/Validation.kt

@@ -11,13 +11,15 @@ import kotlinx.dom.addClass
 import kotlinx.dom.removeClass
 import org.w3c.dom.HTMLDivElement
 import org.w3c.dom.get
+import kotlin.time.ExperimentalTime
 
 object PersonListStore : RootStore<List<Person>>(emptyList(), job = Job()) {
     val add = handle<Person> { list, person ->
         list + person
     }
 }
 
+@OptIn(ExperimentalTime::class)
 object PersonStore : ValidatingStore<Person, Unit, Message>(
     Person(), personValidator, Unit, Job(), id = Person.id
 ) {

headless-demo/build.gradle.kts

@@ -1,4 +1,4 @@
-import com.google.devtools.ksp.gradle.KspTaskMetadata
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 plugins {
     kotlin("multiplatform")
@@ -7,7 +7,7 @@ plugins {
 
 kotlin {
     jvm() // needed for kspCommonMainMetadata
-    
+
     js(IR) {
         browser()
     }.binaries.executable()
@@ -22,6 +22,7 @@ kotlin {
             dependencies {
                 implementation(project(":headless"))
             }
+            kotlin.srcDir("build/generated/ksp/metadata/commonMain/kotlin")
         }
         jsMain {
             dependencies {
@@ -41,6 +42,12 @@ kotlin {
     }
 }
 
-// KSP support for Lens generation
-dependencies.kspCommonMainMetadata(project(":lenses-annotation-processor"))
-kotlin.sourceSets.commonMain { tasks.withType<KspTaskMetadata> { kotlin.srcDir(destinationDirectory) } }
+dependencies {
+    add("kspCommonMainMetadata", project(":lenses-annotation-processor"))
+}
+
+project.tasks.withType(KotlinCompilationTask::class.java).configureEach {
+    if(name != "kspCommonMainKotlinMetadata") {
+        dependsOn("kspCommonMainKotlinMetadata")
+    }
+}