From 98ef4d24a3b3f2affd69bcd9d17fd21de85fafdc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2024 10:22:30 +0000 Subject: [PATCH 1/4] build(deps): bump kotlin from 2.0.21 to 2.1.0 Bumps `kotlin` from 2.0.21 to 2.1.0. Updates `org.jetbrains.kotlin:kotlin-stdlib-common` from 2.0.21 to 2.1.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.0/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.0) Updates `org.jetbrains.kotlin:kotlin-stdlib-jdk8` from 2.0.21 to 2.1.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.0/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.0) Updates `org.jetbrains.kotlin:kotlin-reflect` from 2.0.21 to 2.1.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.0/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.0) Updates `org.jetbrains.kotlin:kotlin-gradle-plugin` from 2.0.21 to 2.1.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.0/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.0) Updates `org.jetbrains.kotlin.multiplatform` from 2.0.21 to 2.1.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.0/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.0) Updates `org.jetbrains.kotlin.jvm` from 2.0.21 to 2.1.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.0/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.0) Updates `org.jetbrains.kotlin.plugin.serialization` from 2.0.21 to 2.1.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.0/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.0) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib-common dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk8 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.multiplatform dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.jvm dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.plugin.serialization dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b27d81ae40..09293c9c1e 100644 --- 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" From 1bc254d3bc255561cde2785a18e20f6c05bb3b2a Mon Sep 17 00:00:00 2001 From: slisson Date: Fri, 6 Dec 2024 09:06:31 +0100 Subject: [PATCH 2/4] build: fixed compile error after change of Kotlin version --- .../src/main/kotlin/modelix-language-config.gradle.kts | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 index 4168cf43f7..237846eeb3 100644 --- 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 { + extensions.configure { + toolchain { + languageVersion.set(JavaLanguageVersion.of(MODELIX_JDK_VERSION)) + } } } From 4eeae00e2ac2633420b042bc2b771c2daa983289 Mon Sep 17 00:00:00 2001 From: slisson Date: Fri, 6 Dec 2024 09:22:46 +0100 Subject: [PATCH 3/4] build: executed kotlinUpgradeYarnLock Because the build fails with this message: Lock file was changed. Run the `kotlinUpgradeYarnLock` task to actualize lock file --- kotlin-js-store/yarn.lock | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock index 114ad92d97..d9a3c2e932 100644 --- a/kotlin-js-store/yarn.lock +++ b/kotlin-js-store/yarn.lock @@ -565,6 +565,13 @@ jsdom@20.0.2: ws "^8.9.0" xml-name-validator "^4.0.0" +kotlin-web-helpers@2.0.0: + 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" -mocha@10.7.0: - version "10.7.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.0.tgz#9e5cbed8fa9b37537a25bd1f7fb4f6fc45458b9a" - integrity sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA== +mocha@10.7.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" From 5db1c7551f47b4672ccc545b4ddd6773862f1ec8 Mon Sep 17 00:00:00 2001 From: slisson Date: Fri, 6 Dec 2024 10:27:26 +0100 Subject: [PATCH 4/4] build: fix integration between kotlin and npm-publish plugins --- build.gradle.kts | 20 ++++++++++++++++++++ model-client/build.gradle.kts | 2 ++ ts-model-api/build.gradle.kts | 2 ++ vue-model-api/build.gradle.kts | 2 ++ 4 files changed, 26 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index c5001d4d7e..a19814ebe7 100644 --- 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/model-client/build.gradle.kts b/model-client/build.gradle.kts index fac65f9aef..4dcb1fdd8f 100644 --- 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 index a6cff6a155..1a1d393c24 100644 --- 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 index 77ac70d5a7..529ef91756 100644 --- a/vue-model-api/build.gradle.kts +++ b/vue-model-api/build.gradle.kts @@ -134,3 +134,5 @@ tasks.named("packJsPackage") { tasks.assemble { dependsOn("packJsPackage") } + +tasks.named("packJsPackage") { dependsOn(":setupNodeEverywhere") }