Merge pull request #496 from keta1/build

mikepenz · web-flow · commit ea91255be7b3 · 2026-01-13T19:03:59.000+01:00
Migrate Compose dependencies to use version catalog
diff --git 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)
         }
     }
-}
+}
diff --git 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)
         }
     }
-}
+}
diff --git 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
@@ -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)
         }
     }
-}
+}
diff --git 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)
         }
     }
-}
+}
diff --git 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"))
-}
+}
diff --git 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
@@ -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
@@ -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
@@ -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")

Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,12 @@ kotlin {`
`9`	`9`	`namespace = "com.mikepenz.markdown.coil3"`
`10`	`10`	`}`
`11`	`11`	`sourceSets {`
`12`		`- val commonMain by getting {`
`13`		`- dependencies {`
`14`		`- api(projects.multiplatformMarkdownRenderer)`
`15`		`- api(libs.coil.core.get().toString()) {`
`16`		`- exclude(group = "org.jetbrains.compose.runtime")`
`17`		`- }`
`18`		`- compileOnly(compose.runtime)`
	`12`	`+ commonMain.dependencies {`
	`13`	`+ api(projects.multiplatformMarkdownRenderer)`
	`14`	`+ api(libs.coil.core.get().toString()) {`
	`15`	`+ exclude(group = "org.jetbrains.compose.runtime")`
`19`	`16`	`}`
	`17`	`+ compileOnly(baseLibs.jetbrains.compose.runtime)`
`20`	`18`	`}`
`21`	`19`	`}`
`22`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,19 +10,17 @@ kotlin {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`sourceSets {`
`13`		`- val commonMain by getting {`
`14`		`- dependencies {`
`15`		`- api(libs.markdown)`
`16`		`- api(baseLibs.kotlinx.collections.immutable)`
	`13`	`+ commonMain.dependencies {`
	`14`	`+ api(libs.markdown)`
	`15`	`+ api(baseLibs.kotlinx.collections.immutable)`
`17`	`16`
`18`		`- compileOnly(compose.runtime)`
`19`		`- compileOnly(compose.ui)`
`20`		`- compileOnly(compose.foundation)`
`21`		`- }`
	`17`	`+ compileOnly(baseLibs.jetbrains.compose.runtime)`
	`18`	`+ compileOnly(baseLibs.jetbrains.compose.ui)`
	`19`	`+ compileOnly(baseLibs.jetbrains.compose.foundation)`
`22`	`20`	`}`
`23`	`21`	`}`
`24`	`22`	`}`
`25`	`23`
`26`	`24`	`composeCompiler {`
`27`	`25`	`stabilityConfigurationFiles.add(project.layout.projectDirectory.file("stability_config.conf"))`
`28`		`-}`
	`26`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ kotlin {`
`11`	`11`	`sourceSets {`
`12`	`12`	`commonMain.dependencies {`
`13`	`13`	`implementation(project(":sample:shared"))`
`14`		`- implementation(compose.components.resources)`
	`14`	`+ implementation(baseLibs.jetbrains.compose.components.resources)`
`15`	`15`	`}`
`16`	`16`	`jvmMain.dependencies {`
`17`	`17`	`implementation(compose.desktop.currentOs)`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ kotlin {`
`21`	`21`	`sourceSets {`
`22`	`22`	`commonMain.dependencies {`
`23`	`23`	`implementation(project(":sample:shared"))`
`24`		`- implementation(compose.foundation)`
`25`		`- implementation(compose.components.resources)`
	`24`	`+ implementation(baseLibs.jetbrains.compose.foundation)`
	`25`	`+ implementation(baseLibs.jetbrains.compose.components.resources)`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`}`
`@@ -32,9 +32,6 @@ compose.resources {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`aboutLibraries {`
`35`		`- android {`
`36`		`- registerAndroidTasks = false`
`37`		`- }`
`38`	`35`	`export {`
`39`	`36`	`exportVariant = "wasmJs"`
`40`	`37`	`outputPath = file("src/commonMain/composeResources/files/aboutlibraries.json")`