- upgrade convention plugion

- update version catalog - cleanup
mikepenz · Jan 4, 2025 · dc1c116 · dc1c116
1 parent 1d871eb
commit dc1c116
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 8 deletions.
diff --git a/app-desktop/build.gradle.kts b/app-desktop/build.gradle.kts
@@ -27,7 +27,6 @@ kotlin {
                 implementation(projects.multiplatformMarkdownRendererCoil3)
                 implementation(projects.multiplatformMarkdownRendererCode)
 
-                implementation(compose.components.resources)
                 implementation(compose.desktop.currentOs)
                 implementation(compose.foundation)
                 implementation(compose.material)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,9 +1,8 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 plugins {
-    kotlin("android")
+    id("com.mikepenz.convention.kotlin")
     id("com.mikepenz.convention.android-application")
-    id("com.mikepenz.convention.kotlin-multiplatform")
     id("com.mikepenz.convention.compose")
     id("com.mikepenz.aboutlibraries.plugin")
     alias(baseLibs.plugins.screenshot)

diff --git a/app/gradle.properties b/app/gradle.properties
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
     alias(baseLibs.plugins.composeCompiler) apply false
     alias(baseLibs.plugins.kotlinMultiplatform) apply false
     alias(baseLibs.plugins.dokka)
-    alias(baseLibs.plugins.aboutlibraries) apply false
+    alias(baseLibs.plugins.aboutLibraries) apply false
     alias(baseLibs.plugins.mavenPublish) apply false
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-conventionPlugin = "0.0.4"
+conventionPlugin = "0.1.0"
 androidx-activityCompose = "1.9.3"
 androidx-material = "1.12.0"
 coil = "3.0.4"

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -24,7 +24,7 @@ dependencyResolutionManagement {
 
     versionCatalogs {
         create("baseLibs") {
-            from("com.mikepenz:version-catalog:0.0.1")
+            from("com.mikepenz:version-catalog:0.1.1")
         }
     }
 }