Grails 7

.sdkmanrc

@@ -0,0 +1 @@
+java=17.0.17-librca

README.md

@@ -1,10 +1,12 @@
-[![Build Status](https://travis-ci.org/grails-plugins/grails-cache-ehcache.svg)](https://travis-ci.org/grails-plugins/grails-cache-ehcache)
-
 Grails Cache Ehcache Plugin
 ====================
 
 Makes Ehcache the cache implementation for the [Grails Cache Plugin](https://github.com/grails-plugins/grails-cache)
 
+## Grails 7
+
+TODO...
+
 ## Grails 3
 
 See https://plugins.grails.org/plugin/grails/cache-ehcache and [Documentation](http://grails-plugins.github.io/grails-cache-ehcache/latest/)

build.gradle

@@ -1,75 +1,69 @@
 buildscript {
     repositories {
         mavenLocal()
-        maven { url "https://repo.grails.org/grails/core" }
+        maven {
+            url = "https://repo.grails.org/grails/core"
+        }
     }
     dependencies {
-        classpath "org.grails:grails-gradle-plugin:$grailsVersion"
+        classpath platform("org.apache.grails:grails-bom:$grailsVersion")
+        classpath "org.apache.grails:grails-gradle-plugins"
     }
 }
 
-plugins {
-    id 'org.asciidoctor.convert' version '1.5.3'
-}
-
-//version "3.0.1"
-version "3.0.1.BUILD-SNAPSHOT"
-group "org.grails.plugins"
+version = "5.0.0-SNAPSHOT"
+group = "org.grails.plugins"
 
 apply plugin: "eclipse"
 apply plugin: "idea"
-apply plugin: "org.grails.grails-plugin"
-apply plugin: "org.grails.grails-plugin-publish"
+apply plugin: 'org.apache.grails.gradle.grails-plugin'
+apply plugin: 'org.apache.grails.gradle.grails-publish'
+
+compileJava.options.release = 17
 
 repositories {
     mavenLocal()
-    maven { url "https://repo.grails.org/grails/core" }
-}
-
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
-dependencyManagement {
-    imports {
-        mavenBom "org.grails:grails-bom:$grailsVersion"
+    maven {
+        url = "https://repo.grails.org/grails/core"
     }
-    applyMavenExclusions false
 }
 
 configurations {
     documentation
 }
 
 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"
+    implementation platform("org.apache.grails:grails-bom:${grailsVersion}")
 
-    provided "org.grails:grails-web-boot"
-    provided "org.grails:grails-dependencies"
-    provided 'javax.servlet:javax.servlet-api:3.1.0'
-    profile "org.grails.profiles:plugin"
+    compileOnly 'org.springframework.boot:spring-boot-starter-logging'
+    compileOnly "org.springframework.boot:spring-boot-starter-actuator"
+    compileOnly "org.springframework.boot:spring-boot-autoconfigure"
+    compileOnly "org.springframework.boot:spring-boot-starter-tomcat"
 
-    testCompile "org.grails:grails-plugin-testing"
+    compileOnly "org.apache.grails:grails-web-boot"
+    compileOnly "org.apache.grails:grails-dependencies-starter-web"
+    compileOnly 'jakarta.servlet:jakarta.servlet-api'
+    profile "org.apache.grails.profiles:plugin"
 
-    console "org.grails:grails-console"
+    testImplementation "org.apache.grails:grails-testing-support-web"
 
-    compile "org.grails.plugins:cache:4.0.3"
-    compile 'org.ehcache:ehcache:3.4.0'
+    console "org.apache.grails:grails-console"
 
-    documentation "org.codehaus.groovy:groovy-all:2.4.10"
+    implementation "org.apache.grails:grails-cache"
+    implementation "org.ehcache:ehcache", {
+        capabilities {
+            requireCapability('org.ehcache:ehcache-jakarta')
+        }
+    }
 
+    documentation "org.apache.groovy:groovy-all:4.0.29"
 }
 
 bootRun {
     jvmArgs('-Dspring.output.ansi.enabled=always')
 }
-// enable if you wish to package this plugin as a standalone application
-bootRepackage.enabled = false
 
 grailsPublish {
-    userOrg = "grails"
     githubSlug = 'grails-plugins/grails-cache-ehcache'
     license {
         name = 'Apache-2.0'
@@ -79,34 +73,4 @@ grailsPublish {
     developers = [jameskleeh: "James Kleeh"]
 }
 
-asciidoctor {
-    resources {
-        from('src/docs/images')
-        into "./images"
-    }
-
-    attributes 'experimental'  : 'true',
-            'compat-mode'   : 'true',
-            'toc'           : 'left',
-            'icons'         : 'font',
-            'version'       : project.version,
-            'groupId'       : project.group,
-            'artifactId'    : project.name,
-            'sourcedir'     : "${projectDir}/src/main/groovy"
-}
-
-task apidocs(type: Groovydoc) {
-    source project.files('src/main/groovy')
-
-    destinationDir = new File(buildDir, 'docs/api')
-    // Might need a classpath
-    docTitle = "Grails Cache Ehcache ${version}"
-
-    classpath = configurations.documentation
-    groovyClasspath = configurations.documentation
-}
-
-task docs(type:Copy, dependsOn:[apidocs, asciidoctor])  {
-    from "$buildDir/asciidoc/html5"
-    into "$buildDir/docs"
-}
+apply from: layout.projectDirectory.file('gradle/docs-config.gradle')

buildSrc/build.gradle

@@ -0,0 +1,25 @@
+plugins {
+    id 'groovy-gradle-plugin'
+}
+
+file('../gradle.properties').withInputStream {
+    def gradleProperties = new Properties()
+    gradleProperties.load(it)
+    gradleProperties.each { k, v -> ext.set(k, v) }
+
+}
+
+repositories {
+    maven { url = 'https://repo.grails.org/grails/restricted' }
+    maven {
+        url = 'https://repository.apache.org/content/groups/snapshots'
+        content {
+            includeVersionByRegex('org[.]apache[.](grails|groovy).*', '.*', '.*-SNAPSHOT')
+        }
+    }
+}
+
+dependencies {
+    implementation platform("org.apache.grails:grails-bom:$grailsVersion")
+    implementation "org.asciidoctor.jvm.convert:org.asciidoctor.jvm.convert.gradle.plugin:$asciidoctorGradlePluginVersion"
+}

gradle.properties

@@ -1,3 +1,2 @@
-grailsVersion=3.2.8
-gradleWrapperVersion=3.0
-
+grailsVersion=7.0.5
+asciidoctorGradlePluginVersion=4.0.5

gradle/docs-config.gradle

@@ -0,0 +1,63 @@
+import org.asciidoctor.gradle.jvm.AsciidoctorTask
+
+apply plugin: 'org.asciidoctor.jvm.convert'
+
+tasks.withType(Groovydoc).configureEach {
+    access = GroovydocAccess.PROTECTED
+    processScripts = false
+    includeMainForScripts = false
+    includeAuthor = false
+    destinationDir = layout.buildDirectory.dir('docs/api').get().asFile
+    docTitle = "Grails Cache Ehcache ${version}"
+}
+
+tasks.withType(AsciidoctorTask).configureEach {
+    doFirst {
+        println "Woot " + layout.projectDirectory.dir('src/docs/asciidoc')
+    }
+    baseDir = layout.projectDirectory.dir('src/docs/asciidoc')
+    sourceDir = layout.projectDirectory.dir('src/docs/asciidoc')
+    outputDir = layout.buildDirectory.dir('docs/manual')
+    sources {
+        include 'index.adoc'
+    }
+    jvm {
+        jvmArgs += [
+                '--add-opens', 'java.base/sun.nio.ch=ALL-UNNAMED',
+                '--add-opens', 'java.base/java.io=ALL-UNNAMED'
+        ]
+    }
+    attributes = [
+            copyright            : 'Apache License, Version 2.0',
+            docinfo1             : 'true',
+            doctype              : 'book',
+            encoding             : 'utf-8',
+            icons                : 'font',
+            id                   : "$rootProject.name:$version",
+            idprefix             : '',
+            idseparator          : '-',
+            lang                 : 'en',
+            linkattrs            : true,
+            numbered             : '',
+            producer             : 'Asciidoctor',
+            revnumber            : version,
+            setanchors           : true,
+            'source-highlighter' : 'prettify',
+            toc                  : 'left',
+            toc2                 : '',
+            toclevels            : '2',
+            projectVersion       : version
+    ]
+}
+
+tasks.register('apidocs', Groovydoc) {
+    group = 'documentation'
+    description = 'Generates Groovydoc API documentation.'
+
+    source project.files('src/main/groovy')
+
+    destinationDir = layout.buildDirectory.dir('docs/api').get().asFile
+    docTitle = "Grails Cache Ehcache ${version}"
+    classpath = configurations.documentation
+    groovyClasspath = configurations.documentation
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Fri Nov 27 23:09:32 CET 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip