diff --git a/app-desktop/build.gradle.kts b/app-desktop/build.gradle.kts index 16351f5..e1ed159 100644 --- 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 index 1a00cf2..8ed651c 100644 --- 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 deleted file mode 100644 index 901920d..0000000 --- a/app/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -com.mikepenz.multiplatform.enabled=false -com.mikepenz.targets.enabled=false \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index ea97caf..dee4675 100644 --- 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 index 6fafb71..005b3ec 100644 --- 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 index 967dfb2..fb113bb 100644 --- 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") } } }