16 files changed, 92 insertions, 40 deletions

diff --git a/build.gradle b/build.gradle
index 91478387..086e899a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,6 @@
 plugins {
-        alias libs.plugins.shadow apply false
-        alias libs.plugins.frontend apply false
-        alias libs.plugins.sonarqube
-        alias libs.plugins.xtend apply false
+        id 'eclipse'
+        id 'org.sonarqube'
 }
 
 allprojects {
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
new file mode 100644
index 00000000..74fe04fb
--- /dev/null
+++ b/buildSrc/build.gradle
@@ -0,0 +1,12 @@
+plugins {
+        id 'groovy-gradle-plugin'
+}
+
+repositories {
+        gradlePluginPortal()
+}
+
+dependencies {
+        implementation libs.sonarqubeGradle
+        implementation libs.xtendGradle
+}
diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
new file mode 100644
index 00000000..794aa2a1
--- /dev/null
+++ b/buildSrc/settings.gradle
@@ -0,0 +1,9 @@
+enableFeaturePreview 'VERSION_CATALOGS'
+
+dependencyResolutionManagement {
+        versionCatalogs {
+                libs {
+                        from files('../gradle/libs.versions.toml')
+                }
+        }
+}
diff --git a/gradle/java-common.gradle b/buildSrc/src/main/groovy/tools.refinery.java-conventions.gradle
index 0a63cfe1..6bea6e46 100644
--- a/gradle/java-common.gradle
+++ b/buildSrc/src/main/groovy/tools.refinery.java-conventions.gradle
@@ -1,3 +1,7 @@
+plugins {
+        id 'eclipse'
+}
+
 repositories {
         mavenCentral()
         maven {
@@ -14,8 +18,6 @@ tasks.named('jar') {
         }
 }
 
-apply plugin: 'eclipse'
-
 def generateEclipseSourceFolders = tasks.register('generateEclipseSourceFolders')
 
 tasks.register('prepareEclipse') {
diff --git a/gradle/jmh.gradle b/buildSrc/src/main/groovy/tools.refinery.jmh-conventions.gradle
index aa58c2b7..0a82ae4b 100644
--- a/gradle/jmh.gradle
+++ b/buildSrc/src/main/groovy/tools.refinery.jmh-conventions.gradle
@@ -1,3 +1,8 @@
+plugins {
+        id 'org.sonarqube'
+        id 'tools.refinery.java-conventions'
+}
+
 configurations {
         jmh {
                 extendsFrom implementation
diff --git a/gradle/junit.gradle b/buildSrc/src/main/groovy/tools.refinery.junit-conventions.gradle
index c5b60e47..d62207b7 100644
--- a/gradle/junit.gradle
+++ b/buildSrc/src/main/groovy/tools.refinery.junit-conventions.gradle
@@ -1,4 +1,7 @@
-apply plugin: 'jacoco'
+plugins {
+        id 'jacoco'
+        id 'tools.refinery.java-conventions'
+}
 
 dependencies {
         testImplementation libs.hamcrest
diff --git a/gradle/mwe2.gradle b/buildSrc/src/main/groovy/tools.refinery.mwe2-conventions.gradle
index 6dc3ef67..fe213d42 100644
--- a/gradle/mwe2.gradle
+++ b/buildSrc/src/main/groovy/tools.refinery.mwe2-conventions.gradle
@@ -1,3 +1,8 @@
+plugins {
+        id 'eclipse'
+        id 'tools.refinery.java-conventions'
+}
+
 configurations {
         mwe2 {
                 extendsFrom implementation
diff --git a/gradle/xtend.gradle b/buildSrc/src/main/groovy/tools.refinery.xtend-conventions.gradle
index 94cd7dc7..98fc131c 100644
--- a/gradle/xtend.gradle
+++ b/buildSrc/src/main/groovy/tools.refinery.xtend-conventions.gradle
@@ -1,4 +1,8 @@
-apply plugin: libs.plugins.xtend.get().pluginId
+plugins {
+        id 'org.sonarqube'
+        id 'org.xtext.xtend'
+        id 'tools.refinery.java-conventions'
+}
 
 sourceSets {
         main {
diff --git a/gradle/xtext-common.gradle b/buildSrc/src/main/groovy/tools.refinery.xtext-conventions.gradle
index 09980a90..3fd2f9d6 100644
--- a/gradle/xtext-common.gradle
+++ b/buildSrc/src/main/groovy/tools.refinery.xtext-conventions.gradle
@@ -1,4 +1,7 @@
-apply from: "${rootDir}/gradle/java-common.gradle"
+plugins {
+        id 'org.sonarqube'
+        id 'tools.refinery.java-conventions'
+}
 
 sourceSets {
         main {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0e711cad..3f08c9ab 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,8 +28,10 @@ mwe2-launch = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.launch",
 mwe2-lib = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.lib", version.ref = "mwe2" }
 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" }
 viatra = { group = "org.eclipse.viatra", name = "viatra-query-runtime", version = "2.6.0" }
 xtend-lib = { group = "org.eclipse.xtend", name = "org.eclipse.xtend.lib", version.ref = "xtext" }
+xtendGradle = { group = "org.xtext", name = "xtext-gradle-plugin", version = "3.0.0" }
 xtext-bom = { group = "org.eclipse.xtext", name = "xtext-dev-bom", version.ref = "xtext" }
 xtext-core = { group = "org.eclipse.xtext", name = "org.eclipse.xtext", version.ref = "xtext" }
 xtext-generator-antlr = { group = "org.eclipse.xtext", name = "xtext-antlr-generator", version = "2.1.1" }
@@ -43,5 +45,3 @@ xtext-xbase-ide = { group = "org.eclipse.xtext", name = "org.eclipse.xtext.xbase
 [plugins]
 shadow = { id = "com.github.johnrengelman.shadow", version = "7.1.0" }
 frontend = { id = "org.siouan.frontend-jdk11", version = "5.3.0" }
-sonarqube = { id = "org.sonarqube", version = "3.3" }
-xtend = { id = "org.xtext.xtend", version = "3.0.0-M1" }
diff --git a/language-ide/build.gradle b/language-ide/build.gradle
index 65b4b786..91f21109 100644
--- a/language-ide/build.gradle
+++ b/language-ide/build.gradle
@@ -1,5 +1,7 @@
-apply plugin: 'java-library'
-apply from: "${rootDir}/gradle/xtext-common.gradle"
+plugins {
+        id 'java-library'
+        id 'tools.refinery.xtext-conventions'
+}
 
 dependencies {
         api project(':refinery-language')
diff --git a/language-model/build.gradle b/language-model/build.gradle
index 666b3e7d..0add85d9 100644
--- a/language-model/build.gradle
+++ b/language-model/build.gradle
@@ -1,7 +1,9 @@
-apply plugin: 'java-library'
-apply plugin: 'java-test-fixtures'
-apply from: "${rootDir}/gradle/java-common.gradle"
-apply from: "${rootDir}/gradle/mwe2.gradle"
+plugins {
+        id 'java-library'
+        id 'java-test-fixtures'
+        id 'tools.refinery.java-conventions'
+        id 'tools.refinery.mwe2-conventions'
+}
 
 dependencies {
         api libs.ecore
diff --git a/language-to-store/build.gradle b/language-to-store/build.gradle
index e0fd8212..ea7969b1 100644
--- a/language-to-store/build.gradle
+++ b/language-to-store/build.gradle
@@ -1,7 +1,9 @@
-apply plugin: 'java-library'
-apply from: "${rootDir}/gradle/java-common.gradle"
-apply from: "${rootDir}/gradle/junit.gradle"
-apply from: "${rootDir}/gradle/xtend.gradle"
+plugins {
+        id 'java-library'
+        id 'tools.refinery.java-conventions'
+        id 'tools.refinery.junit-conventions'
+        id 'tools.refinery.xtend-conventions'
+}
 
 dependencies {
         api project(':refinery-language-model')
diff --git a/language-web/build.gradle b/language-web/build.gradle
index 12f2f3a0..1bacd35c 100644
--- a/language-web/build.gradle
+++ b/language-web/build.gradle
@@ -1,6 +1,13 @@
-apply plugin: 'java'
-apply from: "${rootDir}/gradle/xtext-common.gradle"
-apply from: "${rootDir}/gradle/junit.gradle"
+plugins {
+        id 'java'
+        id 'application'
+        alias libs.plugins.frontend
+        alias libs.plugins.shadow
+        id 'tools.refinery.xtext-conventions'
+        id 'tools.refinery.junit-conventions'
+}
+
+import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpmYarn
 
 dependencies {
         implementation project(':refinery-language')
@@ -27,10 +34,6 @@ for (taskName in ['compileJava', 'processResources']) {
 def webpackOutputDir = "${buildDir}/webpack"
 def productionResources = "${webpackOutputDir}/production"
 def serverMainClass = 'tools.refinery.language.web.ServerLauncher'
-
-apply plugin: libs.plugins.frontend.get().pluginId
-import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpmYarn
-
 def nodeDirectory = "${rootDir}/.gradle/node"
 
 frontend {
@@ -104,12 +107,10 @@ tasks.named('jar') {
         }
 }
 
-apply plugin: 'application'
 mainClassName = serverMainClass
 distTar.enabled = false
 distZip.enabled = false
 
-apply plugin: libs.plugins.shadow.get().pluginId
 shadowDistTar.enabled = false
 shadowDistZip.enabled = false
 
diff --git a/language/build.gradle b/language/build.gradle
index df71a85d..5eb5484d 100644
--- a/language/build.gradle
+++ b/language/build.gradle
@@ -1,9 +1,11 @@
-apply plugin: 'java-library'
-apply plugin: 'java-test-fixtures'
-apply from: "${rootDir}/gradle/xtext-common.gradle"
-apply from: "${rootDir}/gradle/junit.gradle"
-apply from: "${rootDir}/gradle/mwe2.gradle"
-apply from: "${rootDir}/gradle/xtend.gradle"
+plugins {
+        id 'java-library'
+        id 'java-test-fixtures'
+        id 'tools.refinery.xtext-conventions'
+        id 'tools.refinery.junit-conventions'
+        id 'tools.refinery.mwe2-conventions'
+        id 'tools.refinery.xtend-conventions'
+}
 
 dependencies {
         api platform(libs.xtext.bom)
diff --git a/store/build.gradle b/store/build.gradle
index 0a5ba549..555c57be 100644
--- a/store/build.gradle
+++ b/store/build.gradle
@@ -1,7 +1,9 @@
-apply plugin: 'java-library'
-apply from: "${rootDir}/gradle/java-common.gradle"
-apply from: "${rootDir}/gradle/junit.gradle"
-apply from: "${rootDir}/gradle/jmh.gradle"
+plugins {
+        id 'java-library'
+        id 'tools.refinery.java-conventions'
+        id 'tools.refinery.junit-conventions'
+        id 'tools.refinery.jmh-conventions'
+}
 
 dependencies {
         implementation libs.ecore