Merge pull request #185 from grails/feat/deps/upgrade-to-grails6

feat(deps): Upgrade to Grails 6
grails · Mar 17, 2024 · 73ef2c3 · 73ef2c3
2 parents 5eb7f9f + 4962f4b
commit 73ef2c3
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 22 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: 8
+          java-version: 11
       - name: Run Tests
         if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
         id: tests

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['8']
+        java: ['11']
     env:
       GIT_USER_NAME: puneetbehl
       GIT_USER_EMAIL: behlp@objectcomputing.com

diff --git a/build.gradle b/build.gradle
@@ -5,24 +5,34 @@ buildscript {
     dependencies {
         classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
         classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.6.1'
-        classpath "gradle.plugin.com.github.erdi.webdriver-binaries:webdriver-binaries-gradle-plugin:$webdriverBinariesVersion"
+        classpath "com.github.erdi:webdriver-binaries-gradle-plugin:$webdriverBinariesVersion"
     }
 }
 
-version project.projectVersion
 group "org.grails.plugins"
+version project.projectVersion
 
 apply plugin:"eclipse"
 apply plugin:"idea"
 apply plugin: "com.github.erdi.webdriver-binaries"
-apply from:"https://raw.githubusercontent.com/grails/grails-common-build/master/common-docs.gradle"
+apply from:"https://raw.githubusercontent.com/grails/grails-common-build/v2.0.3/common-docs.gradle"
 apply plugin:"org.grails.grails-plugin"
 apply plugin:"org.grails.internal.grails-plugin-publish"
 
 repositories {
     maven { url "https://repo.grails.org/grails/core" }
 }
 
+configurations {
+    all {
+        resolutionStrategy.eachDependency { DependencyResolveDetails details->
+            if (details.requested.group == 'org.seleniumhq.selenium') {
+                details.useVersion(seleniumVersion)
+            }
+        }
+    }
+}
+
 dependencies {
     api "org.springframework.boot:spring-boot-starter-logging"
     api "org.springframework.boot:spring-boot-autoconfigure"
@@ -58,31 +68,28 @@ dependencies {
 
     testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
     testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
-    testRuntimeOnly "org.seleniumhq.selenium:selenium-safari-driver:$seleniumVersion"
+    testRuntimeOnly "org.seleniumhq.selenium:selenium-safari-driver:$seleniumSafariDriverVersion"
 
     testImplementation "org.seleniumhq.selenium:selenium-remote-driver:$seleniumVersion"
     testImplementation "org.seleniumhq.selenium:selenium-api:$seleniumVersion"
     testImplementation "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
 
-
     api "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2"
-
-
 }
+
 apply from: rootProject.file('gradle/testVerbose.gradle')
 
 webdriverBinaries {
-    if (!System.getenv().containsKey('GITHUB_ACTIONS')) {
+    if (!System.getenv().containsKey('CI')) {
         chromedriver "$chromeDriverVersion"
         geckodriver "$geckodriverVersion"
     }
 }
 
 tasks.withType(Test) {
-    systemProperty "geb.env", System.getProperty('geb.env', 'chromeHeadless')
+    systemProperty "geb.env", System.getProperty('geb.env')
     systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest")
-
-    if (!System.getenv().containsKey('GITHUB_ACTIONS')) {
+    if (!System.getenv().containsKey('CI')) {
         systemProperty 'webdriver.chrome.driver', System.getProperty('webdriver.chrome.driver')
         systemProperty 'webdriver.gecko.driver', System.getProperty('webdriver.gecko.driver')
     } else {
@@ -101,8 +108,7 @@ bootRun {
     String springProfilesActive = 'spring.profiles.active'
     systemProperty springProfilesActive, System.getProperty(springProfilesActive)
 }
-// enable if you wish to package this plugin as a standalone application
-bootJar.enabled = false
+
 grailsPublish {
     userOrg = 'grails'
     githubSlug = 'grails/grails-cache'

diff --git a/gradle.properties b/gradle.properties
@@ -1,19 +1,20 @@
 projectVersion=6.0.0-SNAPSHOT
-grailsVersion=5.2.5
-grailsGradlePluginVersion=5.2.4
-gormVersion=7.2.1
-groovyVersion=3.0.7
+grailsVersion=6.1.2
+grailsGradlePluginVersion=6.1.2
+gormVersion=8.1.1
+groovyVersion=3.0.11
 githubSlug=grails/grails-cache
 githubBranch=6.0.x
 title=Cache Plugin
 projectDesc=Provides AST transformations for caching method calls
 guide=../../guide
 tags=../ref/Tags
 gebVersion=6.0
-seleniumVersion=4.6.0
-webdriverBinariesVersion=2.7
+seleniumVersion=4.16.1
+webdriverBinariesVersion=3.2
 hibernateCoreVersion=5.1.5.Final
 geckodriverVersion=0.32.2
+seleniumSafariDriverVersion=4.16.1
 chromeDriverVersion=110.0.5481.77
 org.gradle.daemon=true
 org.gradle.caching=true

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists