Skip to content

Commit 7f87247

Browse files
authored
Revert hardcoded compose.material3 (#5441)
Cherry-pick of #5405 Cherry-pick of CI: https://jetbrains.team/p/ui/reviews/58/timeline [TeamCity test build](https://teamcity.jetbrains.com/buildConfiguration/JetBrainsPublicProjects_Compose_BranchRelease_AllPersonalBuild/5528887) Fixes [CMP-8802](https://youtrack.jetbrains.com/issue/CMP-8802) Revert hardcoded `compose.material3` for stable Material in 1.9.1 ## Release Notes ### Migration Notes - Multiple Platforms `compose.material3` alias from Gradle plugin now points to `org.jetbrains.compose.material3:material3:1.9.0` (based on Jetpack Compose `1.4.0`), it was `org.jetbrains.compose.material3:material3:1.8.2` (based on Jetpack Compose `1.3.2`) in Compose Multiplatform `1.9.0`. If you want to stay on the same minor version, replace the alias by an explicit dependency: ``` // was implementation(compose.material3) // replace by implementation("org.jetbrains.compose.material3:material3:1.8.2") ```
2 parents 451e6fa + 96fdba4 commit 7f87247

File tree

5 files changed

+9
-79
lines changed

5 files changed

+9
-79
lines changed

gradle-plugins/buildSrc/src/main/kotlin/BuildProperties.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ object BuildProperties {
1414
fun composeVersion(project: Project): String =
1515
System.getenv("COMPOSE_GRADLE_PLUGIN_COMPOSE_VERSION")
1616
?: project.findProperty("compose.version") as String
17+
fun composeMaterial3Version(project: Project): String =
18+
project.findProperty("compose.material3.version") as String
1719
fun testsAndroidxCompilerVersion(project: Project): String =
1820
project.findProperty("compose.tests.androidx.compiler.version") as String
1921
fun testsAndroidxCompilerCompatibleVersion(project: Project): String =

gradle-plugins/buildSrc/src/main/kotlin/printAllAndroidxReplacements.kt

Lines changed: 0 additions & 72 deletions
This file was deleted.

gradle-plugins/compose/build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ val buildConfig = tasks.register("buildConfig", GenerateBuildConfig::class.java)
2929
classFqName.set("org.jetbrains.compose.ComposeBuildConfig")
3030
generatedOutputDir.set(buildConfigDir)
3131
fieldsToGenerate.put("composeVersion", BuildProperties.composeVersion(project))
32+
fieldsToGenerate.put("composeMaterial3Version", BuildProperties.composeMaterial3Version(project))
3233
fieldsToGenerate.put("composeGradlePluginVersion", BuildProperties.deployVersion(project))
3334
}
3435
tasks.named("compileKotlin", KotlinCompilationTask::class) {
@@ -198,7 +199,3 @@ configureAllTests {
198199
systemProperty("compose.tests.summary.file", summaryDir.resolve("$name.md").absolutePath)
199200
systemProperties(project.properties.filter { it.key.startsWith("compose.") })
200201
}
201-
202-
task("printAllAndroidxReplacements") {
203-
doLast { printAllAndroidxReplacements() }
204-
}

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import org.jetbrains.compose.web.tasks.configureWebCompatibility
3131
import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
3232

3333
internal val composeVersion get() = ComposeBuildConfig.composeVersion
34+
internal val composeMaterial3Version get() = ComposeBuildConfig.composeMaterial3Version
3435

3536
abstract class ComposePlugin : Plugin<Project> {
3637
override fun apply(project: Project) {
@@ -72,8 +73,8 @@ abstract class ComposePlugin : Plugin<Project> {
7273
val animationGraphics get() = composeDependency("org.jetbrains.compose.animation:animation-graphics")
7374
val foundation get() = composeDependency("org.jetbrains.compose.foundation:foundation")
7475
val material get() = composeDependency("org.jetbrains.compose.material:material")
75-
val material3 get() = "org.jetbrains.compose.material3:material3:1.8.2"
76-
val material3AdaptiveNavigationSuite get() = "org.jetbrains.compose.material3:material3-adaptive-navigation-suite:1.8.2"
76+
val material3 get() = composeMaterial3Dependency("org.jetbrains.compose.material3:material3")
77+
val material3AdaptiveNavigationSuite get() = composeMaterial3Dependency("org.jetbrains.compose.material3:material3-adaptive-navigation-suite")
7778
val runtime get() = composeDependency("org.jetbrains.compose.runtime:runtime")
7879
val runtimeSaveable get() = composeDependency("org.jetbrains.compose.runtime:runtime-saveable")
7980
val ui get() = composeDependency("org.jetbrains.compose.ui:ui")
@@ -161,6 +162,7 @@ fun KotlinDependencyHandler.compose(groupWithArtifact: String) = composeDependen
161162
fun DependencyHandler.compose(groupWithArtifact: String) = composeDependency(groupWithArtifact)
162163

163164
private fun composeDependency(groupWithArtifact: String) = "$groupWithArtifact:$composeVersion"
165+
private fun composeMaterial3Dependency(groupWithArtifact: String) = "$groupWithArtifact:$composeMaterial3Version"
164166

165167
private fun setUpGroovyDslExtensions(project: Project) {
166168
project.plugins.withId("org.jetbrains.kotlin.multiplatform") {

gradle-plugins/gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ kotlin.code.style=official
88
dev.junit.parallel=false
99

1010
# Default version of Compose Libraries used by Gradle plugin
11-
compose.version=1.9.0-alpha02
11+
compose.version=1.9.0-rc01
12+
compose.material3.version=1.9.0-beta03
1213
# The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI.
1314
compose.tests.kotlin.version=2.2.0-Beta1
1415
# __SUPPORTED_GRADLE_VERSIONS__

0 commit comments

Comments
 (0)