diff --git a/build.gradle.kts b/build.gradle.kts index e8a7aefe..5789064e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper -import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJvmPlugin +import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper import org.modelix.copyMps buildscript { @@ -48,7 +48,7 @@ subprojects { version = rootProject.version group = rootProject.group - val kotlinApiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_6 + val kotlinApiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_8 subproject.tasks.withType().configureEach { kotlinOptions { jvmTarget = "11" @@ -75,7 +75,7 @@ subprojects { } } - subproject.plugins.withType { + subproject.plugins.withType { subproject.extensions.configure { compilerOptions { jvmTarget.set(JvmTarget.JVM_11) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 228812c0..8c673605 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ modelix-model-api-gen = { id = "org.modelix.model-api-gen", version.ref = "model npm-publish = { id = "dev.petuska.npm.publish", version = "3.5.3" } [versions] -modelixCore = "11.2.1" +modelixCore = "15.4.0" kotlinCoroutines="1.10.2" ktor="3.1.3" diff --git a/mps-diff-plugin/build.gradle.kts b/mps-diff-plugin/build.gradle.kts index 048d8759..06f187aa 100644 --- a/mps-diff-plugin/build.gradle.kts +++ b/mps-diff-plugin/build.gradle.kts @@ -24,7 +24,7 @@ kotlin { sourceSets { main { languageSettings { - apiVersion = KotlinVersion.KOTLIN_1_6.version + apiVersion = KotlinVersion.KOTLIN_1_8.version } } } diff --git a/mps-generator-execution-plugin/build.gradle.kts b/mps-generator-execution-plugin/build.gradle.kts index 5bb2edde..1fa51c2f 100644 --- a/mps-generator-execution-plugin/build.gradle.kts +++ b/mps-generator-execution-plugin/build.gradle.kts @@ -24,7 +24,7 @@ kotlin { sourceSets { main { languageSettings { - apiVersion = KotlinVersion.KOTLIN_1_6.version + apiVersion = KotlinVersion.KOTLIN_1_8.version } } }