From 3c6a4b427586af9df6735c1588dfbffcfc93b90b Mon Sep 17 00:00:00 2001 From: alexander-yevsyukov Date: Thu, 12 Mar 2026 21:23:55 +0000 Subject: [PATCH] Add changes recently adopted in Compiler and Validation --- .../src/main/kotlin/io/spine/dependency/local/Compiler.kt | 7 ++++++- .../kotlin/io/spine/dependency/local/CoreJvmCompiler.kt | 8 ++++++-- .../main/kotlin/io/spine/dependency/local/Validation.kt | 2 +- .../src/main/kotlin/io/spine/dependency/test/JUnit.kt | 2 +- .../main/kotlin/io/spine/gradle/kotlin/KotlinConfig.kt | 4 ++-- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt index 304cbf4a9..b3a708b3f 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt @@ -27,6 +27,11 @@ package io.spine.dependency.local import io.spine.dependency.Dependency +import io.spine.dependency.local.Compiler.DF_VERSION_ENV +import io.spine.dependency.local.Compiler.VERSION_ENV +import io.spine.dependency.local.Compiler.dogfoodingVersion +import io.spine.dependency.local.Compiler.pluginLib +import io.spine.dependency.local.Compiler.version /** * Dependencies on the Spine Compiler modules. @@ -72,7 +77,7 @@ object Compiler : Dependency() { * The version of the Compiler dependencies. */ override val version: String - private const val fallbackVersion = "2.0.0-SNAPSHOT.039" + private const val fallbackVersion = "2.0.0-SNAPSHOT.040" /** * The distinct version of the Compiler used by other build tools. diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvmCompiler.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvmCompiler.kt index fb5761458..52204aeef 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvmCompiler.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvmCompiler.kt @@ -26,6 +26,10 @@ package io.spine.dependency.local +import io.spine.dependency.local.CoreJvmCompiler.dogfoodingVersion +import io.spine.dependency.local.CoreJvmCompiler.version + + /** * Dependencies on the CoreJvm Compiler artifacts. * @@ -46,12 +50,12 @@ object CoreJvmCompiler { /** * The version used to in the build classpath. */ - const val dogfoodingVersion = "2.0.0-SNAPSHOT.054" + const val dogfoodingVersion = "2.0.0-SNAPSHOT.055" /** * The version to be used for integration tests. */ - const val version = "2.0.0-SNAPSHOT.054" + const val version = "2.0.0-SNAPSHOT.055" /** * The ID of the Gradle plugin. diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/local/Validation.kt b/buildSrc/src/main/kotlin/io/spine/dependency/local/Validation.kt index 1ef4f097a..327c6114d 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/local/Validation.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/local/Validation.kt @@ -36,7 +36,7 @@ object Validation { /** * The version of the Validation library artifacts. */ - const val version = "2.0.0-SNAPSHOT.402" + const val version = "2.0.0-SNAPSHOT.405" /** * The last version of Validation compatible with ProtoData. diff --git a/buildSrc/src/main/kotlin/io/spine/dependency/test/JUnit.kt b/buildSrc/src/main/kotlin/io/spine/dependency/test/JUnit.kt index 6e9021fb0..a4962175a 100644 --- a/buildSrc/src/main/kotlin/io/spine/dependency/test/JUnit.kt +++ b/buildSrc/src/main/kotlin/io/spine/dependency/test/JUnit.kt @@ -33,7 +33,7 @@ import io.spine.dependency.DependencyWithBom @Suppress("unused", "ConstPropertyName") object JUnit : DependencyWithBom() { - override val version = "6.0.0" + override val version = "6.0.3" override val group: String = "org.junit" /** diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/kotlin/KotlinConfig.kt b/buildSrc/src/main/kotlin/io/spine/gradle/kotlin/KotlinConfig.kt index d251a54a6..5e3c89223 100644 --- a/buildSrc/src/main/kotlin/io/spine/gradle/kotlin/KotlinConfig.kt +++ b/buildSrc/src/main/kotlin/io/spine/gradle/kotlin/KotlinConfig.kt @@ -27,10 +27,10 @@ package io.spine.gradle.kotlin import org.gradle.jvm.toolchain.JavaLanguageVersion +import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension -import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode /** * Sets [Java toolchain](https://kotlinlang.org/docs/gradle.html#gradle-java-toolchains-support) @@ -56,7 +56,7 @@ fun KotlinJvmProjectExtension.applyJvmToolchain(version: String) = @Suppress("unused") fun KotlinCommonCompilerOptions.setFreeCompilerArgs() { if (this is KotlinJvmCompilerOptions) { - jvmDefault.set(JvmDefaultMode.ENABLE) + jvmDefault.set(JvmDefaultMode.NO_COMPATIBILITY) } freeCompilerArgs.addAll( listOf(