Migrate Compose dependencies to use version catalog

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)
         }
     }
-}
+}

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)
         }
     }
-}
+}

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)
         }
     }
 }

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)
         }
     }
-}
+}

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)
         }
     }
-}
+}

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"))
-}
+}

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 {

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)

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)

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")