Upgrade to Grails 5 (#141)

build.gradle

@@ -14,58 +14,54 @@ group "org.grails.plugins"
 
 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 plugin:"org.grails.grails-plugin"
 apply plugin:"org.grails.internal.grails-plugin-publish"
-apply from:"https://raw.githubusercontent.com/grails/grails-common-build/v1.0.0/common-docs.gradle"
-apply plugin: "com.github.erdi.webdriver-binaries"
 
 repositories {
  maven { url "https://repo.grails.org/grails/core" }
 }
 
 dependencies {
- compile "gradle.plugin.com.github.erdi.webdriver-binaries:webdriver-binaries-gradle-plugin:$webdriverBinariesVersion"
-
- compile "org.springframework.boot:spring-boot-starter-logging"
- compile "org.springframework.boot:spring-boot-autoconfigure"
- compile "org.grails:grails-core"
- compile "org.springframework.boot:spring-boot-starter-actuator"
- compile "org.springframework.boot:spring-boot-starter-tomcat"
- compile "org.grails:grails-web-boot"
- compile "org.grails:grails-logging"
- compile "org.grails:grails-plugin-rest"
- compile "org.grails:grails-plugin-databinding"
- compile "org.grails:grails-plugin-i18n"
- compile "org.grails:grails-plugin-services"
- compile "org.grails:grails-plugin-url-mappings"
- compile "org.grails:grails-plugin-interceptors"
- compile "org.grails.plugins:cache"
- compile "org.grails.plugins:async"
- compile "org.grails.plugins:scaffolding"
- compile "org.codehaus.gpars:gpars:1.2.1"
- compile "org.grails.plugins:gsp"
-
- runtime "org.grails.plugins:async"
+ api "org.springframework.boot:spring-boot-starter-logging"
+ api "org.springframework.boot:spring-boot-autoconfigure"
+ api "org.grails:grails-core"
+ api "org.springframework.boot:spring-boot-starter-actuator"
+ api "org.springframework.boot:spring-boot-starter-tomcat"
+ api "org.grails:grails-web-boot"
+ api "org.grails:grails-logging"
+ api "org.grails:grails-plugin-rest"
+ api "org.grails:grails-plugin-databinding"
+ api "org.grails:grails-plugin-i18n"
+ api "org.grails:grails-plugin-services"
+ api "org.grails:grails-plugin-url-mappings"
+ api "org.grails:grails-plugin-interceptors"
+ api "org.grails.plugins:async"
+ api "org.grails.plugins:scaffolding"
+ api "org.codehaus.gpars:gpars:1.2.1"
+ api "org.grails.plugins:gsp"
+
+ runtimeOnly "org.grails.plugins:async"
  console "org.grails:grails-console"
  profile "org.grails.profiles:web-plugin"
- provided "org.grails:grails-plugin-services"
- provided "org.grails:grails-plugin-domain-class"
- runtime "com.bertramlabs.plugins:asset-pipeline-grails:3.0.7"
- testCompile "org.grails:grails-gorm-testing-support"
- testCompile "org.grails:grails-web-testing-support"
- testCompile "org.mockito:mockito-core"
- testCompile "org.grails.plugins:geb"
+ compileOnly "org.grails:grails-plugin-services"
+ compileOnly "org.grails:grails-plugin-domain-class"
+ testImplementation "org.grails:grails-gorm-testing-support"
+ testImplementation "org.grails:grails-web-testing-support"
+ testImplementation "org.mockito:mockito-core"
+ testImplementation "org.grails.plugins:geb"
 
- testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
- testRuntime "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
- testRuntime "org.seleniumhq.selenium:selenium-safari-driver:$seleniumVersion"
+ testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
+ testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
+ testRuntimeOnly "org.seleniumhq.selenium:selenium-safari-driver:$seleniumVersion"
 
- testCompile "org.seleniumhq.selenium:selenium-remote-driver:$seleniumVersion"
- testCompile "org.seleniumhq.selenium:selenium-api:$seleniumVersion"
- testCompile "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
+ testImplementation "org.seleniumhq.selenium:selenium-remote-driver:$seleniumVersion"
+ testImplementation "org.seleniumhq.selenium:selenium-api:$seleniumVersion"
+ testImplementation "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
 
 
- compile "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2"
+ api "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2"
 
 
 }
@@ -105,13 +101,13 @@ bootRun {
 bootJar.enabled = false
 grailsPublish {
  userOrg = 'grails'
- githubSlug = 'grails-plugins/grails-cache'
+ githubSlug = 'grails/grails-cache'
  license {
  name = 'Apache-2.0'
  }
  title = project.title
  desc = project.projectDesc
- developers = [jeffbrown: "Jeff Scott Brown"]
+ developers = [jeffbrown: "Jeff Scott Brown", "puneetbehl": "Puneet Behl"]
 }
 
 integrationTest {

gradle.properties

@@ -1,10 +1,10 @@
 projectVersion=6.0.0-SNAPSHOT
-grailsVersion=4.0.13
-grailsGradlePluginVersion=4.0.13
-gormVersion=7.0.8
-gradleWrapperVersion=3.5
-githubSlug=grails-plugins/grails-cache
-githubBranch=master
+grailsVersion=5.1.3
+grailsGradlePluginVersion=5.1.3
+gormVersion=7.2.1
+groovyVersion=3.0.7
+githubSlug=grails/grails-cache
+githubBranch=6.0.x
 title=Cache Plugin
 projectDesc=Provides AST transformations for caching method calls
 guide=../../guide
@@ -15,3 +15,7 @@ webdriverBinariesVersion=2.4
 hibernateCoreVersion=5.1.5.Final
 geckodriverVersion=0.30.0
 chromeDriverVersion=98.0.4758.80
+org.gradle.daemon=true
+org.gradle.caching=true
+org.gradle.parallel=true
+org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1536M -XX:MaxMetaspaceSize=512M

gradle/testVerbose.gradle

@@ -1,4 +1,5 @@
 tasks.withType(Test) {
+ useJUnitPlatform()
  afterTest { desc, result ->
  //logger.quiet " -- Executed test ${desc.name} [${desc.className}] with result: ${result.resultType}"
  }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-6.9.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists