fix templates after deprecating Gradle plugin dependency aliases (#5464)

kropp · web-flow · commit bfd8c79447d3 · 2025-10-27T17:08:51.000+01:00
Update miscellaneous projects used in pipeline

Fixes CMP-7613

## Release Notes
N/A
diff --git a/ci/templates/html-library-template/build.gradle.kts b/ci/templates/html-library-template/build.gradle.kts
@@ -1,6 +1,3 @@
-import org.jetbrains.compose.desktop.application.dsl.TargetFormat
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
-
 plugins {
     kotlin("multiplatform")
     kotlin("plugin.compose")
@@ -14,7 +11,7 @@ repositories {
 }
 
 kotlin {
-    js(IR) {
+    js {
         browser()
         binaries.executable()
     }
@@ -24,8 +21,8 @@ kotlin {
             resources.srcDir("src/main/resources")
 
             dependencies {
-                implementation(compose.web.core)
-                implementation(compose.runtime)
+                implementation(libs.compose.html.core)
+                implementation(libs.compose.runtime)
             }
         }
     }
diff --git a/ci/templates/html-library-template/gradle/libs.versions.toml b/ci/templates/html-library-template/gradle/libs.versions.toml
@@ -0,0 +1,6 @@
+[versions]
+compose = "1.9.0"
+
+[libraries]
+compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose" }
+compose-html-core = { module = "org.jetbrains.compose.html:html-core", version.ref = "compose" }
diff --git a/ci/templates/html-library-template/settings.gradle.kts b/ci/templates/html-library-template/settings.gradle.kts
@@ -9,4 +9,12 @@ pluginManagement {
         kotlin("plugin.compose").version(extra["kotlin.version"] as String)
         id("org.jetbrains.compose").version(extra["compose.version"] as String)
     }
+}
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            version("compose", extra["compose.version"].toString())
+        }
+    }
 }
diff --git a/ci/templates/multiplatform-template/common/build.gradle.kts b/ci/templates/multiplatform-template/common/build.gradle.kts
@@ -12,11 +12,11 @@ kotlin {
     sourceSets {
         named("commonMain") {
             dependencies {
-                api(compose.runtime)
-                api(compose.foundation)
-                api(compose.material)
+                api(libs.compose.runtime)
+                api(libs.compose.foundation)
+                api(libs.compose.material)
                 // Needed only for preview.
-                implementation(compose.preview)
+                implementation(libs.compose.ui.tooling.preview)
             }
         }
         named("androidMain") {
diff --git a/ci/templates/multiplatform-template/gradle/libs.versions.toml b/ci/templates/multiplatform-template/gradle/libs.versions.toml
@@ -0,0 +1,8 @@
+[versions]
+compose = "1.9.0"
+
+[libraries]
+compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose" }
+compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "compose" }
+compose-material = { module = "org.jetbrains.compose.material:material", version.ref = "compose" }
+compose-ui-tooling-preview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "compose" }
diff --git a/ci/templates/multiplatform-template/settings.gradle.kts b/ci/templates/multiplatform-template/settings.gradle.kts
@@ -16,6 +16,14 @@ pluginManagement {
     }
 }
 
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            version("compose", extra["compose.version"].toString())
+        }
+    }
+}
+
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
 }
diff --git a/components/AnimatedImage/library/build.gradle.kts b/components/AnimatedImage/library/build.gradle.kts
@@ -14,8 +14,8 @@ kotlin {
             }
         }
         commonMain.dependencies {
-            api(compose.runtime)
-            api(compose.foundation)
+            api(libs.compose.runtime)
+            api(libs.compose.foundation)
         }
     }
 }
diff --git a/components/SplitPane/library/build.gradle.kts b/components/SplitPane/library/build.gradle.kts
@@ -16,8 +16,8 @@ kotlin {
         }
 
         commonMain.dependencies {
-            api(compose.runtime)
-            api(compose.foundation)
+            api(libs.compose.runtime)
+            api(libs.compose.foundation)
         }
     }
 }
diff --git a/components/gradle/libs.versions.toml b/components/gradle/libs.versions.toml
@@ -1,10 +1,14 @@
+# Version catalog has been renamed to be imported manually with overriden 'compose' version
+
 [versions]
 kotlinx-coroutines = "1.8.0"
 androidx-appcompat = "1.6.1"
 androidx-activity-compose = "1.8.2"
 androidx-test = "1.5.0"
 androidx-compose = "1.6.1"
 kotlinx-browser = "0.5.0"
+compose = "1.9.0"
+material3 = "1.9.0"
 
 [libraries]
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
@@ -18,4 +22,11 @@ androidx-compose-ui-test = { module = "androidx.compose.ui:ui-test", version.ref
 androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "androidx-compose" }
 androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx-compose" }
 androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "androidx-compose" }
-androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "androidx-compose" }
+androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "androidx-compose" }
+compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose" }
+compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "compose" }
+compose-desktop = { module = "org.jetbrains.compose.desktop:desktop", version.ref = "compose" }
+compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "compose" }
+compose-ui-test = { module = "org.jetbrains.compose.ui:ui-test", version.ref = "compose" }
+compose-material-icons-core = { module = "org.jetbrains.compose.material:material-icons-core", version = "1.7.3" }
+compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "material3" }
diff --git a/components/resources/demo/androidApp/build.gradle.kts b/components/resources/demo/androidApp/build.gradle.kts
@@ -20,8 +20,8 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
     dependencies {
-        implementation(compose.ui)
-        implementation(compose.foundation)
+        implementation(libs.compose.ui)
+        implementation(libs.compose.foundation)
         implementation(libs.androidx.appcompat)
         implementation(libs.androidx.activity.compose)
         implementation(project(":resources:demo:shared"))
diff --git a/components/resources/demo/shared/build.gradle.kts b/components/resources/demo/shared/build.gradle.kts
@@ -49,13 +49,13 @@ kotlin {
         val wasmJsMain by getting
 
         commonMain.dependencies {
-            implementation(compose.runtime)
-            implementation(compose.material3)
-            implementation("org.jetbrains.compose.material:material-icons-core:1.7.3")
+            implementation(libs.compose.runtime)
+            implementation(libs.compose.material3)
+            implementation(libs.compose.material.icons.core)
             implementation(project(":resources:library"))
         }
         desktopMain.dependencies {
-            implementation(compose.desktop.common)
+            implementation(libs.compose.desktop)
         }
         androidMain.dependencies {
             implementation(libs.androidx.ui.tooling)
@@ -87,10 +87,6 @@ android {
     }
 }
 
-compose.experimental {
-    web.application {}
-}
-
 //because the dependency on the compose library is a project dependency
 compose.resources {
     generateResClass = always
diff --git a/components/resources/library/build.gradle.kts b/components/resources/library/build.gradle.kts
@@ -77,18 +77,17 @@ kotlin {
 
         val commonMain by getting {
             dependencies {
-                implementation(compose.runtime)
-                implementation(compose.foundation)
+                implementation(libs.compose.runtime)
+                implementation(libs.compose.foundation)
                 implementation(libs.kotlinx.coroutines.core)
             }
         }
         val commonTest by getting {
             dependencies {
                 implementation(kotlin("test"))
                 implementation(libs.kotlinx.coroutines.test)
-                implementation(compose.material3)
-                @OptIn(ExperimentalComposeLibrary::class)
-                implementation(compose.uiTest)
+                implementation(libs.compose.material3)
+                implementation(libs.compose.ui.test)
             }
         }
         val blockingMain by creating {
diff --git a/components/settings.gradle.kts b/components/settings.gradle.kts
@@ -33,6 +33,12 @@ dependencyResolutionManagement {
         mavenCentral()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     }
+
+    versionCatalogs {
+        create("libs") {
+            version("compose", extra["compose.version"].toString())
+        }
+    }
 }
 
 include(":SplitPane:library")
diff --git a/components/ui-tooling-preview/demo/shared/build.gradle.kts b/components/ui-tooling-preview/demo/shared/build.gradle.kts
@@ -50,13 +50,13 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(compose.runtime)
-            implementation(compose.material3)
+            implementation(libs.compose.runtime)
+            implementation(libs.compose.material3)
             implementation(project(":ui-tooling-preview:library"))
         }
         val desktopMain by getting
         desktopMain.dependencies {
-            implementation(compose.desktop.common)
+            implementation(libs.compose.desktop)
         }
     }
 }
diff --git a/examples/chat/gradle/libs.versions.toml b/examples/chat/gradle/libs.versions.toml
@@ -0,0 +1,12 @@
+[versions]
+compose = "1.9.1"
+kotlinxDatetime = "0.5.0"
+
+[libraries]
+compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "compose" }
+kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
+compose-desktop = { module = "org.jetbrains.compose.desktop:desktop", version.ref = "compose" }
+material = { module = "org.jetbrains.compose.material:material", version.ref = "compose" }
+material-icons-core = { module = "org.jetbrains.compose.material:material-icons-core", version = "1.7.3" }
+compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "compose" }
+components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "compose"}
diff --git a/examples/chat/settings.gradle.kts b/examples/chat/settings.gradle.kts
@@ -20,6 +20,13 @@ pluginManagement {
         id("org.jetbrains.compose").version(composeVersion)
     }
 }
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            version("compose", extra["compose.version"].toString())
+        }
+    }
+}
 
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
diff --git a/examples/chat/shared/build.gradle.kts b/examples/chat/shared/build.gradle.kts
@@ -54,12 +54,12 @@ kotlin {
         }
         val commonMain by getting {
             dependencies {
-                implementation(compose.ui)
-                implementation(compose.foundation)
-                implementation(compose.material)
-                implementation(compose.components.resources)
-                implementation("org.jetbrains.compose.material:material-icons-core:1.6.11")
-                implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.5.0")
+                implementation(libs.compose.ui)
+                implementation(libs.compose.foundation)
+                implementation(libs.material)
+                implementation(libs.components.resources)
+                implementation(libs.material.icons.core)
+                implementation(libs.kotlinx.datetime)
             }
         }
         val androidMain by getting {
@@ -83,7 +83,7 @@ kotlin {
         }
         val desktopMain by getting {
             dependencies {
-                implementation(compose.desktop.common)
+                implementation(libs.compose.desktop)
             }
         }
 
diff --git a/tutorials/HTML/Getting_Started/README.md b/tutorials/HTML/Getting_Started/README.md
@@ -56,8 +56,8 @@ kotlin {
     sourceSets {
         val jsMain by getting {
             dependencies {
-                implementation(compose.html.core)
-                implementation(compose.runtime)
+                implementation("org.jetbrains.compose.html:html-core:1.9.0")
+                implementation("org.jetbrains.compose:compose-runtime:1.9.0")
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,3 @@`
`1`		`-import org.jetbrains.compose.desktop.application.dsl.TargetFormat`
`2`		`-import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension`
`3`		`-`
`4`	`1`	`plugins {`
`5`	`2`	`kotlin("multiplatform")`
`6`	`3`	`kotlin("plugin.compose")`
`@@ -14,7 +11,7 @@ repositories {`
`14`	`11`	`}`
`15`	`12`
`16`	`13`	`kotlin {`
`17`		`- js(IR) {`
	`14`	`+ js {`
`18`	`15`	`browser()`
`19`	`16`	`binaries.executable()`
`20`	`17`	`}`
`@@ -24,8 +21,8 @@ kotlin {`
`24`	`21`	`resources.srcDir("src/main/resources")`
`25`	`22`
`26`	`23`	`dependencies {`
`27`		`- implementation(compose.web.core)`
`28`		`- implementation(compose.runtime)`
	`24`	`+ implementation(libs.compose.html.core)`
	`25`	`+ implementation(libs.compose.runtime)`
`29`	`26`	`}`
`30`	`27`	`}`
`31`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,12 @@ pluginManagement {`
`9`	`9`	`kotlin("plugin.compose").version(extra["kotlin.version"] as String)`
`10`	`10`	`id("org.jetbrains.compose").version(extra["compose.version"] as String)`
`11`	`11`	`}`
	`12`	`+}`
	`13`	`+`
	`14`	`+dependencyResolutionManagement {`
	`15`	`+ versionCatalogs {`
	`16`	`+ create("libs") {`
	`17`	`+ version("compose", extra["compose.version"].toString())`
	`18`	`+ }`
	`19`	`+ }`
`12`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,14 @@ pluginManagement {`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
	`19`	`+dependencyResolutionManagement {`
	`20`	`+ versionCatalogs {`
	`21`	`+ create("libs") {`
	`22`	`+ version("compose", extra["compose.version"].toString())`
	`23`	`+ }`
	`24`	`+ }`
	`25`	`+}`
	`26`	`+`
`19`	`27`	`plugins {`
`20`	`28`	`id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")`
`21`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ kotlin {`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`commonMain.dependencies {`
`17`		`- api(compose.runtime)`
`18`		`- api(compose.foundation)`
	`17`	`+ api(libs.compose.runtime)`
	`18`	`+ api(libs.compose.foundation)`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ kotlin {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`commonMain.dependencies {`
`19`		`- api(compose.runtime)`
`20`		`- api(compose.foundation)`
	`19`	`+ api(libs.compose.runtime)`
	`20`	`+ api(libs.compose.foundation)`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`}`