Skip to content

Bump kotlin from 2.3.21 to 2.4.0 #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
technoir42 merged 3 commits into from
Jun 3, 2026
Merged

Bump kotlin from 2.3.21 to 2.4.0 #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cebcc65
Bump kotlin from 2.3.21 to 2.4.0
dependabot[bot] Jun 3, 2026
eac86eb
Fix build
technoir42 Jun 3, 2026
10a3a56
Merge remote-tracking branch 'origin/main' into dependabot/gradle/kot…
technoir42 Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions common-conventions/src/main/kotlin/io/technoirlab/conventions/common/configuration/Kotlin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import org.gradle.language.base.plugins.LifecycleBasePlugin
import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
import org.jetbrains.kotlin.gradle.dsl.abi.AbiValidationExtension
import org.jetbrains.kotlin.gradle.dsl.abi.ExperimentalAbiValidation
import org.jetbrains.kotlin.samWithReceiver.gradle.SamWithReceiverExtension

Expand All @@ -24,15 +23,9 @@ fun Project.configureKotlin(
languageVersion.set(kotlinConfig.map { it.languageVersion })
jvmDefault.set(JvmDefaultMode.NO_COMPATIBILITY)
freeCompilerArgs.addAll(
"-Xcontext-parameters",
"-Xconsistent-data-class-copy-visibility"
)
}

@OptIn(ExperimentalAbiValidation::class)
extensions.configure(AbiValidationExtension::class) {
enabled.set(enableAbiValidation)
}
}

pluginManager.withPlugin("org.jetbrains.kotlin.plugin.sam.with.receiver") {
Expand All @@ -44,12 +37,15 @@ fun Project.configureKotlin(
afterEvaluate {
extensions.configure(KotlinProjectExtension::class) {
coreLibrariesVersion = kotlinConfig.get().coreLibrariesVersion
}
}

tasks.named(LifecycleBasePlugin.CHECK_TASK_NAME).configure {
if (enableAbiValidation.get()) {
dependsOn(tasks.named("checkKotlinAbi"))
if (enableAbiValidation.get()) {
@OptIn(ExperimentalAbiValidation::class)
abiValidation {
tasks.named(LifecycleBasePlugin.CHECK_TASK_NAME).configure {
dependsOn(checkTaskProvider)
}
}
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ develocity-gradle-plugin = "4.4.2"
dokka = "2.1.0"
foojay-resolver-gradle-plugin = "1.0.0"
junit5 = "5.14.4"
kotlin = "2.3.21"
kotlin = "2.4.0"
kotlinx-benchmark = "0.4.17"
kotlinx-coroutines = "1.11.0"
kotlinx-serialization = "1.11.0"
Expand Down
24 changes: 12 additions & 12 deletions ...tlin/io/technoirlab/conventions/kotlin/multiplatform/configuration/KotlinMultiplatform.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import org.gradle.language.base.plugins.LifecycleBasePlugin
import org.jetbrains.kotlin.gradle.dsl.HasConfigurableKotlinCompilerOptions
import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
import org.jetbrains.kotlin.gradle.dsl.abi.AbiValidationMultiplatformExtension
import org.jetbrains.kotlin.gradle.dsl.abi.ExperimentalAbiValidation
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.KotlinNativeTargetConfigurator.Companion.RUN_GROUP
Expand All @@ -37,16 +36,10 @@ internal fun Project.configureKotlinMultiplatform(
extensions.configure(KmpExtension::class) {
applyDefaultHierarchyTemplate()

@OptIn(ExperimentalAbiValidation::class)
extensions.configure(AbiValidationMultiplatformExtension::class) {
enabled.set(config.buildFeatures.abiValidation)
}

compilerOptions {
apiVersion.set(kotlinConfig.map { it.apiVersion })
languageVersion.set(kotlinConfig.map { it.languageVersion })
freeCompilerArgs.addAll(
"-Xcontext-parameters",
"-Xconsistent-data-class-copy-visibility",
"-Xexpect-actual-classes"
)
Expand All @@ -69,13 +62,20 @@ internal fun Project.configureKotlinMultiplatform(
implementation(kotlinLibraries.map { dependencies.platform(it.kotlinSerializationBom) })
}
}

coreLibrariesVersion = kotlinConfig.get().coreLibrariesVersion
}

tasks.named(LifecycleBasePlugin.CHECK_TASK_NAME).configure {
if (config.buildFeatures.abiValidation.get()) {
dependsOn(tasks.named("checkKotlinAbi"))
afterEvaluate {
extensions.configure(KmpExtension::class) {
coreLibrariesVersion = kotlinConfig.get().coreLibrariesVersion

if (config.buildFeatures.abiValidation.get()) {
@OptIn(ExperimentalAbiValidation::class)
abiValidation {
tasks.named(LifecycleBasePlugin.CHECK_TASK_NAME).configure {
dependsOn(checkTaskProvider)
}
}
}
}
}
}
Expand Down