Merge pull request #737 from Splitties/main

Prepare for release 0.60.6

Author: LouisCAD

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change log for refreshVersions
 
+## Version 0.60.6 (2025-08-15)
+
+### Bug fix
+
+Replaced usage of internal Gradle API that was removed/hidden in Gradle 9.0.0 and caused the builds of "consumer" projects to fail on Gradle upgrade.
+
+Thanks to [AlexanderBartash](https://github.com/AlexanderBartash) for [their contribution](https://github.com/Splitties/refreshVersions/pull/736), and to the people that pinged me in issue [#735](https://github.com/Splitties/refreshVersions/issues/735)!
+
 ## Version 0.60.5 (2024-02-05)
 
 ### New dependency notation

README.md

@@ -26,7 +26,7 @@
 // settings.gradle(.kts)
 plugins {
     // See https://splitties.github.io/refreshVersions
-    id("de.fayard.refreshVersions") version "0.60.5"
+    id("de.fayard.refreshVersions") version "0.60.6"
 }
 
 refreshVersions { // Optional: configure the plugin

dummy-library-for-testing/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

mkdocs.yml

@@ -21,8 +21,8 @@ extra:
     slack: https://app.slack.com/client/T09229ZC6/CP5659EL9
   version:
     gradle: 8.5
-    refreshVersions: '0.60.5'
-    snapshot: '0.60.6-SNAPSHOT'
+    refreshVersions: '0.60.6'
+    snapshot: '0.60.7-SNAPSHOT'
   keyboard_shortcuts:
     find_actions: <kbd>ctrl</kbd>/<kbd>cmd</kbd> + <kbd>shift</kbd> + <kbd>A</kbd>
 

plugins/convention-plugins/src/main/kotlin/PropertyOrEnv.kt

@@ -6,6 +6,10 @@ internal fun Project.propertyOrEnv(key: String): String {
         ?: error("Didn't find any value for the key \"$key\" in Project properties or environment variables.")
 }
 
-internal fun Project.propertyOrEnvOrNull(key: String): String? {
-    return findProperty(key) as String? ?: System.getenv(key)
+internal fun Project.propertyOrEnvOrNull(
+    key: String,
+    nullIfEmpty: Boolean = true
+): String? {
+    return (findProperty(key) as String?)?.takeUnless { nullIfEmpty && it.isEmpty() }
+        ?: System.getenv(key)?.takeUnless { nullIfEmpty && it.isEmpty() }
 }

plugins/convention-plugins/src/main/kotlin/gradle-plugin.gradle.kts

@@ -4,6 +4,7 @@ plugins {
 }
 
 signing {
+    isRequired = false
     useInMemoryPgpKeys(
         propertyOrEnvOrNull("GPG_key_id"),
         propertyOrEnvOrNull("GPG_private_key") ?: return@signing,

plugins/core/src/main/kotlin/de/fayard/refreshVersions/core/MissingVersionEntries.kt

@@ -90,10 +90,10 @@ internal fun findMissingEntries(
                 .filter {
                     it.hasHardcodedVersion(versionsMap, versionKeyReader) && it.version != null
                 }
-                .mapNotNull { dependency: ExternalDependency ->
+                .map { dependency: ExternalDependency ->
                     val versionKey = getVersionPropertyName(
                         ModuleId.Maven(
-                            group = dependency.group ?: return@mapNotNull null,
+                            group = dependency.group,
                             name = dependency.name
                         ),
                         versionKeyReader

plugins/core/src/main/kotlin/de/fayard/refreshVersions/core/RefreshVersionsCoreSetup.kt

@@ -15,7 +15,6 @@ import de.fayard.refreshVersions.core.internal.setupVersionPlaceholdersResolving
 import org.gradle.api.artifacts.ExternalDependency
 import org.gradle.api.file.RegularFile
 import org.gradle.api.initialization.Settings
-import org.gradle.api.internal.artifacts.dependencies.DefaultClientModule
 import org.gradle.kotlin.dsl.apply
 import org.gradle.tooling.UnsupportedVersionException
 import org.gradle.util.GradleVersion
@@ -212,7 +211,7 @@ private fun setupPluginsVersionsResolution(
                 val pluginVersion = requested.version ?: return@eachPlugin
                 UsedPluginsTracker.pluginHasNoEntryInVersionsFile(
                     settings = settings,
-                    dependency = pluginIdToDependency(pluginId, pluginVersion)
+                    dependency = pluginIdToDependency(settings, pluginId, pluginVersion)
                 )
                 return@eachPlugin
             }
@@ -248,5 +247,11 @@ internal fun pluginDependencyNotationToVersionKey(dependencyNotation: String): S
         else -> null
     }
 
-internal fun pluginIdToDependency(pluginId: String, version: String): ExternalDependency =
-    DefaultClientModule(pluginId, "$pluginId.gradle.plugin", version)
+internal fun pluginIdToDependency(
+    settings: Settings,
+    pluginId: String,
+    version: String
+): ExternalDependency {
+    val dependencyNotation = "$pluginId:$pluginId.gradle.plugin:$version"
+    return settings.gradle.rootProject.buildscript.dependencies.create(dependencyNotation) as ExternalDependency
+}

plugins/dependencies/src/main/resources/version-to-removals-revision-mapping.txt

@@ -15,3 +15,4 @@
 0.60.3->19
 0.60.4->19
 0.60.5->19
+0.60.6->19

plugins/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME