diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d1f72d2..b388652 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: build: strategy: matrix: - java: ['11', '17', '21'] + java: ['21', '25'] runs-on: ubuntu-latest diff --git a/build.gradle.kts b/build.gradle.kts index 15f21d5..f1d1c42 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -38,13 +38,13 @@ gradlePlugin { } java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } kotlin { compilerOptions { - jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11) + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21) } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9..9bbc975 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b..299848b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f3b75f3..faf9300 100755 --- a/gradlew +++ b/gradlew @@ -205,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. diff --git a/src/main/kotlin/dev/poolside/gradle/semanticversion/SemanticVersionTask.kt b/src/main/kotlin/dev/poolside/gradle/semanticversion/SemanticVersionTask.kt index 59f4a12..d7969ac 100644 --- a/src/main/kotlin/dev/poolside/gradle/semanticversion/SemanticVersionTask.kt +++ b/src/main/kotlin/dev/poolside/gradle/semanticversion/SemanticVersionTask.kt @@ -10,9 +10,11 @@ import org.gradle.api.publish.maven.tasks.PublishToMavenRepository import org.gradle.api.tasks.Input import org.gradle.api.tasks.TaskAction import org.gradle.api.tasks.TaskCollection +import org.gradle.work.DisableCachingByDefault import org.w3c.dom.Element import javax.inject.Inject +@DisableCachingByDefault(because = "in case a version was uploaded, should always check") abstract class SemanticVersionTask : DefaultTask() { private val versionRegex = "^\\d+\\.\\d+\$".toRegex() diff --git a/src/main/kotlin/dev/poolside/gradle/semanticversion/VersionFinder.kt b/src/main/kotlin/dev/poolside/gradle/semanticversion/VersionFinder.kt index 56a9a27..8f07c95 100644 --- a/src/main/kotlin/dev/poolside/gradle/semanticversion/VersionFinder.kt +++ b/src/main/kotlin/dev/poolside/gradle/semanticversion/VersionFinder.kt @@ -1,13 +1,14 @@ package dev.poolside.gradle.semanticversion +import org.gradle.api.internal.artifacts.DependencyManagementParameters import org.gradle.api.internal.artifacts.DependencyManagementServices import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ConfiguredModuleComponentRepository import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.DefaultVersionComparator import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.Version import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.VersionParser -import org.gradle.api.internal.initialization.StandaloneDomainObjectContext import org.gradle.api.logging.Logger import org.gradle.api.publish.maven.MavenPublication +import org.gradle.internal.Describables import org.gradle.internal.component.external.model.DefaultModuleComponentSelector import org.gradle.internal.component.model.DefaultComponentOverrideMetadata import org.gradle.internal.resolve.result.DefaultBuildableModuleVersionListingResolveResult @@ -48,7 +49,7 @@ object VersionFinder { val remote = resolver.remoteAccess val local = resolver.localAccess - val handler = dependencyService.newDetachedResolver(StandaloneDomainObjectContext.ANONYMOUS).dependencyHandler + val handler = dependencyService.newDetachedResolver(DependencyManagementParameters(Describables.of("ANONYMOUS"), "", false, false, false)).dependencyHandler val dep = handler.create(group = publication.groupId, name = publication.artifactId, version = versionSearch) val selector = DefaultModuleComponentSelector.newSelector(dep.module, dep.versionConstraint) diff --git a/src/test/kotlin/dev/poolside/gradle/semanticversion/SemanticVersionPluginTest.kt b/src/test/kotlin/dev/poolside/gradle/semanticversion/SemanticVersionPluginTest.kt index f7e0b3c..e1cc60c 100644 --- a/src/test/kotlin/dev/poolside/gradle/semanticversion/SemanticVersionPluginTest.kt +++ b/src/test/kotlin/dev/poolside/gradle/semanticversion/SemanticVersionPluginTest.kt @@ -25,7 +25,7 @@ class SemanticVersionPluginTest { companion object { @JvmStatic private fun gradleVersions(): Stream = Stream.of( - Arguments.of("8.13"), + Arguments.of("9.8.0"), ) }