Merge pull request #143 from nebula-plugins/space-assignment-fixes

Address Space-assignment syntax in Groovy DSL deprecation for url
nebula-plugins · Dec 10, 2024 · 3816859 · 3816859
2 parents 1673a9a + a2843d1
commit 3816859
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/src/gradleTest/simpleplugin/src/test/groovy/simple/DependenciesSpec.groovy b/src/gradleTest/simpleplugin/src/test/groovy/simple/DependenciesSpec.groovy
@@ -17,7 +17,7 @@ class DependenciesSpec extends IntegrationSpec {
         buildFile << """\
             apply plugin: 'war'
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             dependencies {
                 compile 'testjava:a:0.1.0'

diff --git a/src/main/groovy/nebula/test/dependencies/GradleDependencyGenerator.groovy b/src/main/groovy/nebula/test/dependencies/GradleDependencyGenerator.groovy
@@ -34,10 +34,10 @@ class GradleDependencyGenerator {
             publishing {
                 repositories {
                     maven {
-                        url "../mavenrepo"
+                        url = "../mavenrepo"
                     }
                     ivy {
-                        url "../ivyrepo"
+                        url = "../ivyrepo"
                         patternLayout {
                             ivy '[organisation]/[module]/[revision]/[module]-[revision]-ivy.[ext]'
                             artifact '[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]'
@@ -58,10 +58,10 @@ class GradleDependencyGenerator {
             publishing {
                 repositories {
                     maven {
-                        url "../mavenrepo"
+                        url = "../mavenrepo"
                     }
                     ivy {
-                        url "../ivyrepo"
+                        url = "../ivyrepo"
                         layout('pattern') {
                             ivy '[organisation]/[module]/[revision]/[module]-[revision]-ivy.[ext]'
                             artifact '[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]'
@@ -116,7 +116,7 @@ class GradleDependencyGenerator {
 
     String getMavenRepositoryBlock() {
         """\
-            maven { url '${getMavenRepoUrl()}' }
+            maven { url = '${getMavenRepoUrl()}' }
         """.stripIndent()
     }
 
@@ -140,7 +140,7 @@ class GradleDependencyGenerator {
             String layoutPattern = isGradleOlderThanGradleFive ? LEGACY_PATTERN_LAYOUT : PATTERN_LAYOUT
             return """\
             ivy {
-                url '${getIvyRepoUrl()}'
+                url = '${getIvyRepoUrl()}'
                 ${layoutPattern} {
                     ivy '[organisation]/[module]/[revision]/[module]-[revision]-ivy.[ext]'
                     artifact '[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]'

diff --git a/src/main/groovy/nebula/test/dependencies/repositories/MavenRepo.groovy b/src/main/groovy/nebula/test/dependencies/repositories/MavenRepo.groovy
@@ -26,7 +26,7 @@ class MavenRepo {
 
     String repoString() {
         """\
-            maven { url '${root.absolutePath}' }
+            maven { url = '${root.absolutePath}' }
             """.stripIndent()
     }
 

diff --git a/src/test/groovy/nebula/test/IntegrationTestKitSpecSpec.groovy b/src/test/groovy/nebula/test/IntegrationTestKitSpecSpec.groovy
@@ -44,7 +44,7 @@ class IntegrationTestKitSpecSpec extends IntegrationTestKitSpec {
         buildFile << """
             apply plugin 'java-library'
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             dependencies {
                 implementation 'testjava:a:0.1.0'

diff --git a/src/test/groovy/nebula/test/dependencies/GradleDependencyGeneratorSpec.groovy b/src/test/groovy/nebula/test/dependencies/GradleDependencyGeneratorSpec.groovy
@@ -329,7 +329,7 @@ class GradleDependencyGeneratorSpec extends Specification {
         def generator = new GradleDependencyGenerator(new DependencyGraph(['test.ivy:foo:1.0.0']), 'build/test')
         String expectedBlock = """\
             ivy {
-                url '${generator.getIvyRepoUrl()}'
+                url = '${generator.getIvyRepoUrl()}'
                 patternLayout {
                     ivy '[organisation]/[module]/[revision]/[module]-[revision]-ivy.[ext]'
                     artifact '[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]'
@@ -378,7 +378,7 @@ class GradleDependencyGeneratorSpec extends Specification {
     def 'integration spec maven repository block is available'() {
         def generator = new GradleDependencyGenerator(new DependencyGraph(['test.maven:foo:1.0.0']), 'build/test')
         String expectedBlock = """\
-            maven { url '${generator.getMavenRepoUrl()}' }
+            maven { url = '${generator.getMavenRepoUrl()}' }
         """.stripIndent()
 
         when: