From 6d68a992f1e95443248ec3567b298264f741290f Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Fri, 10 Jan 2025 11:30:26 +0100 Subject: [PATCH] - apply the kotlin plugin to the plugin build (forcing Kotlin 2.x or newer) --- gradle/libs.versions.toml | 2 +- plugin-build/build.gradle.kts | 1 + plugin-build/settings.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 06e5e5e33..38f5624fd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -conventionPlugin = "0.1.3" +conventionPlugin = "0.1.4" # kotlin kotlinxSerialization = "1.7.3" kotlinxCollections = "0.3.8" diff --git a/plugin-build/build.gradle.kts b/plugin-build/build.gradle.kts index 9837b1c28..695a790a7 100644 --- a/plugin-build/build.gradle.kts +++ b/plugin-build/build.gradle.kts @@ -2,6 +2,7 @@ import java.io.FileInputStream import java.util.* plugins { + alias(baseLibs.plugins.kotlinJvm) apply false alias(libs.plugins.conventionPlugin) alias(baseLibs.plugins.dokka) alias(baseLibs.plugins.mavenPublish) diff --git a/plugin-build/settings.gradle.kts b/plugin-build/settings.gradle.kts index f6a3d3623..96d6e6974 100644 --- a/plugin-build/settings.gradle.kts +++ b/plugin-build/settings.gradle.kts @@ -22,7 +22,7 @@ dependencyResolutionManagement { from(files("../gradle/libs.versions.toml")) } create("baseLibs") { - from("com.mikepenz:version-catalog:0.0.4") + from("com.mikepenz:version-catalog:0.1.1") } } } \ No newline at end of file