Gradle 8.5-rc-1

nebula-plugins · Nov 10, 2023 · c02a196 · c02a196
1 parent 21ecaf7
commit c02a196
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 32 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ import org.gradle.api.tasks.testing.Test
  */
 
 plugins {
-    id 'com.netflix.nebula.plugin-plugin' version '20.8.1'
+    id 'com.netflix.nebula.plugin-plugin' version '20.9.0'
     id 'java-library'
 }
 

diff --git 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.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-rc-1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/test/groovy/nebula/test/MutableProjectStateWarningCheckIntegrationSpec.groovy b/src/test/groovy/nebula/test/MutableProjectStateWarningCheckIntegrationSpec.groovy
@@ -9,19 +9,9 @@ class MutableProjectStateWarningCheckIntegrationSpec extends IntegrationSpec {
         given:
         settingsFile << """
             rootProject.name = "foo"
-            include ":bar"
         """
-
-        buildFile << """
-             task resolve {
-                doLast {
-                    println project(':bar').configurations.bar.files
-                }
-            }
-
-            
-            project(':bar') {
-                repositories {
+        addSubproject('bar', """
+ repositories {
                     mavenCentral()
                 }
                 
@@ -32,7 +22,13 @@ class MutableProjectStateWarningCheckIntegrationSpec extends IntegrationSpec {
                 dependencies {
                     bar group: 'junit', name: 'junit', version: '4.12'
                 }
-            }       
+""")
+        buildFile << """
+             task resolve {
+                doLast {
+                    println project(':bar').configurations.bar.files
+                }
+            }    
         """
 
 
@@ -48,23 +44,9 @@ class MutableProjectStateWarningCheckIntegrationSpec extends IntegrationSpec {
         given:
         settingsFile << """
             rootProject.name = "foo"
-            include ":bar"
         """
-
-        buildFile << """
-             task resolve {
-                def thread = new Thread({
-                    println project(':bar').configurations.bar.files
-                })
-                doFirst {
-                    thread.start()
-                    thread.join()
-                }
-            }
-
-            
-            project(':bar') {
-                repositories {
+        addSubproject('bar', """
+ repositories {
                     mavenCentral()
                 }
                 
@@ -75,7 +57,17 @@ class MutableProjectStateWarningCheckIntegrationSpec extends IntegrationSpec {
                 dependencies {
                     bar group: 'junit', name: 'junit', version: '4.12'
                 }
-            }       
+""")
+        buildFile << """
+             task resolve {
+                def thread = new Thread({
+                    println project(':bar').configurations.bar.files
+                })
+                doFirst {
+                    thread.start()
+                    thread.join()
+                }
+            }   
         """