From 234965e9e167f510ab38b0fcdad3bd2846691339 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Tue, 16 Nov 2021 21:46:06 +0100 Subject: build: use version catalogs Gradle version catalogs allow centralized management of dependency artifact coordinates using a toml file. Previously, we use the gradle.properties file, which cannot manage group and name coordinates, only versions. Node and yarn versions still have to be in gradle.properties, because they do not correspond to any coordiates of a maven artifact. --- language-web/build.gradle | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'language-web') diff --git a/language-web/build.gradle b/language-web/build.gradle index ea2f1269..12f2f3a0 100644 --- a/language-web/build.gradle +++ b/language-web/build.gradle @@ -5,16 +5,15 @@ apply from: "${rootDir}/gradle/junit.gradle" dependencies { implementation project(':refinery-language') implementation project(':refinery-language-ide') - implementation "org.eclipse.xtext:org.eclipse.xtext.web:${xtextVersion}" - implementation "org.eclipse.xtend:org.eclipse.xtend.lib:${xtextVersion}" - implementation "org.eclipse.jetty:jetty-server:${jettyVersion}" - implementation "org.eclipse.jetty:jetty-servlet:${jettyVersion}" - implementation "org.eclipse.jetty.websocket:websocket-jetty-server:${jettyVersion}" - implementation "org.slf4j:slf4j-simple:${slf4JVersion}" - implementation "org.slf4j:log4j-over-slf4j:${slf4JVersion}" + implementation libs.xtend.lib + implementation libs.xtext.web + implementation libs.jetty.server + implementation libs.jetty.servlet + implementation libs.jetty.websocket.server + implementation libs.slf4j.simple + implementation libs.slf4j.log4j testImplementation testFixtures(project(':refinery-language')) - testImplementation "org.eclipse.xtext:org.eclipse.xtext.testing:${xtextVersion}" - testImplementation "org.eclipse.jetty.websocket:websocket-jetty-client:${jettyVersion}" + testImplementation libs.jetty.websocket.client } def generateXtextLanguage = project(':refinery-language').tasks.named('generateXtextLanguage') @@ -29,7 +28,7 @@ def webpackOutputDir = "${buildDir}/webpack" def productionResources = "${webpackOutputDir}/production" def serverMainClass = 'tools.refinery.language.web.ServerLauncher' -apply plugin: 'org.siouan.frontend-jdk11' +apply plugin: libs.plugins.frontend.get().pluginId import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpmYarn def nodeDirectory = "${rootDir}/.gradle/node" @@ -110,7 +109,7 @@ mainClassName = serverMainClass distTar.enabled = false distZip.enabled = false -apply plugin: 'com.github.johnrengelman.shadow' +apply plugin: libs.plugins.shadow.get().pluginId shadowDistTar.enabled = false shadowDistZip.enabled = false -- cgit v1.2.3-54-g00ecf