Merge pull request #1214 from modelix/dependabot/gradle/kotlin-2.1.0

build(deps): bump kotlin from 2.0.21 to 2.1.0
modelix · Dec 6, 2024 · f2e2b39 · f2e2b39
2 parents aacfe75 + 5db1c75
commit f2e2b39
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 9 deletions.
diff --git a/build-logic/src/main/kotlin/modelix-language-config.gradle.kts b/build-logic/src/main/kotlin/modelix-language-config.gradle.kts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import gradle.kotlin.dsl.accessors._9d6accdeac6876c73060866945fb6d8c.java
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper
@@ -25,9 +24,11 @@ import org.modelix.MODELIX_JDK_VERSION
 import org.modelix.MODELIX_JVM_TARGET
 import org.modelix.MODELIX_KOTLIN_API_VERSION
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(MODELIX_JDK_VERSION))
+plugins.withType<JavaPlugin> {
+    extensions.configure<JavaPluginExtension> {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(MODELIX_JDK_VERSION))
+        }
     }
 }
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,6 +2,7 @@
 import com.github.gradle.node.NodeExtension
 import com.github.gradle.node.NodePlugin
 import io.gitlab.arturbosch.detekt.Detekt
+import org.gradle.kotlin.dsl.withType
 import org.jetbrains.dokka.base.DokkaBase
 import org.jetbrains.dokka.base.DokkaBaseConfiguration
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
@@ -22,6 +23,7 @@ plugins {
     alias(libs.plugins.node) apply false
     alias(libs.plugins.detekt)
     alias(libs.plugins.kotlinx.kover)
+    alias(libs.plugins.npm.publish) apply false
 }
 
 group = "org.modelix"
@@ -208,3 +210,21 @@ publishing {
         }
     }
 }
+
+// make all 'packJsPackage' tasks depend on all 'kotlinNodeJsSetup' tasks, because gradle complained about this being missing
+tasks.register("setupNodeEverywhere") {
+    dependsOn(":bulk-model-sync-lib:kotlinNodeJsSetup")
+    dependsOn(":kotlin-utils:kotlinNodeJsSetup")
+    dependsOn(":model-api:kotlinNodeJsSetup")
+    dependsOn(":model-api-gen-runtime:kotlinNodeJsSetup")
+    dependsOn(":model-client:kotlinNodeJsSetup")
+    dependsOn(":model-datastructure:kotlinNodeJsSetup")
+    dependsOn(":model-server-api:kotlinNodeJsSetup")
+    dependsOn(":modelql-client:kotlinNodeJsSetup")
+    dependsOn(":modelql-core:kotlinNodeJsSetup")
+    dependsOn(":modelql-html:kotlinNodeJsSetup")
+    dependsOn(":modelql-typed:kotlinNodeJsSetup")
+    dependsOn(":modelql-untyped:kotlinNodeJsSetup")
+    dependsOn(":streams:kotlinNodeJsSetup")
+    dependsOn(":model-client:integration-tests:kotlinNodeJsSetup")
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -25,7 +25,7 @@ kotlinx-kover = { id = "org.jetbrains.kotlinx.kover", version = "0.8.3" }
 docker-compose = { id = "com.avast.gradle.docker-compose" , version = "0.17.11" }
 
 [versions]
-kotlin = "2.0.21"
+kotlin = "2.1.0"
 kotlinCoroutines="1.9.0"
 ktor="2.3.12"
 kotlinHtml="0.8.0"

diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
@@ -565,6 +565,13 @@ [email protected]:
     ws "^8.9.0"
     xml-name-validator "^4.0.0"
 
+[email protected]:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286"
+  integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw==
+  dependencies:
+    format-util "^1.0.5"
+
 levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -607,10 +614,10 @@ minimatch@^5.0.1, minimatch@^5.1.6:
   dependencies:
     brace-expansion "^2.0.1"
 
-[email protected].0:
-  version "10.7.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.0.tgz#9e5cbed8fa9b37537a25bd1f7fb4f6fc45458b9a"
-  integrity sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==
+[email protected].3:
+  version "10.7.3"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.3.tgz#ae32003cabbd52b59aece17846056a68eb4b0752"
+  integrity sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==
   dependencies:
     ansi-colors "^4.1.3"
     browser-stdout "^1.3.1"

diff --git a/model-client/build.gradle.kts b/model-client/build.gradle.kts
@@ -174,3 +174,5 @@ npmPublish {
         }
     }
 }
+
+tasks.named("packJsPackage") { dependsOn(":setupNodeEverywhere") }
diff --git a/ts-model-api/build.gradle.kts b/ts-model-api/build.gradle.kts
@@ -79,3 +79,5 @@ npmPublish {
     }
   }
 }
+
+tasks.named("packJsPackage") { dependsOn(":setupNodeEverywhere") }
diff --git a/vue-model-api/build.gradle.kts b/vue-model-api/build.gradle.kts
@@ -134,3 +134,5 @@ tasks.named<NpmPackTask>("packJsPackage") {
 tasks.assemble {
     dependsOn("packJsPackage")
 }
+
+tasks.named("packJsPackage") { dependsOn(":setupNodeEverywhere") }
-Original file line number
+Diff line change
@@ Expand Up / @@ -174,3 +174,5 @@ npmPublish { @@
             }
         }
     }
+    tasks.named("packJsPackage") { dependsOn(":setupNodeEverywhere") }