From dd365a8e1624ad501873d182037fed91d1119360 Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Sat, 18 Nov 2023 11:22:33 +0100 Subject: [PATCH] Dry up the build by extracting common grails plugin configuration. --- gradle/grails-plugin-config.gradle | 9 +++++++++ gradle/{java.gradle => java-config.gradle} | 0 grails-async-core/build.gradle | 2 +- grails-async-gpars/build.gradle | 2 +- grails-async-rxjava/build.gradle | 2 +- grails-async-rxjava2/build.gradle | 2 +- grails-events-compat/build.gradle | 2 +- grails-events-core/build.gradle | 2 +- grails-events-gpars/build.gradle | 2 +- grails-events-rxjava/build.gradle | 2 +- grails-events-rxjava2/build.gradle | 2 +- grails-events-spring/build.gradle | 2 +- grails-events-transform/build.gradle | 2 +- grails-plugin-async/build.gradle | 13 ++----------- grails-plugin-events/build.gradle | 13 ++----------- 15 files changed, 24 insertions(+), 33 deletions(-) create mode 100644 gradle/grails-plugin-config.gradle rename gradle/{java.gradle => java-config.gradle} (100%) diff --git a/gradle/grails-plugin-config.gradle b/gradle/grails-plugin-config.gradle new file mode 100644 index 00000000..2efa468a --- /dev/null +++ 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 b/gradle/java-config.gradle similarity index 100% rename from gradle/java.gradle rename to gradle/java-config.gradle diff --git a/grails-async-core/build.gradle b/grails-async-core/build.gradle index 6838f14c..2f2bc18c 100644 --- 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 index d728b731..bebe29fc 100644 --- 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 index 20fa8db1..ff54da1f 100644 --- 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 index 90864c19..8ebc4538 100644 --- 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 index 690dd6e4..e1f74c07 100644 --- 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 index c1f0c940..c984eac5 100644 --- 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 index 010528e1..916c1ebd 100644 --- 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 index 8f903ac1..44d7a35c 100644 --- 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 index b242dfa1..dc22daa1 100644 --- 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 index 4d3fcc26..688f1882 100644 --- 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 index 60d50a1c..479f2694 100644 --- 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 index a2af4651..d3ce8a67 100644 --- 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 index d396b6e9..45da285c 100644 --- 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") \ No newline at end of file