Remove deprecation warning from init-script (#491)

gradle · Dec 18, 2024 · 5c7e362 · 5c7e362
1 parent 4213e78
commit 5c7e362
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.../resources/init-scripts/gradle-actions.github-dependency-graph-gradle-plugin-apply.groovy b/.../resources/init-scripts/gradle-actions.github-dependency-graph-gradle-plugin-apply.groovy
@@ -11,7 +11,7 @@ buildscript {
   logger.lifecycle("Resolving dependency graph plugin ${dependencyGraphPluginVersion} from plugin repository: ${pluginRepositoryUrl}")
   repositories {
     maven { 
-      url pluginRepositoryUrl 
+      url = pluginRepositoryUrl
       if (pluginRepositoryUsername && pluginRepositoryPassword) {
         logger.lifecycle("Applying credentials for plugin repository: ${pluginRepositoryUrl}")
         credentials {

diff --git a/...test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDependencyGraph.groovy b/...test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDependencyGraph.groovy
@@ -141,7 +141,7 @@ class TestDependencyGraph extends BaseInitScriptTest {
         // TODO:DAZ This props are set too late to control init-script plugin resolution
         // This makes the tests fail on Mac with Gradle < 6
         def args = jvmArgs
-        args.add('-DGRADLE_PLUGIN_REPOSITORY_URL=https://plugins.grdev.net/m2')
+        args.add('-Dgradle.plugin-repository.url=https://plugins.grdev.net/m2')
         def result = run(['help', '--info'], initScript, testGradleVersion.gradleVersion, args, vars)
 
         then:
@@ -160,12 +160,11 @@ class TestDependencyGraph extends BaseInitScriptTest {
         vars.put('GRADLE_PLUGIN_REPOSITORY_URL', 'https://plugins.grdev.net/m2')
         vars.put('GRADLE_PLUGIN_REPOSITORY_USERNAME', 'REPO_USER')
         vars.put('GRADLE_PLUGIN_REPOSITORY_PASSWORD', 'REPO_PASSWORD')
-        // TODO:DAZ This props are set too late to control init-script plugin resolution
-        // This makes the tests fail on Mac with Gradle < 6
+
         def args = jvmArgs
-        args.add('-DGRADLE_PLUGIN_REPOSITORY_URL=https://plugins.grdev.net/m2')
-        args.add('-DGRADLE_PLUGIN_REPOSITORY_USERNAME=REPO_USER')
-        args.add('-DGRADLE_PLUGIN_REPOSITORY_PASSWORD=REPO_PASSWORD')
+        args.add('-Dgradle.plugin-repository.url=https://plugins.grdev.net/m2')
+        args.add('-Dgradle.plugin-repository.username=REPO_USER')
+        args.add('-Dgradle.plugin-repository.password=REPO_PASSWORD')
         def result = run(['help', '--info'], initScript, testGradleVersion.gradleVersion, args, vars)
 
         then: