build: library and application convetion plugins

15 files changed, 41 insertions, 31 deletions

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 74fe04fb..05b2363b 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -7,6 +7,10 @@ repositories {
 }
 
 dependencies {
+        implementation libs.shadowGradle
         implementation libs.sonarqubeGradle
         implementation libs.xtendGradle
 }
+
+sourceCompatibility = '17'
+targetCompatibility = '17'
diff --git a/buildSrc/src/main/groovy/refinery-java-application.gradle b/buildSrc/src/main/groovy/refinery-java-application.gradle
new file mode 100644
index 00000000..1566f3c0
--- /dev/null
+++ b/buildSrc/src/main/groovy/refinery-java-application.gradle
@@ -0,0 +1,11 @@
+plugins {
+        id 'application'
+        id 'com.github.johnrengelman.shadow'
+        id 'refinery-java-conventions'
+}
+
+distTar.enabled = false
+distZip.enabled = false
+
+shadowDistTar.enabled = false
+shadowDistZip.enabled = false
diff --git a/buildSrc/src/main/groovy/tools.refinery.java-conventions.gradle b/buildSrc/src/main/groovy/refinery-java-conventions.gradle
index 2712d391..fcdc8ea9 100644
--- a/buildSrc/src/main/groovy/tools.refinery.java-conventions.gradle
+++ b/buildSrc/src/main/groovy/refinery-java-conventions.gradle
@@ -1,6 +1,7 @@
 plugins {
         id 'eclipse'
         id 'jacoco'
+        id 'java'
 }
 
 repositories {
diff --git a/buildSrc/src/main/groovy/refinery-java-library.gradle b/buildSrc/src/main/groovy/refinery-java-library.gradle
new file mode 100644
index 00000000..daa80f17
--- /dev/null
+++ b/buildSrc/src/main/groovy/refinery-java-library.gradle
@@ -0,0 +1,4 @@
+plugins {
+        id 'java-library'
+        id 'refinery-java-conventions'
+}
diff --git a/buildSrc/src/main/groovy/tools.refinery.jmh-conventions.gradle b/buildSrc/src/main/groovy/refinery-jmh.gradle
index 0a82ae4b..553c469b 100644
--- a/buildSrc/src/main/groovy/tools.refinery.jmh-conventions.gradle
+++ b/buildSrc/src/main/groovy/refinery-jmh.gradle
@@ -1,6 +1,6 @@
 plugins {
         id 'org.sonarqube'
-        id 'tools.refinery.java-conventions'
+        id 'refinery-java-conventions'
 }
 
 configurations {
diff --git a/buildSrc/src/main/groovy/tools.refinery.mwe2-conventions.gradle b/buildSrc/src/main/groovy/refinery-mwe2.gradle
index fe213d42..c7f15e82 100644
--- a/buildSrc/src/main/groovy/tools.refinery.mwe2-conventions.gradle
+++ b/buildSrc/src/main/groovy/refinery-mwe2.gradle
@@ -1,6 +1,6 @@
 plugins {
         id 'eclipse'
-        id 'tools.refinery.java-conventions'
+        id 'refinery-java-conventions'
 }
 
 configurations {
diff --git a/buildSrc/src/main/groovy/tools.refinery.xtend-conventions.gradle b/buildSrc/src/main/groovy/refinery-xtend.gradle
index 98fc131c..9281ab1f 100644
--- a/buildSrc/src/main/groovy/tools.refinery.xtend-conventions.gradle
+++ b/buildSrc/src/main/groovy/refinery-xtend.gradle
@@ -1,7 +1,7 @@
 plugins {
         id 'org.sonarqube'
         id 'org.xtext.xtend'
-        id 'tools.refinery.java-conventions'
+        id 'refinery-java-conventions'
 }
 
 sourceSets {
diff --git a/buildSrc/src/main/groovy/tools.refinery.xtext-conventions.gradle b/buildSrc/src/main/groovy/refinery-xtext-conventions.gradle
index 3fd2f9d6..a91d723e 100644
--- a/buildSrc/src/main/groovy/tools.refinery.xtext-conventions.gradle
+++ b/buildSrc/src/main/groovy/refinery-xtext-conventions.gradle
@@ -1,6 +1,6 @@
 plugins {
         id 'org.sonarqube'
-        id 'tools.refinery.java-conventions'
+        id 'refinery-java-conventions'
 }
 
 sourceSets {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3f08c9ab..978aa36b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,6 +26,7 @@ mockito-junit = { group = "org.mockito", name = "mockito-junit-jupiter", version
 mwe-utils = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe.utils", version = "1.6.2.M1" }
 mwe2-launch = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.launch", version.ref = "mwe2" }
 mwe2-lib = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.lib", version.ref = "mwe2" }
+shadowGradle = { group = "gradle.plugin.com.github.johnrengelman", name = "shadow", version = "7.1.0" }
 slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" }
 slf4j-log4j = { group = "org.slf4j", name = "log4j-over-slf4j", version.ref = "slf4j" }
 sonarqubeGradle = { group = "org.sonarsource.scanner.gradle", name = "sonarqube-gradle-plugin", version = "3.3" }
@@ -43,5 +44,4 @@ xtext-xbase = { group = "org.eclipse.xtext", name = "org.eclipse.xtext.xbase", v
 xtext-xbase-ide = { group = "org.eclipse.xtext", name = "org.eclipse.xtext.xbase.ide", version.ref = "xtext" }
 
 [plugins]
-shadow = { id = "com.github.johnrengelman.shadow", version = "7.1.0" }
 frontend = { id = "org.siouan.frontend-jdk11", version = "5.3.0" }
diff --git a/language-ide/build.gradle b/language-ide/build.gradle
index 91f21109..3786762b 100644
--- a/language-ide/build.gradle
+++ b/language-ide/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-        id 'java-library'
-        id 'tools.refinery.xtext-conventions'
+        id 'refinery-java-library'
+        id 'refinery-xtext-conventions'
 }
 
 dependencies {
diff --git a/language-model/build.gradle b/language-model/build.gradle
index 0add85d9..4c30e62f 100644
--- a/language-model/build.gradle
+++ b/language-model/build.gradle
@@ -1,8 +1,7 @@
 plugins {
-        id 'java-library'
         id 'java-test-fixtures'
-        id 'tools.refinery.java-conventions'
-        id 'tools.refinery.mwe2-conventions'
+        id 'refinery-java-library'
+        id 'refinery-mwe2'
 }
 
 dependencies {
diff --git a/language-to-store/build.gradle b/language-to-store/build.gradle
index 92de9458..f1c1564d 100644
--- a/language-to-store/build.gradle
+++ b/language-to-store/build.gradle
@@ -1,7 +1,6 @@
 plugins {
-        id 'java-library'
-        id 'tools.refinery.java-conventions'
-        id 'tools.refinery.xtend-conventions'
+        id 'refinery-java-library'
+        id 'refinery-xtext-conventions'
 }
 
 dependencies {
diff --git a/language-web/build.gradle b/language-web/build.gradle
index 9f092e5e..7306869b 100644
--- a/language-web/build.gradle
+++ b/language-web/build.gradle
@@ -1,9 +1,7 @@
 plugins {
-        id 'java'
-        id 'application'
         alias libs.plugins.frontend
-        alias libs.plugins.shadow
-        id 'tools.refinery.xtext-conventions'
+        id 'refinery-java-application'
+        id 'refinery-xtext-conventions'
 }
 
 import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpmYarn
@@ -99,6 +97,8 @@ tasks.named('check') {
         dependsOn(eslint, stylelint)
 }
 
+mainClassName = serverMainClass
+
 tasks.named('jar') {
         dependsOn assembleFrontend
         from(productionResources) {
@@ -106,13 +106,6 @@ tasks.named('jar') {
         }
 }
 
-mainClassName = serverMainClass
-distTar.enabled = false
-distZip.enabled = false
-
-shadowDistTar.enabled = false
-shadowDistZip.enabled = false
-
 tasks.named('shadowJar') {
         dependsOn assembleFrontend
         from(project.convention.getPlugin(JavaPluginConvention).sourceSets.main.output)
diff --git a/language/build.gradle b/language/build.gradle
index 4208979f..7f956a47 100644
--- a/language/build.gradle
+++ b/language/build.gradle
@@ -1,9 +1,9 @@
 plugins {
-        id 'java-library'
         id 'java-test-fixtures'
-        id 'tools.refinery.xtext-conventions'
-        id 'tools.refinery.mwe2-conventions'
-        id 'tools.refinery.xtend-conventions'
+        id 'refinery-java-library'
+        id 'refinery-mwe2'
+        id 'refinery-xtend'
+        id 'refinery-xtext-conventions'
 }
 
 dependencies {
diff --git a/store/build.gradle b/store/build.gradle
index 43a496ba..8d091a81 100644
--- a/store/build.gradle
+++ b/store/build.gradle
@@ -1,7 +1,6 @@
 plugins {
-        id 'java-library'
-        id 'tools.refinery.java-conventions'
-        id 'tools.refinery.jmh-conventions'
+        id 'refinery-java-library'
+        id 'refinery-jmh'
 }
 
 dependencies {