Merge pull request #183 from jdaugherty/6.0.x

Prep for moving to grails-core

Author: jdaugherty

build.gradle

@@ -1,12 +1,25 @@
 import io.github.gradlenexus.publishplugin.InitializeNexusStagingRepository
 
+buildscript {
+    repositories {
+        gradlePluginPortal()
+        mavenCentral()
+        maven { url = 'https://repo.grails.org/grails/core' }
+    }
+    dependencies {
+        classpath 'io.github.gradle-nexus:publish-plugin:1.3.0'
+        classpath "org.grails:grails-gradle-plugin:${grailsGradlePluginVersion}"
+        classpath "org.grails:grails-docs:${grailsVersion}"
+    }
+}
+
 plugins {
     id 'groovy'
-    id 'io.github.gradle-nexus.publish-plugin'
 }
 
+apply plugin: 'io.github.gradle-nexus.publish-plugin'
+
 version = projectVersion
-ext.set('grailsVersion', libs.versions.grails.get())
 ext.set('isSnapshot', projectVersion.endsWith('-SNAPSHOT'))
 ext.set('isReleaseVersion', !isSnapshot)
 
@@ -71,11 +84,6 @@ subprojects {
             }
         }
     }
-
-    dependencies {
-        implementation platform(libs.grails.bom)
-    }
-
     tasks.withType(Test).configureEach {
         useJUnitPlatform()
         testLogging {

buildSrc/build.gradle

@@ -7,6 +7,7 @@ plugins {
 configurations.register('groovydocRuntimeOnly')
 
 dependencies {
+    implementation platform("org.grails:grails-bom:${grailsVersion}")
     groovydocRuntimeOnly localGroovy()
 }
 
@@ -56,10 +57,10 @@ tasks.register('generateGuide', PublishGuide) {
             'sourcedir': rootProject.layout.projectDirectory.asFile,
             'javaee'   : 'https://docs.oracle.com/javaee/7/api/',
             'javase'   : 'https://docs.oracle.com/en/java/javase/11/docs/api/',
-            'groovyapi': "https://docs.groovy-lang.org/${libs.versions.groovy.get()}/html/gapi/",
-            'grailsapi': "https://docs.grails.org/${libs.versions.grails.get()}/api/",
-            'gormapi'  : "https://gorm.grails.org/${libs.versions.gorm.get()}/api/",
-            'springapi': "https://docs.spring.io/spring/docs/${libs.versions.spring.get()}/javadoc-api/"
+            'groovyapi': "https://docs.groovy-lang.org/${project['groovy.version']}/html/gapi/",
+            'grailsapi': "https://docs.grails.org/${grailsVersion}/api/",
+            'gormapi'  : "https://gorm.grails.org/${project['grails-datastore.version']}/api/",
+            'springapi': "https://docs.spring.io/spring/docs/${project['spring-framework.version']}/javadoc-api/"
     ]
     doLast {
         def dir = project.layout.buildDirectory.dir('docs').get().asFile

buildSrc/settings.gradle

@@ -7,6 +7,7 @@ version = rootProject.version
 group = 'pubsub.demo'
 
 dependencies {
+    implementation platform("org.grails:grails-bom:${grailsVersion}")
 
     implementation project(':grails-plugin-async')
     implementation project(':grails-plugin-events')
@@ -27,13 +28,13 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter'
     implementation 'org.springframework.boot:spring-boot-starter-logging'
     implementation 'org.springframework.boot:spring-boot-starter-tomcat'
-    implementation libs.micronaut.serde.jackson
+    implementation 'io.micronaut.serde:micronaut-serde-jackson:2.10.2'
 
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'org.fusesource.jansi:jansi'
     runtimeOnly 'com.zaxxer:HikariCP'
 
-    testImplementation libs.micronaut.http.client
+    testImplementation 'io.micronaut:micronaut-http-client:4.6.5'
     testImplementation 'org.grails:grails-web-testing-support'
 }
 

docs/build.gradle

@@ -12,6 +12,14 @@ githubSlug=grails/grails-async
 githubBranch=6.0.x
 developers=Graeme Rocher, Mattias Reichel
 
+grailsVersion=7.0.0-SNAPSHOT
+grailsGradlePluginVersion=7.0.0-SNAPSHOT
+
+# TODO: These are for the documentation links, can these be referenced from the bom instead?
+spring-framework.version=6.2.1
+grails-datastore.version=9.0.0-SNAPSHOT
+groovy.version=4.0.24
+
 #gpars docs is currently not available with https
 gparsdocs=http://gpars.org/1.2.1/groovydoc
 rxjavadocs=https://reactivex.io/RxJava/1.x/javadoc

examples/pubsub-demo/build.gradle

@@ -7,9 +7,9 @@ java {
 configurations.all {
 
     resolutionStrategy.dependencySubstitution {
-        substitute module("org.codehaus.groovy:groovy") using module('org.apache.groovy:groovy:4.0.22')
-        substitute module("org.codehaus.groovy:groovy-templates") using module('org.apache.groovy:groovy-templates:4.0.22')
-        substitute module("org.codehaus.groovy:groovy-xml") using module('org.apache.groovy:groovy-xml:4.0.22')
-        substitute module("org.codehaus.groovy:groovy-json") using module('org.apache.groovy:groovy-json:4.0.22')
+        substitute module("org.codehaus.groovy:groovy") using module('org.apache.groovy:groovy:4.0.24')
+        substitute module("org.codehaus.groovy:groovy-templates") using module('org.apache.groovy:groovy-templates:4.0.24')
+        substitute module("org.codehaus.groovy:groovy-xml") using module('org.apache.groovy:groovy-xml:4.0.24')
+        substitute module("org.codehaus.groovy:groovy-json") using module('org.apache.groovy:groovy-json:4.0.24')
     }
 }

gradle.properties

@@ -7,19 +7,20 @@ plugins {
 group = 'org.grails'
 
 dependencies {
+    implementation platform("org.grails:grails-bom:${grailsVersion}")
 
-    implementation libs.groovy.core
-    implementation libs.slf4j.api
-    implementation libs.jakarta.annotation.api
+    implementation 'org.apache.groovy:groovy'
+    implementation 'org.slf4j:slf4j-api'
+    implementation 'jakarta.annotation:jakarta.annotation-api'
 
-    compileOnly libs.jakarta.annotation.api
+    compileOnly 'jakarta.annotation:jakarta.annotation-api'
 
-    testImplementation libs.spock.core
+    testImplementation 'org.spockframework:spock-core'
 
-    testRuntimeOnly libs.bytebuddy
-    testRuntimeOnly libs.objenesis
+    testRuntimeOnly 'net.bytebuddy:byte-buddy'
+    testRuntimeOnly 'org.objenesis:objenesis'
 
-    testRuntimeOnly libs.slf4j.nop // Get rid of warning about missing slf4j implementation during test task
+    testRuntimeOnly 'org.slf4j:slf4j-nop' // Get rid of warning about missing slf4j implementation during test task
 
 }