Update grailsVersion to v5 (major) (#32)

* Update dependency org.spockframework:spock-core to v2 * Update grailsVersion to v5 * Update 3.0.0-SNAPSHOT * Update build.gradle Remove mavenLocal repo * Update to Gradle 6.9 * Downgrade to Spock 2.3-groovy-3.0 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Puneet Behl <[email protected]>
grails · Mar 7, 2023 · c6f1f1d · c6f1f1d
1 parent 6332be4
commit c6f1f1d
Show file tree

Hide file tree

Showing 7 changed files with 205 additions and 159 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,27 +1,17 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        maven { url "https://repo.grails.org/grails/core" }
-    }
-    dependencies {
-        classpath "org.grails:grails-gradle-plugin:$grailsVersion"
-    }
-}
-
 plugins {
     id 'org.asciidoctor.convert' version '1.5.3'
+    id 'eclipse'
+    id 'idea'
+    id 'java-library'
+    id 'org.grails.grails-plugin'
+    id 'org.grails.internal.grails-plugin-publish'
 }
 
 version project.projectVersion
 group "org.grails.plugins"
 
-apply plugin: "eclipse"
-apply plugin: "idea"
-apply plugin: "org.grails.grails-plugin"
-apply plugin: "org.grails.internal.grails-plugin-publish"
-
 repositories {
-    mavenLocal()
+    mavenCentral()
     maven { url "https://repo.grails.org/grails/core" }
 }
 
@@ -40,18 +30,18 @@ configurations {
 }
 
 dependencies {
-    provided 'org.springframework.boot:spring-boot-starter-logging'
-    provided "org.springframework.boot:spring-boot-starter-actuator"
-    provided "org.springframework.boot:spring-boot-autoconfigure"
-    provided "org.springframework.boot:spring-boot-starter-tomcat"
-    provided "org.grails:grails-dependencies"
+    api 'org.springframework.boot:spring-boot-starter-logging'
+    api "org.springframework.boot:spring-boot-starter-actuator"
+    api "org.springframework.boot:spring-boot-autoconfigure"
+    api "org.springframework.boot:spring-boot-starter-tomcat"
+    api "org.grails:grails-dependencies"
+    api "org.grails:scaffolding-core:$scaffoldingCoreVersion"
     console "org.grails:grails-console"
-    compile "org.grails:scaffolding-core:$scaffoldingCoreVersion"
     profile "org.grails.profiles:plugin"
-    testCompile("org.spockframework:spock-core:${spockVersion}") {
+    testImplementation("org.spockframework:spock-core:${spockVersion}") {
         exclude group:'org.codehaus.groovy', module: 'groovy-all'
     }
-    documentation "org.codehaus.groovy:groovy-all:$groovyVersion"
+    documentation "org.codehaus.groovy:groovy-all"
 }
 
 bootRun {

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -0,0 +1,7 @@
+repositories {
+    mavenCentral()
+    maven { url "https://repo.grails.org/grails/core/" }
+}
+dependencies {
+    implementation("org.grails:grails-gradle-plugin:5.3.0")
+}
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 #Sun Feb 19 02:42:04 EST 2017
-grailsVersion=4.1.2
+grailsVersion=5.3.0
+grailsGradlePluginVersion=5.3.0
 scaffoldingCoreVersion=2.1.0
-spockVersion=1.2-groovy-2.5
-groovyVersion=2.5.14
+spockVersion=2.3-groovy-3.0
 projectVersion=3.0.0-SNAPSHOT
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists