From a065b844df2e7de0a118b1a7119c39743990a3d2 Mon Sep 17 00:00:00 2001 From: ketal Date: Wed, 14 Jan 2026 01:08:36 +0800 Subject: [PATCH] - Migrate Compose dependencies to use version catalog - Update Compose dependency references from `compose.*` to `baseLibs.jetbrains.compose.*` across all modules and samples - Refactor `sourceSets` configuration in multiple modules to use a cleaner `commonMain.dependencies` syntax - Remove redundant `registerAndroidTasks` configuration in the web sample's `aboutLibraries` block --- .../build.gradle.kts | 16 +++++++--------- .../build.gradle.kts | 18 +++++++----------- .../build.gradle.kts | 12 +++++------- .../build.gradle.kts | 14 ++++++-------- .../build.gradle.kts | 14 ++++++-------- .../build.gradle.kts | 16 +++++++--------- sample/android/build.gradle.kts | 8 ++++---- sample/desktop/build.gradle.kts | 2 +- sample/shared/build.gradle.kts | 12 ++++++------ sample/web/build.gradle.kts | 7 ++----- 10 files changed, 51 insertions(+), 68 deletions(-) diff --git a/multiplatform-markdown-renderer-code/build.gradle.kts b/multiplatform-markdown-renderer-code/build.gradle.kts index 836b3ad8..a520811d 100644 --- a/multiplatform-markdown-renderer-code/build.gradle.kts +++ b/multiplatform-markdown-renderer-code/build.gradle.kts @@ -10,15 +10,13 @@ kotlin { } sourceSets { - val commonMain by getting { - dependencies { - api(projects.multiplatformMarkdownRenderer) - compileOnly(compose.runtime) - compileOnly(compose.ui) - compileOnly(compose.foundation) + commonMain.dependencies { + api(projects.multiplatformMarkdownRenderer) + compileOnly(baseLibs.jetbrains.compose.runtime) + compileOnly(baseLibs.jetbrains.compose.ui) + compileOnly(baseLibs.jetbrains.compose.foundation) - api(libs.highlights) - } + api(libs.highlights) } } -} \ No newline at end of file +} diff --git a/multiplatform-markdown-renderer-coil2/build.gradle.kts b/multiplatform-markdown-renderer-coil2/build.gradle.kts index e4baa31e..a6ab8810 100644 --- a/multiplatform-markdown-renderer-coil2/build.gradle.kts +++ b/multiplatform-markdown-renderer-coil2/build.gradle.kts @@ -9,18 +9,14 @@ kotlin { namespace = "com.mikepenz.markdown.coil2" } sourceSets { - val commonMain by getting { - dependencies { - api(projects.multiplatformMarkdownRenderer) - compileOnly(compose.runtime) - compileOnly(compose.ui) - } + commonMain.dependencies { + api(projects.multiplatformMarkdownRenderer) + compileOnly(baseLibs.jetbrains.compose.runtime) + compileOnly(baseLibs.jetbrains.compose.ui) } - val androidMain by getting { - dependencies { - api(libs.coil2.core) - } + androidMain.dependencies { + api(libs.coil2.core) } } -} \ No newline at end of file +} diff --git a/multiplatform-markdown-renderer-coil3/build.gradle.kts b/multiplatform-markdown-renderer-coil3/build.gradle.kts index be3679ed..9734ccd8 100644 --- a/multiplatform-markdown-renderer-coil3/build.gradle.kts +++ b/multiplatform-markdown-renderer-coil3/build.gradle.kts @@ -9,14 +9,12 @@ kotlin { namespace = "com.mikepenz.markdown.coil3" } sourceSets { - val commonMain by getting { - dependencies { - api(projects.multiplatformMarkdownRenderer) - api(libs.coil.core.get().toString()) { - exclude(group = "org.jetbrains.compose.runtime") - } - compileOnly(compose.runtime) + commonMain.dependencies { + api(projects.multiplatformMarkdownRenderer) + api(libs.coil.core.get().toString()) { + exclude(group = "org.jetbrains.compose.runtime") } + compileOnly(baseLibs.jetbrains.compose.runtime) } } } diff --git a/multiplatform-markdown-renderer-m2/build.gradle.kts b/multiplatform-markdown-renderer-m2/build.gradle.kts index 33d4cfc0..2b464689 100644 --- a/multiplatform-markdown-renderer-m2/build.gradle.kts +++ b/multiplatform-markdown-renderer-m2/build.gradle.kts @@ -9,14 +9,12 @@ kotlin { namespace = "com.mikepenz.markdown.m2" } sourceSets { - val commonMain by getting { - dependencies { - api(projects.multiplatformMarkdownRenderer) - api(libs.markdown) + commonMain.dependencies { + api(projects.multiplatformMarkdownRenderer) + api(libs.markdown) - compileOnly(compose.runtime) - compileOnly(compose.material) - } + compileOnly(baseLibs.jetbrains.compose.runtime) + compileOnly(baseLibs.jetbrains.compose.material) } } -} \ No newline at end of file +} diff --git a/multiplatform-markdown-renderer-m3/build.gradle.kts b/multiplatform-markdown-renderer-m3/build.gradle.kts index 96ced2e7..701887f5 100644 --- a/multiplatform-markdown-renderer-m3/build.gradle.kts +++ b/multiplatform-markdown-renderer-m3/build.gradle.kts @@ -9,14 +9,12 @@ kotlin { namespace = "com.mikepenz.markdown.m3" } sourceSets { - val commonMain by getting { - dependencies { - api(projects.multiplatformMarkdownRenderer) - api(libs.markdown) + commonMain.dependencies { + api(projects.multiplatformMarkdownRenderer) + api(libs.markdown) - compileOnly(compose.runtime) - compileOnly(compose.material3) - } + compileOnly(baseLibs.jetbrains.compose.runtime) + compileOnly(baseLibs.jetbrains.compose.material3) } } -} \ No newline at end of file +} diff --git a/multiplatform-markdown-renderer/build.gradle.kts b/multiplatform-markdown-renderer/build.gradle.kts index 62236358..a24b4138 100644 --- a/multiplatform-markdown-renderer/build.gradle.kts +++ b/multiplatform-markdown-renderer/build.gradle.kts @@ -10,19 +10,17 @@ kotlin { } sourceSets { - val commonMain by getting { - dependencies { - api(libs.markdown) - api(baseLibs.kotlinx.collections.immutable) + commonMain.dependencies { + api(libs.markdown) + api(baseLibs.kotlinx.collections.immutable) - compileOnly(compose.runtime) - compileOnly(compose.ui) - compileOnly(compose.foundation) - } + compileOnly(baseLibs.jetbrains.compose.runtime) + compileOnly(baseLibs.jetbrains.compose.ui) + compileOnly(baseLibs.jetbrains.compose.foundation) } } } composeCompiler { stabilityConfigurationFiles.add(project.layout.projectDirectory.file("stability_config.conf")) -} \ No newline at end of file +} diff --git a/sample/android/build.gradle.kts b/sample/android/build.gradle.kts index 9329c850..e7d9c698 100644 --- a/sample/android/build.gradle.kts +++ b/sample/android/build.gradle.kts @@ -16,12 +16,12 @@ android { dependencies { implementation(project(":sample:shared")) - implementation(compose.foundation) - implementation(compose.material) - implementation(compose.material3) + implementation(baseLibs.jetbrains.compose.foundation) + implementation(baseLibs.jetbrains.compose.material) + implementation(baseLibs.jetbrains.compose.material3) implementation(libs.androidx.activity.compose) implementation(libs.ktor.client.okhttp) - debugImplementation(compose.uiTooling) + debugImplementation(baseLibs.jetbrains.compose.ui.tooling) } aboutLibraries { diff --git a/sample/desktop/build.gradle.kts b/sample/desktop/build.gradle.kts index 2242f0b8..4cdc8baf 100644 --- a/sample/desktop/build.gradle.kts +++ b/sample/desktop/build.gradle.kts @@ -11,7 +11,7 @@ kotlin { sourceSets { commonMain.dependencies { implementation(project(":sample:shared")) - implementation(compose.components.resources) + implementation(baseLibs.jetbrains.compose.components.resources) } jvmMain.dependencies { implementation(compose.desktop.currentOs) diff --git a/sample/shared/build.gradle.kts b/sample/shared/build.gradle.kts index d95204f5..4716bd1a 100644 --- a/sample/shared/build.gradle.kts +++ b/sample/shared/build.gradle.kts @@ -29,12 +29,12 @@ kotlin { api(projects.multiplatformMarkdownRendererCoil3) api(projects.multiplatformMarkdownRendererCode) - implementation(compose.foundation) - implementation(compose.ui) - implementation(compose.uiUtil) - implementation(compose.components.resources) - implementation(compose.material) - implementation(compose.material3) + implementation(baseLibs.jetbrains.compose.foundation) + implementation(baseLibs.jetbrains.compose.ui) + implementation(baseLibs.jetbrains.compose.ui.util) + implementation(baseLibs.jetbrains.compose.components.resources) + implementation(baseLibs.jetbrains.compose.material) + implementation(baseLibs.jetbrains.compose.material3) // required for coil implementation(libs.ktor.client.core) diff --git a/sample/web/build.gradle.kts b/sample/web/build.gradle.kts index a76d9a13..f13b69ef 100644 --- a/sample/web/build.gradle.kts +++ b/sample/web/build.gradle.kts @@ -21,8 +21,8 @@ kotlin { sourceSets { commonMain.dependencies { implementation(project(":sample:shared")) - implementation(compose.foundation) - implementation(compose.components.resources) + implementation(baseLibs.jetbrains.compose.foundation) + implementation(baseLibs.jetbrains.compose.components.resources) } } } @@ -32,9 +32,6 @@ compose.resources { } aboutLibraries { - android { - registerAndroidTasks = false - } export { exportVariant = "wasmJs" outputPath = file("src/commonMain/composeResources/files/aboutlibraries.json")