Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
gradle 8.13 upgrade and api change with ModuleComponentRepositoryAccess
  • Loading branch information
countableSet committed Mar 4, 2025
commit 006948f0c9b1bdb8febdce87f58c051c0aae63e6
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
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.12-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 3 additions & 1 deletion gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ import org.gradle.api.internal.initialization.StandaloneDomainObjectContext
import org.gradle.api.logging.Logger
import org.gradle.api.publish.maven.MavenPublication
import org.gradle.internal.component.external.model.DefaultModuleComponentSelector
import org.gradle.internal.component.external.model.GradleDependencyMetadata
import org.gradle.internal.component.model.DefaultComponentOverrideMetadata
import org.gradle.internal.resolve.result.DefaultBuildableModuleVersionListingResolveResult
import org.gradle.kotlin.dsl.create
import java.util.Collections

object VersionFinder {

Expand Down Expand Up @@ -52,11 +51,10 @@ object VersionFinder {
val handler = dependencyService.newDetachedResolver(StandaloneDomainObjectContext.ANONYMOUS).dependencyHandler
val dep = handler.create(group = publication.groupId, name = publication.artifactId, version = versionSearch)
val selector = DefaultModuleComponentSelector.newSelector(dep.module, dep.versionConstraint)
val metadata = GradleDependencyMetadata(selector, Collections.emptyList(), false, false, null, false, null)

val result = DefaultBuildableModuleVersionListingResolveResult()
remote.listModuleVersions(metadata, result)
local.listModuleVersions(metadata, result)
remote.listModuleVersions(selector, DefaultComponentOverrideMetadata.EMPTY, result)
local.listModuleVersions(selector, DefaultComponentOverrideMetadata.EMPTY, result)

logger.debug("Resolved versions ${result.versions}")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ class SemanticVersionPluginTest {
companion object {
@JvmStatic
private fun gradleVersions(): Stream<Arguments> = Stream.of(
Arguments.of("8.11"),
Arguments.of("8.12"),
Arguments.of("8.13"),
)
}

Expand Down