Merge pull request #1054 from mikepenz/fix/1053

Attempt to fix Kotlin 2.x incompatiblity
mikepenz · Jan 10, 2025 · 3f7b00e · 3f7b00e
2 parents c0b3af0 + 6d68a99
commit 3f7b00e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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")
         }
     }
 }