Skip to content

Revert hardcoded compose.material3 (2) #5405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igordmn merged 5 commits into from
Aug 29, 2025
Merged

Revert hardcoded compose.material3 (2) #5405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f6dacb1
Pass Material3 version to Gradle plugin
igordmn Aug 28, 2025
e6622b1
Fix build
igordmn Aug 28, 2025
57aeaf4
compose.material3.version=1.9.0-beta04
igordmn Aug 28, 2025
938320e
compose.material3.version=1.9.0-beta03
igordmn Aug 28, 2025
33edf77
Merge branch 'master' into igor.demin/pass-material3-version-to-gradl…
igordmn Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions gradle-plugins/buildSrc/src/main/kotlin/BuildProperties.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ object BuildProperties {
fun composeVersion(project: Project): String =
System.getenv("COMPOSE_GRADLE_PLUGIN_COMPOSE_VERSION")
?: project.findProperty("compose.version") as String
fun composeMaterial3Version(project: Project): String =
project.findProperty("compose.material3.version") as String
fun testsAndroidxCompilerVersion(project: Project): String =
project.findProperty("compose.tests.androidx.compiler.version") as String
fun testsAndroidxCompilerCompatibleVersion(project: Project): String =
Expand Down
72 changes: 0 additions & 72 deletions gradle-plugins/buildSrc/src/main/kotlin/printAllAndroidxReplacements.kt
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions gradle-plugins/compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ val buildConfig = tasks.register("buildConfig", GenerateBuildConfig::class.java)
classFqName.set("org.jetbrains.compose.ComposeBuildConfig")
generatedOutputDir.set(buildConfigDir)
fieldsToGenerate.put("composeVersion", BuildProperties.composeVersion(project))
fieldsToGenerate.put("composeMaterial3Version", BuildProperties.composeMaterial3Version(project))
fieldsToGenerate.put("composeGradlePluginVersion", BuildProperties.deployVersion(project))
}
tasks.named("compileKotlin", KotlinCompilationTask::class) {
Expand Down Expand Up @@ -197,7 +198,3 @@ configureAllTests {
systemProperty("compose.tests.summary.file", summaryDir.resolve("$name.md").absolutePath)
systemProperties(project.properties.filter { it.key.startsWith("compose.") })
}

task("printAllAndroidxReplacements") {
doLast { printAllAndroidxReplacements() }
}
6 changes: 4 additions & 2 deletions gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import org.jetbrains.compose.web.tasks.configureWebCompatibility
import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler

internal val composeVersion get() = ComposeBuildConfig.composeVersion
internal val composeMaterial3Version get() = ComposeBuildConfig.composeMaterial3Version

abstract class ComposePlugin : Plugin<Project> {
override fun apply(project: Project) {
Expand Down Expand Up @@ -72,8 +73,8 @@ abstract class ComposePlugin : Plugin<Project> {
val animationGraphics get() = composeDependency("org.jetbrains.compose.animation:animation-graphics")
val foundation get() = composeDependency("org.jetbrains.compose.foundation:foundation")
val material get() = composeDependency("org.jetbrains.compose.material:material")
val material3 get() = "org.jetbrains.compose.material3:material3:1.8.2"
val material3AdaptiveNavigationSuite get() = "org.jetbrains.compose.material3:material3-adaptive-navigation-suite:1.8.2"
val material3 get() = composeMaterial3Dependency("org.jetbrains.compose.material3:material3")
val material3AdaptiveNavigationSuite get() = composeMaterial3Dependency("org.jetbrains.compose.material3:material3-adaptive-navigation-suite")
val runtime get() = composeDependency("org.jetbrains.compose.runtime:runtime")
val runtimeSaveable get() = composeDependency("org.jetbrains.compose.runtime:runtime-saveable")
val ui get() = composeDependency("org.jetbrains.compose.ui:ui")
Expand Down Expand Up @@ -161,6 +162,7 @@ fun KotlinDependencyHandler.compose(groupWithArtifact: String) = composeDependen
fun DependencyHandler.compose(groupWithArtifact: String) = composeDependency(groupWithArtifact)

private fun composeDependency(groupWithArtifact: String) = "$groupWithArtifact:$composeVersion"
private fun composeMaterial3Dependency(groupWithArtifact: String) = "$groupWithArtifact:$composeMaterial3Version"

private fun setUpGroovyDslExtensions(project: Project) {
project.plugins.withId("org.jetbrains.kotlin.multiplatform") {
Expand Down
1 change: 1 addition & 0 deletions gradle-plugins/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ dev.junit.parallel=false

# Default version of Compose Libraries used by Gradle plugin
compose.version=1.9.0-rc01
compose.material3.version=1.9.0-beta03
# The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI.
compose.tests.kotlin.version=2.2.0
# __SUPPORTED_GRADLE_VERSIONS__
Expand Down
⚡