update test projects for gradle plugin to use direct dependencies (#5469)

kropp · web-flow · commit ce0089608ed0 · 2025-11-12T18:46:06.000+01:00
Update test projects for Gradle plugin to use direct dependencies instead of aliases Describe proposed changes and the issue being fixed Fixes [CMP-9183](https://youtrack.jetbrains.com/issue/CMP-9183) ## Testing Existing tests should continue to pass ## Release Notes N/A
diff --git a/gradle-plugins/compose/build.gradle.kts b/gradle-plugins/compose/build.gradle.kts
@@ -207,6 +207,7 @@ for (gradleVersion in supportedGradleVersions) {
 configureAllTests {
     dependsOn(":publishToMavenLocal")
     systemProperty("compose.tests.compose.gradle.plugin.version", BuildProperties.deployVersion(project))
+    systemProperty("compose.tests.compose.version", BuildProperties.composeVersion(project))
     val summaryDir = project.layout.buildDirectory.get().asFile.resolve("test-summary")
     systemProperty("compose.tests.summary.file", summaryDir.resolve("$name.md").absolutePath)
     systemProperties(project.properties.filter { it.key.startsWith("compose.") })
diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt
@@ -86,7 +86,7 @@ abstract class ComposePlugin : Plugin<Project> {
         @Deprecated("Specify dependency via version catalog", replaceWith = ReplaceWith("\"org.jetbrains.compose.ui:ui-test:${ComposeBuildConfig.composeVersion}\""))
         @ExperimentalComposeLibrary
         val uiTest get() = composeDependency("org.jetbrains.compose.ui:ui-test")
-        @Deprecated("Use org.jetbrains.compose.ui:ui-tooling-preview module instead", replaceWith = ReplaceWith("\"org.jetbrains.compose.ui:ui-tooling:${ComposeBuildConfig.composeVersion}\""))
+        @Deprecated("Use org.jetbrains.compose.ui:ui-tooling module instead", replaceWith = ReplaceWith("\"org.jetbrains.compose.ui:ui-tooling:${ComposeBuildConfig.composeVersion}\""))
         val uiTooling get() = composeDependency("org.jetbrains.compose.ui:ui-tooling")
         @Deprecated("Specify dependency via version catalog", replaceWith = ReplaceWith("\"org.jetbrains.compose.ui:ui-util:${ComposeBuildConfig.composeVersion}\""))
         val uiUtil get() = composeDependency("org.jetbrains.compose.ui:ui-util")
diff --git a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt
@@ -549,8 +549,8 @@ class ResourcesTest : GradlePluginTestBase() {
 
         modifyText("build.gradle.kts") { str ->
             str.replace(
-                "api(compose.components.resources)",
-                "//api(compose.components.resources)"
+                "api(\"org.jetbrains.compose.components:components-resources:${defaultTestEnvironment.composeVersion}\")",
+                "//api(\"org.jetbrains.compose.components:components-resources:${defaultTestEnvironment.composeVersion}\")"
             )
         }
         gradle("prepareKotlinIdeaImport").checks {
@@ -559,8 +559,8 @@ class ResourcesTest : GradlePluginTestBase() {
 
         modifyText("build.gradle.kts") { str ->
             str.replace(
-                "//api(compose.components.resources)",
-                "api(compose.components.resources)"
+                "//api(\"org.jetbrains.compose.components:components-resources:${defaultTestEnvironment.composeVersion}\")",
+                "api(\"org.jetbrains.compose.components:components-resources:${defaultTestEnvironment.composeVersion}\")"
             )
         }
         modifyText("build.gradle.kts") { str ->
@@ -735,9 +735,9 @@ class ResourcesTest : GradlePluginTestBase() {
                     |    sourceSets {
                     |        commonMain {
                     |            dependencies {
-                    |                implementation(compose.runtime)
-                    |                implementation(compose.material)
-                    |                implementation(compose.components.resources)
+                    |                implementation("org.jetbrains.compose.runtime:runtime:${defaultTestEnvironment.composeVersion}")
+                    |                implementation("org.jetbrains.compose.material:material:${defaultTestEnvironment.composeVersion}")
+                    |                implementation("org.jetbrains.compose.components:components-resources:${defaultTestEnvironment.composeVersion}")
                     |            }
                     |        }
                     |    }
@@ -784,9 +784,9 @@ class ResourcesTest : GradlePluginTestBase() {
                     |    sourceSets {
                     |        commonMain {
                     |            dependencies {
-                    |                implementation(compose.runtime)
-                    |                implementation(compose.material)
-                    |                implementation(compose.components.resources)
+                    |                implementation("org.jetbrains.compose.runtime:runtime:${defaultTestEnvironment.composeVersion}")
+                    |                implementation("org.jetbrains.compose.material:material:${defaultTestEnvironment.composeVersion}")
+                    |                implementation("org.jetbrains.compose.components:components-resources:${defaultTestEnvironment.composeVersion}")
                     |            }
                     |        }
                     |    }
diff --git a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/WebCompatibilityDistributionTest.kt b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/WebCompatibilityDistributionTest.kt
@@ -34,7 +34,7 @@ class WebCompatibilityDistributionTest : GradlePluginTestBase() {
     }
 
     private fun TestProject.applyBuildConfig(caseName: String) {
-        file("build.gradle.kts.${caseName}").renameTo(file("build.gradle.kts"))
+        file("build.${caseName}.gradle.kts").renameTo(file("build.gradle.kts"))
     }
 
     @Test
diff --git a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/utils/TestProject.kt b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/utils/TestProject.kt
@@ -18,6 +18,7 @@ data class TestEnvironment(
     val gradleVersion: String = TestProperties.gradleVersion,
     val agpVersion: String = TestProperties.agpVersion,
     val composeGradlePluginVersion: String = TestProperties.composeGradlePluginVersion,
+    val composeVersion: String = TestProperties.composeVersion,
     val mokoResourcesPluginVersion: String = "0.23.0",
     val composeCompilerPlugin: String? = null,
     val composeCompilerArgs: String? = null,
@@ -27,6 +28,7 @@ data class TestEnvironment(
 ) {
     private val placeholders = linkedMapOf(
         "COMPOSE_GRADLE_PLUGIN_VERSION_PLACEHOLDER" to composeGradlePluginVersion,
+        "COMPOSE_VERSION_PLACEHOLDER" to composeVersion,
         "KOTLIN_VERSION_PLACEHOLDER" to kotlinVersion,
         "AGP_VERSION_PLACEHOLDER" to agpVersion,
         "COMPOSE_COMPILER_PLUGIN_PLACEHOLDER" to composeCompilerPlugin,
diff --git a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/utils/TestProperties.kt b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/utils/TestProperties.kt
@@ -14,6 +14,9 @@ object TestProperties {
     val composeGradlePluginVersion: String
         get() = notNullSystemProperty("compose.tests.compose.gradle.plugin.version")
 
+    val composeVersion: String
+        get() = notNullSystemProperty("compose.tests.compose.version")
+
     val gradleVersion: String
         get() = notNullSystemProperty("compose.tests.gradle.version")
 
diff --git a/gradle-plugins/compose/src/test/test-projects/application/jsMpp/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/jsMpp/build.gradle
@@ -15,8 +15,8 @@ kotlin {
         }
         named("jsMain") { 
             dependencies {
-                implementation(compose.html.core)
-                implementation(compose.runtime)
+                implementation("org.jetbrains.compose.html:html-core:COMPOSE_VERSION_PLACEHOLDER")
+                implementation("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")
             }
         }
         named("jvmMain") {
diff --git a/gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/build.gradle
@@ -18,10 +18,10 @@ kotlin {
     sourceSets {
         getByName("commonMain") {
             dependencies {
-                implementation(compose.ui)
-                implementation(compose.runtime)
-                implementation(compose.foundation)
-                implementation(compose.material3)
+                implementation("org.jetbrains.compose.ui:ui:COMPOSE_VERSION_PLACEHOLDER")
+                implementation("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")
+                implementation("org.jetbrains.compose.foundation:foundation:COMPOSE_VERSION_PLACEHOLDER")
+                implementation("org.jetbrains.compose.material3:material3:1.9.0")
             }
         }
     }
diff --git a/gradle-plugins/compose/src/test/test-projects/application/proguard/build.gradle b/gradle-plugins/compose/src/test/test-projects/application/proguard/build.gradle
@@ -12,7 +12,8 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:1.9.0"
     implementation compose.desktop.currentOs
-    implementation compose.material3
+    // material3 is not used, but it is a part of the test
+    implementation "org.jetbrains.compose.material3:material3:1.9.0"
 }
 
 compose.desktop {
diff --git a/gradle-plugins/compose/src/test/test-projects/application/webApp/build.WebApp.gradle.kts b/gradle-plugins/compose/src/test/test-projects/application/webApp/build.WebApp.gradle.kts
@@ -17,7 +17,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(compose.runtime)
+            implementation("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")
         }
 
         val webMain by creating { dependsOn(commonMain.get()) }
diff --git a/gradle-plugins/compose/src/test/test-projects/application/webApp/build.WebAppWithKmmBridge.gradle.kts b/gradle-plugins/compose/src/test/test-projects/application/webApp/build.WebAppWithKmmBridge.gradle.kts
@@ -18,7 +18,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(compose.runtime)
+            implementation("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")
         }
 
         val webMain by creating { dependsOn(commonMain.get()) }
diff --git a/gradle-plugins/compose/src/test/test-projects/application/webApp/build.WebJsNonExecutable.gradle.kts b/gradle-plugins/compose/src/test/test-projects/application/webApp/build.WebJsNonExecutable.gradle.kts
@@ -15,7 +15,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(compose.runtime)
+            implementation("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")
         }
 
         val webMain by creating { dependsOn(commonMain.get()) }
diff --git a/gradle-plugins/compose/src/test/test-projects/application/webApp/build.WebJsOnly.gradle.kts b/gradle-plugins/compose/src/test/test-projects/application/webApp/build.WebJsOnly.gradle.kts
@@ -12,7 +12,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(compose.runtime)
+            implementation("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")
         }
 
         val webMain by creating { dependsOn(commonMain.get()) }
diff --git a/gradle-plugins/compose/src/test/test-projects/application/webApp/build.WebJsWasmNonStandardBundleNames.gradle.kts b/gradle-plugins/compose/src/test/test-projects/application/webApp/build.WebJsWasmNonStandardBundleNames.gradle.kts
@@ -21,7 +21,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(compose.runtime)
+            implementation("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")
         }
 
         val webMain by creating { dependsOn(commonMain.get()) }
diff --git a/gradle-plugins/compose/src/test/test-projects/application/webApp/build.WebJsWasmNonStandardTargetNames.gradle.kts b/gradle-plugins/compose/src/test/test-projects/application/webApp/build.WebJsWasmNonStandardTargetNames.gradle.kts
@@ -17,7 +17,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(compose.runtime)
+            implementation("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")
         }
 
         val webMain by creating { dependsOn(commonMain.get()) }
diff --git a/gradle-plugins/compose/src/test/test-projects/application/webApp/build.WebJsWasmRepacked.gradle.kts b/gradle-plugins/compose/src/test/test-projects/application/webApp/build.WebJsWasmRepacked.gradle.kts
@@ -17,7 +17,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(compose.runtime)
+            implementation("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")
         }
 
         val webMain by creating { dependsOn(commonMain.get()) }
diff --git a/gradle-plugins/compose/src/test/test-projects/application/webApp/build.WebSingleExecutable.gradle.kts b/gradle-plugins/compose/src/test/test-projects/application/webApp/build.WebSingleExecutable.gradle.kts
@@ -16,7 +16,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(compose.runtime)
+            implementation("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")
         }
 
         val webMain by creating { dependsOn(commonMain.get()) }
diff --git a/gradle-plugins/compose/src/test/test-projects/application/webApp/build.WebWasmOnly.gradle.kts b/gradle-plugins/compose/src/test/test-projects/application/webApp/build.WebWasmOnly.gradle.kts
@@ -12,7 +12,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(compose.runtime)
+            implementation("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")
         }
 
         val webMain by creating { dependsOn(commonMain.get()) }
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/androidAppWithResources/appModule/src/main/kotlin/me/sample/app/App.kt b/gradle-plugins/compose/src/test/test-projects/misc/androidAppWithResources/appModule/src/main/kotlin/me/sample/app/App.kt
@@ -1,7 +1,7 @@
 package me.sample.app
 
 import androidx.compose.foundation.layout.Column
-import androidx.compose.material3.Text
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import newagpresources.featuremodule.generated.resources.*
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/androidAppWithResources/featureModule/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/androidAppWithResources/featureModule/build.gradle.kts
@@ -17,9 +17,9 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(compose.runtime)
-            api(compose.material3)
-            api(compose.components.resources)
+            api("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")
+            api("org.jetbrains.compose.material:material:COMPOSE_VERSION_PLACEHOLDER")
+            api("org.jetbrains.compose.components:components-resources:COMPOSE_VERSION_PLACEHOLDER")
         }
     }
 }
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/androidAppWithResources/featureModule/src/commonMain/kotlin/me/sample/app/Feature.kt b/gradle-plugins/compose/src/test/test-projects/misc/androidAppWithResources/featureModule/src/commonMain/kotlin/me/sample/app/Feature.kt
@@ -1,6 +1,6 @@
 package me.sample.app
 
-import androidx.compose.material3.Text
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import org.jetbrains.compose.resources.stringResource
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/appleResources/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/appleResources/build.gradle.kts
@@ -24,9 +24,9 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation(compose.runtime)
-                implementation(compose.material)
-                implementation(compose.components.resources)
+                implementation("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")
+                implementation("org.jetbrains.compose.material:material:COMPOSE_VERSION_PLACEHOLDER")
+                implementation("org.jetbrains.compose.components:components-resources:COMPOSE_VERSION_PLACEHOLDER")
             }
         }
     }
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/bundledKotlinPoet/app/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/bundledKotlinPoet/app/build.gradle.kts
@@ -13,9 +13,9 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation(compose.runtime)
-                implementation(compose.material)
-                implementation(compose.components.resources)
+                implementation("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")
+                implementation("org.jetbrains.compose.material:material:COMPOSE_VERSION_PLACEHOLDER")
+                implementation("org.jetbrains.compose.components:components-resources:COMPOSE_VERSION_PLACEHOLDER")
             }
         }
     }
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/commonResources/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/commonResources/build.gradle.kts
@@ -19,11 +19,11 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation(compose.runtime)
-                implementation(compose.material)
-                //there is the api to check correctness of the api configuration
-                //https://github.com/JetBrains/compose-multiplatform/issues/4405
-                api(compose.components.resources)
+                implementation("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")
+                implementation("org.jetbrains.compose.material:material:COMPOSE_VERSION_PLACEHOLDER")
+                // there is the api to check correctness of the api configuration
+                // https://youtrack.jetbrains.com/issue/CMP-4405
+                api("org.jetbrains.compose.components:components-resources:COMPOSE_VERSION_PLACEHOLDER")
             }
         }
     }
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/emptyResources/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/emptyResources/build.gradle.kts
@@ -12,9 +12,9 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation(compose.runtime)
-                implementation(compose.material)
-                implementation(compose.components.resources)
+                implementation("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")
+                implementation("org.jetbrains.compose.material:material:COMPOSE_VERSION_PLACEHOLDER")
+                implementation("org.jetbrains.compose.components:components-resources:COMPOSE_VERSION_PLACEHOLDER")
             }
         }
     }
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/fullTargetsAppWithResources/sharedUI/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/fullTargetsAppWithResources/sharedUI/build.gradle.kts
@@ -28,10 +28,10 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(compose.runtime)
-            api(compose.ui)
-            api(compose.foundation)
-            api(compose.components.resources)
+            api("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")
+            api("org.jetbrains.compose.ui:ui:COMPOSE_VERSION_PLACEHOLDER")
+            api("org.jetbrains.compose.foundation:foundation:COMPOSE_VERSION_PLACEHOLDER")
+            api("org.jetbrains.compose.components:components-resources:COMPOSE_VERSION_PLACEHOLDER")
         }
     }
 
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/hugeResources/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/hugeResources/build.gradle.kts
@@ -12,9 +12,9 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation(compose.runtime)
-                implementation(compose.material)
-                implementation(compose.components.resources)
+                implementation("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")
+                implementation("org.jetbrains.compose.material:material:COMPOSE_VERSION_PLACEHOLDER")
+                implementation("org.jetbrains.compose.components:components-resources:COMPOSE_VERSION_PLACEHOLDER")
             }
         }
     }
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/jsMpp/build.gradle b/gradle-plugins/compose/src/test/test-projects/misc/jsMpp/build.gradle
@@ -15,8 +15,8 @@ kotlin {
         }
         named("jsMain") { 
             dependencies {
-                implementation(compose.html.core)
-                implementation(compose.runtime)
+                implementation("org.jetbrains.compose.html:html-core:COMPOSE_VERSION_PLACEHOLDER")
+                implementation("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")
             }
         }
         named("jvmMain") {
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/jvmOnlyResources/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/jvmOnlyResources/build.gradle.kts
@@ -8,6 +8,6 @@ group = "me.app"
 
 dependencies {
     implementation(compose.desktop.currentOs)
-    implementation(compose.components.resources)
+    implementation("org.jetbrains.compose.components:components-resources:COMPOSE_VERSION_PLACEHOLDER")
 }
 
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/jvmPreview/common/build.gradle b/gradle-plugins/compose/src/test/test-projects/misc/jvmPreview/common/build.gradle
@@ -9,10 +9,10 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api compose.runtime
-            api compose.foundation
-            api compose.material
-            api compose.uiTooling
+            api "org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER"
+            api "org.jetbrains.compose.foundation:foundation:COMPOSE_VERSION_PLACEHOLDER"
+            api "org.jetbrains.compose.material:material:COMPOSE_VERSION_PLACEHOLDER"
+            api "org.jetbrains.compose.ui:ui-tooling:COMPOSE_VERSION_PLACEHOLDER"
         }
     }
 }
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/jvmPreview/common/src/commonMain/kotlin/preview.kt b/gradle-plugins/compose/src/test/test-projects/misc/jvmPreview/common/src/commonMain/kotlin/preview.kt
@@ -1,5 +1,5 @@
 import androidx.compose.runtime.Composable
-import androidx.compose.desktop.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
 
 @Preview
 @Composable
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/jvmPreview/jvm/build.gradle b/gradle-plugins/compose/src/test/test-projects/misc/jvmPreview/jvm/build.gradle
@@ -6,6 +6,6 @@ plugins {
 
 dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-stdlib'
-    implementation compose.uiTooling
+    api "org.jetbrains.compose.ui:ui-tooling:COMPOSE_VERSION_PLACEHOLDER"
     implementation compose.desktop.currentOs
 }
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/jvmPreview/jvm/src/main/kotlin/preview.kt b/gradle-plugins/compose/src/test/test-projects/misc/jvmPreview/jvm/src/main/kotlin/preview.kt
@@ -1,7 +1,7 @@
 import androidx.compose.material.Text
 import androidx.compose.material.Button
 import androidx.compose.runtime.*
-import androidx.compose.desktop.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
 
 @Preview
 @Composable
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/jvmPreview/mpp/build.gradle b/gradle-plugins/compose/src/test/test-projects/misc/jvmPreview/mpp/build.gradle
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/appModule/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/appModule/build.gradle.kts
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/cmplib/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/cmplib/build.gradle.kts
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/featureModule/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/featureModule/build.gradle.kts
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/macosNativeResources/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/macosNativeResources/build.gradle.kts
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/oldAndroidTargetAppWithResources/appModule/src/main/kotlin/me/sample/app/App.kt b/gradle-plugins/compose/src/test/test-projects/misc/oldAndroidTargetAppWithResources/appModule/src/main/kotlin/me/sample/app/App.kt
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/oldAndroidTargetAppWithResources/featureModule/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/oldAndroidTargetAppWithResources/featureModule/build.gradle.kts
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/oldAndroidTargetAppWithResources/featureModule/src/commonMain/kotlin/me/sample/app/Feature.kt b/gradle-plugins/compose/src/test/test-projects/misc/oldAndroidTargetAppWithResources/featureModule/src/commonMain/kotlin/me/sample/app/Feature.kt
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/skikoWasm/build.gradle b/gradle-plugins/compose/src/test/test-projects/misc/skikoWasm/build.gradle
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/testResources/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/testResources/build.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class WebCompatibilityDistributionTest : GradlePluginTestBase() {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`private fun TestProject.applyBuildConfig(caseName: String) {`
`37`		`- file("build.gradle.kts.${caseName}").renameTo(file("build.gradle.kts"))`
	`37`	`+ file("build.${caseName}.gradle.kts").renameTo(file("build.gradle.kts"))`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ kotlin {`
`15`	`15`	`}`
`16`	`16`	`named("jsMain") {`
`17`	`17`	`dependencies {`
`18`		`- implementation(compose.html.core)`
`19`		`- implementation(compose.runtime)`
	`18`	`+ implementation("org.jetbrains.compose.html:html-core:COMPOSE_VERSION_PLACEHOLDER")`
	`19`	`+ implementation("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`named("jvmMain") {`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,10 @@ kotlin {`
`18`	`18`	`sourceSets {`
`19`	`19`	`getByName("commonMain") {`
`20`	`20`	`dependencies {`
`21`		`- implementation(compose.ui)`
`22`		`- implementation(compose.runtime)`
`23`		`- implementation(compose.foundation)`
`24`		`- implementation(compose.material3)`
	`21`	`+ implementation("org.jetbrains.compose.ui:ui:COMPOSE_VERSION_PLACEHOLDER")`
	`22`	`+ implementation("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")`
	`23`	`+ implementation("org.jetbrains.compose.foundation:foundation:COMPOSE_VERSION_PLACEHOLDER")`
	`24`	`+ implementation("org.jetbrains.compose.material3:material3:1.9.0")`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@ dependencies {`
`12`	`12`	`implementation "org.jetbrains.kotlin:kotlin-stdlib"`
`13`	`13`	`implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:1.9.0"`
`14`	`14`	`implementation compose.desktop.currentOs`
`15`		`- implementation compose.material3`
	`15`	`+ // material3 is not used, but it is a part of the test`
	`16`	`+ implementation "org.jetbrains.compose.material3:material3:1.9.0"`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`compose.desktop {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ kotlin {`
`17`	`17`
`18`	`18`	`sourceSets {`
`19`	`19`	`commonMain.dependencies {`
`20`		`- implementation(compose.runtime)`
	`20`	`+ implementation("org.jetbrains.compose.runtime:runtime:COMPOSE_VERSION_PLACEHOLDER")`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`val webMain by creating { dependsOn(commonMain.get()) }`