Skip to content

Bump to Gradle 9.2 #228

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
merged 2 commits into from
Nov 10, 2025
Merged

Bump to Gradle 9.2 #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94a687c
Bump to Gradle 9.2
eric-labelle Nov 5, 2025
9fdee9e
Fix compile errors
eric-labelle Nov 5, 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
25 changes: 20 additions & 5 deletions ...le-plugin/src/main/kotlin/app/cash/better/dynamic/features/BetterDynamicFeaturesPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ import org.gradle.api.attributes.Attribute
import org.gradle.api.attributes.Usage
import org.gradle.api.file.Directory
import org.gradle.api.tasks.TaskProvider
import org.gradle.configurationcache.extensions.capitalized
import org.gradle.internal.extensions.stdlib.capitalized
import org.gradle.process.CommandLineArgumentProvider

@Suppress("UnstableApiUsage")
Expand Down Expand Up @@ -190,7 +190,7 @@ class BetterDynamicFeaturesPlugin : Plugin<Project> {

private fun Project.createSharedBaseConfiguration(): Configuration = configurations.create(CONFIGURATION_BDF).apply {
isCanBeConsumed = true
isCanBeResolved = true
isCanBeResolved = false
isVisible = false

attributes.apply {
Expand Down Expand Up @@ -226,6 +226,21 @@ class BetterDynamicFeaturesPlugin : Plugin<Project> {
// This allows us to access artifacts created in this project's tasks via the artifactView APIs
dependencies.add(CONFIGURATION_BDF, this)

// Create a separate resolvable configuration for consuming the dependency graphs
val resolvableConfiguration = configurations.create("${CONFIGURATION_BDF}Resolvable").apply {
isCanBeConsumed = false
isCanBeResolved = true
isVisible = false
extendsFrom(configuration)

attributes.apply {
attribute(
Usage.USAGE_ATTRIBUTE,
project.objects.named(Usage::class.java, ATTRIBUTE_USAGE_METADATA),
)
}
}

Comment on lines +229 to +243
Copy link
Collaborator Author

@eric-labelle eric-labelle Nov 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dellisd take a look when you have a chance. This was done by Firebender related to the gradle bump but since you wrote all of this, you're probably better than what Bender thinks :)
Screenshot 2025-11-05 at 9 37 59 AM

androidComponents.onVariants { variant ->
val task = configureDependencyGraphTask(variant)
configuration.outgoing.variants.getByName(VARIANT_DEPENDENCY_GRAPHS) { configurationVariant ->
Expand All @@ -236,13 +251,13 @@ class BetterDynamicFeaturesPlugin : Plugin<Project> {
}
}

val featureDependencyArtifacts = configuration.incoming.artifactView { config ->
val featureDependencyArtifacts = resolvableConfiguration.incoming.artifactView { config ->
config.attributes { container ->
container.attribute(ARTIFACT_TYPE, ARTIFACT_TYPE_FEATURE_DEPENDENCY_GRAPH)
}
}.artifacts.artifactFiles

val baseDependencyArtifacts = configuration.incoming.artifactView { config ->
val baseDependencyArtifacts = resolvableConfiguration.incoming.artifactView { config ->
config.attributes { container ->
container.attribute(ARTIFACT_TYPE, ARTIFACT_TYPE_BASE_DEPENDENCY_GRAPH)
}
Expand Down Expand Up @@ -455,7 +470,7 @@ class BetterDynamicFeaturesPlugin : Plugin<Project> {
) { task ->
task.generatedSources.set(implementationsTask.flatMap { it.generatedFilesDirectory })
val compileConfiguration = setupVariantCodegenDependencies(androidVariant.buildType!!)
task.compileClasspath.setFrom(project.provider { compileConfiguration.resolvedConfiguration.files })
task.compileClasspath.setFrom(project.provider { compileConfiguration.files })
task.kotlinCompiler.from(resolvableKotlinCompilerConfiguration)
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down