Dry up the build by extracting common grails plugin configuration.

grails · Nov 18, 2023 · dd365a8 · dd365a8
1 parent 5fca5b7
commit dd365a8
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 33 deletions.
diff --git a/gradle/grails-plugin-config.gradle b/gradle/grails-plugin-config.gradle
@@ -0,0 +1,9 @@
+group = 'org.grails.plugins'
+
+tasks.named('bootJar').configure {
+    enabled = false // Grails plugins shouldn't produce a boot jar
+}
+tasks.named('jar').configure {
+    enabled = true
+    archiveClassifier = '' // Skip the '-plain' suffix on the jar file name
+}
diff --git a/gradle/java.gradle → gradle/java-config.gradle b/gradle/java.gradle → gradle/java-config.gradle
diff --git a/grails-async-core/build.gradle b/grails-async-core/build.gradle
@@ -21,6 +21,6 @@ dependencies {
 
 }
 
-apply from: file("$rootProject.projectDir/gradle/java.gradle")
+apply from: file("$rootProject.projectDir/gradle/java-config.gradle")
 apply from: file("$rootProject.projectDir/gradle/publishing.gradle")
 
diff --git a/grails-async-gpars/build.gradle b/grails-async-gpars/build.gradle
@@ -26,7 +26,7 @@ dependencies {
 
 }
 
-apply from: file("$rootProject.projectDir/gradle/java.gradle")
+apply from: file("$rootProject.projectDir/gradle/java-config.gradle")
 apply from: file("$rootProject.projectDir/gradle/publishing.gradle")
 
 

diff --git a/grails-async-rxjava/build.gradle b/grails-async-rxjava/build.gradle
@@ -23,7 +23,7 @@ dependencies {
 
 }
 
-apply from: file("$rootProject.projectDir/gradle/java.gradle")
+apply from: file("$rootProject.projectDir/gradle/java-config.gradle")
 apply from: file("$rootProject.projectDir/gradle/publishing.gradle")
 
 
diff --git a/grails-async-rxjava2/build.gradle b/grails-async-rxjava2/build.gradle
@@ -22,5 +22,5 @@ dependencies {
 
 }
 
-apply from: file("$rootProject.projectDir/gradle/java.gradle")
+apply from: file("$rootProject.projectDir/gradle/java-config.gradle")
 apply from: file("$rootProject.projectDir/gradle/publishing.gradle")
diff --git a/grails-events-compat/build.gradle b/grails-events-compat/build.gradle
@@ -22,5 +22,5 @@ dependencies {
 
 }
 
-apply from: file("$rootProject.projectDir/gradle/java.gradle")
+apply from: file("$rootProject.projectDir/gradle/java-config.gradle")
 apply from: file("$rootProject.projectDir/gradle/publishing.gradle")
diff --git a/grails-events-core/build.gradle b/grails-events-core/build.gradle
@@ -22,5 +22,5 @@ dependencies {
 
 }
 
-apply from: file("$rootProject.projectDir/gradle/java.gradle")
+apply from: file("$rootProject.projectDir/gradle/java-config.gradle")
 apply from: file("$rootProject.projectDir/gradle/publishing.gradle")
diff --git a/grails-events-gpars/build.gradle b/grails-events-gpars/build.gradle
@@ -27,5 +27,5 @@ dependencies {
 
 }
 
-apply from: file("$rootProject.projectDir/gradle/java.gradle")
+apply from: file("$rootProject.projectDir/gradle/java-config.gradle")
 apply from: file("$rootProject.projectDir/gradle/publishing.gradle")
diff --git a/grails-events-rxjava/build.gradle b/grails-events-rxjava/build.gradle
@@ -28,5 +28,5 @@ dependencies {
 
 }
 
-apply from: file("$rootProject.projectDir/gradle/java.gradle")
+apply from: file("$rootProject.projectDir/gradle/java-config.gradle")
 apply from: file("$rootProject.projectDir/gradle/publishing.gradle")
diff --git a/grails-events-rxjava2/build.gradle b/grails-events-rxjava2/build.gradle
@@ -24,5 +24,5 @@ dependencies {
 
 }
 
-apply from: file("$rootProject.projectDir/gradle/java.gradle")
+apply from: file("$rootProject.projectDir/gradle/java-config.gradle")
 apply from: file("$rootProject.projectDir/gradle/publishing.gradle")
diff --git a/grails-events-spring/build.gradle b/grails-events-spring/build.gradle
@@ -24,5 +24,5 @@ dependencies {
 
 }
 
-apply from: file("$rootProject.projectDir/gradle/java.gradle")
+apply from: file("$rootProject.projectDir/gradle/java-config.gradle")
 apply from: file("$rootProject.projectDir/gradle/publishing.gradle")
diff --git a/grails-events-transform/build.gradle b/grails-events-transform/build.gradle
@@ -28,5 +28,5 @@ dependencies {
 
 }
 
-apply from: file("$rootProject.projectDir/gradle/java.gradle")
+apply from: file("$rootProject.projectDir/gradle/java-config.gradle")
 apply from: file("$rootProject.projectDir/gradle/publishing.gradle")
diff --git a/grails-plugin-async/build.gradle b/grails-plugin-async/build.gradle
@@ -11,8 +11,6 @@ plugins  {
 
 }
 
-group = 'org.grails.plugins'
-
 dependencies {
 
     api project(':grails-async-core')
@@ -31,13 +29,6 @@ dependencies {
 
 }
 
-tasks.named('bootJar').configure {
-    enabled = false
-}
-tasks.named('jar').configure {
-    enabled = true
-    archiveClassifier = ''
-}
-
-apply from: file("$rootProject.projectDir/gradle/java.gradle")
+apply from: file("$rootProject.projectDir/gradle/grails-plugin-config.gradle")
+apply from: file("$rootProject.projectDir/gradle/java-config.gradle")
 apply from: file("$rootProject.projectDir/gradle/publishing.gradle")
diff --git a/grails-plugin-events/build.gradle b/grails-plugin-events/build.gradle
@@ -11,8 +11,6 @@ plugins  {
 
 }
 
-group = 'org.grails.plugins'
-
 dependencies {
 
     api project(':grails-events-core')
@@ -28,13 +26,6 @@ dependencies {
     testImplementation libs.spock.core
 }
 
-tasks.named('bootJar').configure {
-    enabled = false
-}
-tasks.named('jar').configure {
-    enabled = true
-    archiveClassifier = ''
-}
-
-apply from: file("$rootProject.projectDir/gradle/java.gradle")
+apply from: file("$rootProject.projectDir/gradle/grails-plugin-config.gradle")
+apply from: file("$rootProject.projectDir/gradle/java-config.gradle")
 apply from: file("$rootProject.projectDir/gradle/publishing.gradle")