Merge pull request #274 from grails/7.0.x-simplify

7.0.x simplify
grails · Dec 20, 2024 · 8d9beb9 · 8d9beb9
2 parents 9754062 + 37cb970
commit 8d9beb9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/.sdkmanrc b/.sdkmanrc
@@ -1 +1,3 @@
-java=17.0.12-librca
+java=17.0.13-librca
+gradle=8.11.1
+
diff --git a/build.gradle b/build.gradle
@@ -17,13 +17,19 @@ ext {
     grailsVersion = grailsVersionList[0]
 }
 
-subprojects {
+subprojects { prj ->
     configurations.all {
         // check for updates every build
         resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
     }
 
+    String useMavenLocal = project.findProperty('mavenLocal')
     repositories {
+        if (useMavenLocal || useMavenLocal != 'last') {
+            println "Using mavenLocal() first on project `${prj.name}`"
+            mavenLocal()
+        }
+
         maven { url "https://repo.grails.org/grails/core" }
         mavenCentral()
         if(groovyVersion.endsWith('-SNAPSHOT')) {
@@ -32,6 +38,10 @@ subprojects {
                 url = 'https://repository.apache.org/content/repositories/snapshots'
             }
         }
+        if (useMavenLocal == 'last') {
+            println "Using mavenLocal() last on project `${prj.name}`"
+            mavenLocal()
+        }
     }
 
     tasks.withType(Test) {

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.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME