Upgraded dependencies (Kotlin 2.0.0-RC2, Compose 1.6.10-rc01, Kilua-R…

…PC 0.0.8, Javaling 6.1.4, Micronaut 4.4.2, Trix 6.2.1, cssnano 7.0.1)
rjaros · May 6, 2024 · 00b8788 · 00b8788
1 parent ac43aee
commit 00b8788
Show file tree

Hide file tree

Showing 42 changed files with 553 additions and 2,332 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     `kotlin-dsl` apply false
     alias(libs.plugins.kotlinx.serialization) apply false
     alias(libs.plugins.compose) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.npm.publish) apply false
     alias(libs.plugins.detekt) apply false
     alias(libs.plugins.dokka)

diff --git a/examples/bootstrap-form/build.gradle.kts b/examples/bootstrap-form/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
     id("org.jetbrains.compose")
+    kotlin("plugin.compose")
     alias(libs.plugins.kilua)
 }
 
@@ -61,8 +62,3 @@ kotlin {
         }
     }
 }
-
-compose {
-    kotlinCompilerPlugin.set(libs.versions.compose.plugin)
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlin.get()}")
-}
diff --git a/examples/fullstack-ktor-koin/build.gradle.kts b/examples/fullstack-ktor-koin/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
     id("org.jetbrains.compose")
+    kotlin("plugin.compose")
     alias(libs.plugins.kilua.rpc)
     alias(libs.plugins.kilua)
 }
@@ -95,10 +96,12 @@ kotlin {
     }
 }
 
-compose {
-    platformTypes.set(platformTypes.get() - KotlinPlatformType.jvm)
-    kotlinCompilerPlugin.set(libs.versions.compose.plugin)
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlin.get()}")
+composeCompiler {
+    targetKotlinPlatforms.set(
+        KotlinPlatformType.values()
+            .filterNot { it == KotlinPlatformType.jvm }
+            .asIterable()
+    )
 }
 
 dependencies {

diff --git a/examples/hello-world/build.gradle.kts b/examples/hello-world/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
     id("org.jetbrains.compose")
+    kotlin("plugin.compose")
     alias(libs.plugins.kilua)
 }
 
@@ -59,8 +60,3 @@ kotlin {
         }
     }
 }
-
-compose {
-    kotlinCompilerPlugin.set(libs.versions.compose.plugin)
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlin.get()}")
-}
diff --git a/examples/js-framework-benchmark/build.gradle.kts b/examples/js-framework-benchmark/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
     id("org.jetbrains.compose")
+    kotlin("plugin.compose")
     alias(libs.plugins.kilua)
 }
 
@@ -59,8 +60,3 @@ kotlin {
         }
     }
 }
-
-compose {
-    kotlinCompilerPlugin.set(libs.versions.compose.plugin)
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlin.get()}")
-}
diff --git a/examples/playground/build.gradle.kts b/examples/playground/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
     id("org.jetbrains.compose")
+    kotlin("plugin.compose")
     alias(libs.plugins.kilua)
 }
 
@@ -75,8 +76,3 @@ kotlin {
         }
     }
 }
-
-compose {
-    kotlinCompilerPlugin.set(libs.versions.compose.plugin)
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlin.get()}")
-}
diff --git a/examples/realworld/build.gradle.kts b/examples/realworld/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
     id("org.jetbrains.compose")
+    kotlin("plugin.compose")
     alias(libs.plugins.kilua.rpc)
     alias(libs.plugins.kilua)
 }
@@ -94,8 +95,10 @@ kotlin {
     }
 }
 
-compose {
-    platformTypes.set(platformTypes.get() - KotlinPlatformType.jvm)
-    kotlinCompilerPlugin.set(libs.versions.compose.plugin)
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlin.get()}")
+composeCompiler {
+    targetKotlinPlatforms.set(
+        KotlinPlatformType.values()
+            .filterNot { it == KotlinPlatformType.jvm }
+            .asIterable()
+    )
 }
diff --git a/examples/resources/build.gradle.kts b/examples/resources/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
     id("org.jetbrains.compose")
+    kotlin("plugin.compose")
     alias(libs.plugins.kilua)
 }
 
@@ -67,6 +68,4 @@ compose {
     experimental {
         web.application {}
     }
-    kotlinCompilerPlugin.set(libs.versions.compose.plugin)
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlin.get()}")
 }
diff --git a/examples/ssr-javalin/build.gradle.kts b/examples/ssr-javalin/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
     id("org.jetbrains.compose")
+    kotlin("plugin.compose")
     alias(libs.plugins.kilua.rpc)
     alias(libs.plugins.kilua)
 }
@@ -88,9 +89,11 @@ kotlin {
     }
 }
 
-compose {
-    platformTypes.set(platformTypes.get() - KotlinPlatformType.jvm)
-    kotlinCompilerPlugin.set(libs.versions.compose.plugin)
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlin.get()}")
+composeCompiler {
+    targetKotlinPlatforms.set(
+        KotlinPlatformType.values()
+            .filterNot { it == KotlinPlatformType.jvm }
+            .asIterable()
+    )
 }
 
diff --git a/examples/ssr-jooby/build.gradle.kts b/examples/ssr-jooby/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
     id("org.jetbrains.compose")
+    kotlin("plugin.compose")
     alias(libs.plugins.jooby)
     alias(libs.plugins.kilua.rpc)
     alias(libs.plugins.kilua)
@@ -91,10 +92,12 @@ kotlin {
     }
 }
 
-compose {
-    platformTypes.set(platformTypes.get() - KotlinPlatformType.jvm)
-    kotlinCompilerPlugin.set(libs.versions.compose.plugin)
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlin.get()}")
+composeCompiler {
+    targetKotlinPlatforms.set(
+        KotlinPlatformType.values()
+            .filterNot { it == KotlinPlatformType.jvm }
+            .asIterable()
+    )
 }
 
 tasks {

diff --git a/examples/ssr-jooby/gradle.properties b/examples/ssr-jooby/gradle.properties
@@ -1 +1,2 @@
 kotlin.mpp.applyDefaultHierarchyTemplate=false
+kotlin.mpp.enableResourcesPublication=false
diff --git a/examples/ssr-ktor/build.gradle.kts b/examples/ssr-ktor/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
     id("org.jetbrains.compose")
+    kotlin("plugin.compose")
     alias(libs.plugins.kilua.rpc)
     alias(libs.plugins.kilua)
 }
@@ -90,8 +91,10 @@ kotlin {
     }
 }
 
-compose {
-    platformTypes.set(platformTypes.get() - KotlinPlatformType.jvm)
-    kotlinCompilerPlugin.set(libs.versions.compose.plugin)
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlin.get()}")
+composeCompiler {
+    targetKotlinPlatforms.set(
+        KotlinPlatformType.values()
+            .filterNot { it == KotlinPlatformType.jvm }
+            .asIterable()
+    )
 }
diff --git a/examples/ssr-micronaut/build.gradle.kts b/examples/ssr-micronaut/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
     id("org.jetbrains.compose")
+    kotlin("plugin.compose")
     kotlin("plugin.allopen") version libs.versions.kotlin.get()
     kotlin("kapt")
     alias(libs.plugins.shadow)
@@ -161,8 +162,18 @@ dependencies {
     "kapt"("io.micronaut.validation:micronaut-validation")
 }
 
-compose {
-    platformTypes.set(platformTypes.get() - KotlinPlatformType.jvm)
-    kotlinCompilerPlugin.set(libs.versions.compose.plugin)
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlin.get()}")
+composeCompiler {
+    targetKotlinPlatforms.set(
+        KotlinPlatformType.values()
+            .filterNot { it == KotlinPlatformType.jvm }
+            .asIterable()
+    )
+}
+
+tasks.getByName("inspectRuntimeClasspath") {
+    dependsOn(
+        "prepareComposeResourcesTaskForJvmMain",
+        "copyNonXmlValueResourcesForJvmMain",
+        "convertXmlValueResourcesForJvmMain"
+    )
 }
diff --git a/examples/ssr-micronaut/gradle.properties b/examples/ssr-micronaut/gradle.properties
@@ -1 +1,2 @@
 kotlin.mpp.applyDefaultHierarchyTemplate=false
+kotlin.mpp.enableResourcesPublication=false
diff --git a/examples/ssr-spring-boot/build.gradle.kts b/examples/ssr-spring-boot/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
     kotlin("plugin.serialization")
     kotlin("plugin.spring") version libs.versions.kotlin.get()
     id("org.jetbrains.compose")
+    kotlin("plugin.compose")
     alias(libs.plugins.spring.dependency.management)
     alias(libs.plugins.spring.boot)
     alias(libs.plugins.kilua.rpc)
@@ -92,8 +93,10 @@ kotlin {
     }
 }
 
-compose {
-    platformTypes.set(platformTypes.get() - KotlinPlatformType.jvm)
-    kotlinCompilerPlugin.set(libs.versions.compose.plugin)
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlin.get()}")
+composeCompiler {
+    targetKotlinPlatforms.set(
+        KotlinPlatformType.values()
+            .filterNot { it == KotlinPlatformType.jvm }
+            .asIterable()
+    )
 }
diff --git a/examples/ssr-spring-boot/gradle.properties b/examples/ssr-spring-boot/gradle.properties
@@ -1 +1,2 @@
 kotlin.mpp.applyDefaultHierarchyTemplate=false
+kotlin.mpp.enableResourcesPublication=false
diff --git a/examples/ssr-vertx/build.gradle.kts b/examples/ssr-vertx/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
     id("org.jetbrains.compose")
+    kotlin("plugin.compose")
     alias(libs.plugins.shadow)
     alias(libs.plugins.vertx)
     alias(libs.plugins.kilua.rpc)
@@ -91,10 +92,12 @@ kotlin {
     }
 }
 
-compose {
-    platformTypes.set(platformTypes.get() - KotlinPlatformType.jvm)
-    kotlinCompilerPlugin.set(libs.versions.compose.plugin)
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlin.get()}")
+composeCompiler {
+    targetKotlinPlatforms.set(
+        KotlinPlatformType.values()
+            .filterNot { it == KotlinPlatformType.jvm }
+            .asIterable()
+    )
 }
 
 vertx {

diff --git a/examples/ssr-vertx/gradle.properties b/examples/ssr-vertx/gradle.properties
@@ -1 +1,2 @@
 kotlin.mpp.applyDefaultHierarchyTemplate=false
+kotlin.mpp.enableResourcesPublication=false
diff --git a/examples/todomvc/build.gradle.kts b/examples/todomvc/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
     id("org.jetbrains.compose")
+    kotlin("plugin.compose")
     alias(libs.plugins.kilua)
 }
 
@@ -60,8 +61,3 @@ kotlin {
         }
     }
 }
-
-compose {
-    kotlinCompilerPlugin.set(libs.versions.compose.plugin)
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlin.get()}")
-}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,29 +1,28 @@
 [versions]
 kilua = "0.0.3"
 kilua-published = "0.0.3"
-kotlin = "2.0.0-RC1"
-compose = "1.6.2"
-compose-plugin = "1.5.11-kt-2.0.0-RC1"
+kotlin = "2.0.0-RC2"
+compose = "1.6.10-rc01"
 dokka = "1.9.20"
 nmcp = "0.0.7"
-ksp = "2.0.0-RC1-1.0.20"
+ksp = "2.0.0-RC2-1.0.20"
 detekt = "1.23.6"
 npm-publish = "3.4.2"
 gradle-plugin-publish = "1.2.1"
-kilua-rpc = "0.0.7"
+kilua-rpc = "0.0.8"
 kilua-gettext = "0.0.2"
 kotlinx-atomicfu = "0.23.2"
 kotlinx-coroutines = "1.8.1-Beta"
 kotlinx-serialization = "1.6.3"
 kotlinx-datetime = "0.6.0-RC.2"
-javalin = "6.1.3"
+javalin = "6.1.4"
 jooby = "3.0.10"
 ktor = "2.3.10"
 koin-annotations = "1.3.1"
-micronaut = "4.4.1"
-micronaut-plugins = "4.3.7"
+micronaut = "4.4.2"
+micronaut-plugins = "4.3.8"
 spring-boot = "3.2.5"
-spring-dependency-management = "1.1.4"
+spring-dependency-management = "1.1.5"
 vertx = "4.5.7"
 vertx-plugin = "1.4.0"
 shadow = "8.1.1"
@@ -41,12 +40,12 @@ popperjs-core = "2.11.8"
 bootstrap = "5.3.3"
 bootstrap-icons = "1.11.3"
 fontawesome = "6.5.2"
-trix = "2.1.0"
+trix = "2.1.1"
 toastify = "1.12.0"
 tempus-dominus = "6.9.6"
 tom-select = "2.3.1"
 imask = "7.6.0"
-tabulator = "6.2.0"
+tabulator = "6.2.1"
 rsup-progress = "3.2.0"
 lz-string = "1.5.0"
 marked = "12.0.2"
@@ -55,7 +54,7 @@ postcss = "8.4.38"
 postcss-loader = "8.1.1"
 autoprefixer = "10.4.19"
 tailwindcss = "3.4.3"
-cssnano = "7.0.0"
+cssnano = "7.0.1"
 mini-css-extract-plugin = "2.9.0"
 
 [libraries]
@@ -91,8 +90,9 @@ expiring-map = { module = "net.jodah:expiringmap", version.ref = "expiring-map"
 kilua-gettext = { module = "dev.kilua:kilua-gettext", version.ref = "kilua-gettext" }
 
 [plugins]
-compose = { id = "org.jetbrains.compose", version.ref = "compose" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+compose = { id = "org.jetbrains.compose", version.ref = "compose" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 npm-publish = { id = "dev.petuska.npm.publish", version.ref = "npm-publish" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		kotlin.mpp.applyDefaultHierarchyTemplate=false
		kotlin.mpp.enableResourcesPublication=false