Merge pull request #848 from jwstegemann/jamowei/gradle

Use Kotlin default hierarchy template
jwstegemann · Jan 16, 2024 · 3e92c28 · 3e92c28
2 parents 107771a + 73249d1
commit 3e92c28
Show file tree

Hide file tree

Showing 18 changed files with 47 additions and 78 deletions.
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -12,21 +12,6 @@ kotlin {
             dependsOn(":test-server:start")
             // see "karma.config.d" folder for customizing karma
         }
-        // just to have a place to copy it from...
-        /*
-        runTask {
-            devServer?.apply {
-                port = 9000
-                proxy?.apply {
-                    put("/members", "http://localhost:8080")
-                    put("/chat", mapOf(
-                        "target" to "ws://localhost:8080",
-                        "ws" to true
-                    ))
-                }
-            }
-        }
-        */
     }
     sourceSets {
         all {
@@ -36,25 +21,25 @@ kotlin {
                 optIn("kotlinx.coroutines.FlowPreview")
             }
         }
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 api(KotlinX.coroutines.core)
             }
         }
-        val commonTest by getting {
+        commonTest {
             dependencies {
                 implementation(Kotlin.test)
                 implementation(Kotlin.test.common)
                 implementation(Kotlin.test.junit)
                 implementation(Kotlin.test.annotationsCommon)
             }
         }
-        val jsMain by getting {
+        jsMain {
             dependencies {
                 api(KotlinX.coroutines.core)
             }
         }
-        val jsTest by getting {
+        jsTest {
             dependencies {
                 implementation(Kotlin.test.js)
                 implementation(KotlinX.serialization.json)

diff --git a/examples/gettingstarted/build.gradle.kts b/examples/gettingstarted/build.gradle.kts
@@ -13,12 +13,12 @@ kotlin {
     }.binaries.executable()
 
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(project(":core"))
             }
         }
-        val jsMain by getting {
+        jsMain {
             dependencies {
             }
         }

diff --git a/examples/masterdetail/build.gradle.kts b/examples/masterdetail/build.gradle.kts
@@ -15,17 +15,17 @@ kotlin {
     }.binaries.executable()
 
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(project(":core"))
                 implementation(KotlinX.serialization.json)
             }
         }
-        val jvmMain by getting {
+        jvmMain {
             dependencies {
             }
         }
-        val jsMain by getting {
+        jsMain {
             dependencies {
             }
         }

diff --git a/examples/nestedmodel/build.gradle.kts b/examples/nestedmodel/build.gradle.kts
@@ -15,16 +15,16 @@ kotlin {
     }.binaries.executable()
 
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(project(":core"))
             }
         }
-        val jvmMain by getting {
+        jvmMain {
             dependencies {
             }
         }
-        val jsMain by getting {
+        jsMain {
             dependencies {
             }
         }

diff --git a/examples/performance/build.gradle.kts b/examples/performance/build.gradle.kts
@@ -4,7 +4,6 @@ plugins {
 }
 
 repositories {
-    mavenLocal()
     mavenCentral()
 }
 
@@ -14,12 +13,12 @@ kotlin {
     }.binaries.executable()
 
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(project(":core"))
             }
         }
-        val jsMain by getting {
+        jsMain {
             dependencies {
             }
         }

diff --git a/examples/remote/build.gradle.kts b/examples/remote/build.gradle.kts
@@ -13,12 +13,12 @@ kotlin {
     }.binaries.executable()
 
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(project(":core"))
             }
         }
-        val jsMain by getting {
+        jsMain {
             dependencies {
             }
         }

diff --git a/examples/routing/build.gradle.kts b/examples/routing/build.gradle.kts
@@ -13,12 +13,12 @@ kotlin {
     }.binaries.executable()
 
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(project(":core"))
             }
         }
-        val jsMain by getting {
+        jsMain {
             dependencies {
             }
         }

diff --git a/examples/tictactoe/build.gradle.kts b/examples/tictactoe/build.gradle.kts
@@ -12,21 +12,21 @@ kotlin {
     jvm() // needed for kspCommonMainMetadata
     js(IR) {
         browser {
-            webpackTask(Action {
+            webpackTask {
                 cssSupport {
                     enabled.set(true)
                 }
-            })
+            }
         }
     }.binaries.executable()
 
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(project(":core"))
             }
         }
-        val jsMain by getting {
+        jsMain {
             dependencies {
             }
         }

diff --git a/examples/todomvc/build.gradle.kts b/examples/todomvc/build.gradle.kts
@@ -16,12 +16,12 @@ kotlin {
     }.binaries.executable()
 
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(project(":core"))
             }
         }
-        val jsMain by getting {
+        jsMain {
             dependencies {
             }
         }

diff --git a/examples/validation/build.gradle.kts b/examples/validation/build.gradle.kts
@@ -15,17 +15,17 @@ kotlin {
     }.binaries.executable()
 
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(project(":core"))
                 implementation(KotlinX.datetime)
             }
         }
-        val jvmMain by getting {
+        jvmMain {
             dependencies {
             }
         }
-        val jsMain by getting {
+        jsMain {
             dependencies {
             }
         }

diff --git a/examples/webcomponent/build.gradle.kts b/examples/webcomponent/build.gradle.kts
@@ -14,12 +14,12 @@ kotlin {
     }.binaries.executable()
 
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(project(":core"))
             }
         }
-        val jsMain by getting {
+        jsMain {
             dependencies {
                 implementation(npm("@mat3e-ux/stars", "0.2.5"))
             }

diff --git a/headless-demo/build.gradle.kts b/headless-demo/build.gradle.kts
@@ -15,12 +15,12 @@ kotlin {
                 optIn("kotlin.ExperimentalStdlibApi")
             }
         }
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(project(":headless"))
             }
         }
-        val jsMain by getting {
+        jsMain {
             dependencies {
                 // tailwind
                 implementation(npm("tailwindcss", "_"))

diff --git a/headless/build.gradle.kts b/headless/build.gradle.kts
@@ -15,21 +15,6 @@ kotlin {
 //                usePhantomJS()
             }
         }
-        // just to have a place to copy it from...
-        /*
-        runTask {
-            devServer?.apply {
-                port = 9000
-                proxy?.apply {
-                    put("/members", "http://localhost:8080")
-                    put("/chat", mapOf(
-                        "target" to "ws://localhost:8080",
-                        "ws" to true
-                    ))
-                }
-            }
-        }
-        */
     }
     sourceSets {
         all {
@@ -38,18 +23,18 @@ kotlin {
                 optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
             }
         }
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 api(project(":core"))
             }
         }
-        val jsMain by getting {
+        jsMain {
             dependencies {
                 api(npm("@floating-ui/dom","_"))
                 api(npm("scroll-into-view-if-needed", "_"))
             }
         }
-        val jsTest by getting {
+        jsTest {
             dependencies {
                 implementation(Kotlin.test.js)
             }

diff --git a/lenses-annotation-processor/build.gradle.kts b/lenses-annotation-processor/build.gradle.kts
@@ -10,16 +10,16 @@ ksp {
 }
 
 kotlin {
+    js(IR) {
+        browser()
+    }.binaries.executable()
     jvm {
         testRuns["test"].executionTask.configure {
             useJUnitPlatform()
         }
     }
-    js(IR) {
-        browser()
-    }.binaries.executable()
     sourceSets {
-        val jvmMain by getting {
+        jvmMain {
             dependencies {
                 api(kotlin("stdlib"))
                 api(project(":core"))
@@ -32,7 +32,7 @@ kotlin {
             }
         }
 
-        val jvmTest by getting {
+        jvmTest {
             dependencies {
                 implementation(Kotlin.test.junit5)
                 implementation(Testing.junit.jupiter.params)

diff --git a/serialization/build.gradle.kts b/serialization/build.gradle.kts
@@ -8,7 +8,7 @@ kotlin {
     jvm()
     js(IR).browser { }
     sourceSets {
-        val jsMain by getting {
+        jsMain {
             dependencies {
                 api(project(":core"))
                 api(KotlinX.serialization.json)

diff --git a/snippets/build.gradle.kts b/snippets/build.gradle.kts
@@ -13,7 +13,7 @@ kotlin {
                 optIn("kotlin.ExperimentalStdlibApi")
             }
         }
-        val jsMain by getting {
+        jsMain {
             dependencies {
                 implementation(project(":core"))
                 // tailwind

diff --git a/www/src/pages/docs/10_Getting Started.md b/www/src/pages/docs/10_Getting Started.md
@@ -23,9 +23,9 @@ To use fritz2, set up a Kotlin multiplatform-project using one of these options:
 
 ```kotlin
 plugins {
-    kotlin("multiplatform") version "1.9.20"
+    kotlin("multiplatform") version "1.9.22"
     // KSP support needed for Lens generation
-    id("com.google.devtools.ksp") version "1.9.20-1.0.14"
+    id("com.google.devtools.ksp") version "1.9.22-1.0.16"
 }
 
 repositories {
@@ -44,17 +44,17 @@ kotlin {
     }.binaries.executable()
 
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation("dev.fritz2:core:$fritz2Version")
                 // implementation("dev.fritz2:headless:$fritz2Version") // optional headless comp
             }
         }
-        val jvmMain by getting {
+        jvmMain {
             dependencies {
             }
         }
-        val jsMain by getting {
+        jsMain {
             dependencies {
             }
         }

diff --git a/www/src/pages/headless/headlessComponents.md b/www/src/pages/headless/headlessComponents.md
@@ -41,7 +41,7 @@ In order to use headless components in your project, replace the dependency to t
 kotlin {
     // ...
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 // always add the dependency to headless in the commonMain section
                 implementation("dev.fritz2:headless:$fritz2Version")