switch to lys-catalog

antlr/build.gradle

@@ -5,14 +5,13 @@ plugins {
 dependencies {
     implementation rootProject
 
-    testImplementation group: "net.woggioni", name: "jwo"
+    testImplementation catalog.jwo
     testImplementation project(':test-utils')
-    testImplementation group: "com.fasterxml.jackson.core", name: "jackson-databind"
+    testImplementation catalog.jackson.databind
-    testImplementation group: "org.tukaani", name: "xz"
+    testImplementation catalog.xz
 
-    antlr platform(group: 'com.lys', name: 'lys-dependencies', version: getProperty('lys.version'))
+    antlr catalog.antlr
-    antlr group: "org.antlr", name: "antlr4"
+    antlr catalog.antlr.runtime
-    antlr group: "org.antlr", name: "antlr4-runtime"
 }
 
 generateGrammarSource {

benchmark/build.gradle

@@ -14,10 +14,11 @@ run {
 dependencies {
     implementation rootProject
     implementation project(':antlr')
-    implementation group: "net.woggioni", name: "jwo"
+
-    implementation group: 'org.tukaani', name: 'xz'
+    implementation catalog.jwo
-    implementation group: 'com.beust', name: 'jcommander'
+    implementation catalog.xz
-    implementation group: "com.fasterxml.jackson.core", name: "jackson-databind"
+    implementation catalog.jcommander
+    implementation catalog.jackson.databind
 
     runtimeOnly project(':test-utils')
 }

build.gradle

@@ -1,18 +1,18 @@
 plugins {
     id 'maven-publish'
-    id 'net.woggioni.gradle.lombok' apply false
+    alias catalog.plugins.lombok apply false
-    id 'net.woggioni.gradle.multi-release-jar'
+    alias catalog.plugins.multi.release.jar
 }
 
 allprojects {
     apply plugin: 'java-library'
-    apply plugin: 'net.woggioni.gradle.lombok'
+    apply plugin: catalog.plugins.lombok.get().pluginId
 
     group = "net.woggioni"
     version = getProperty('wson.version')
 
     lombok {
-        version = getProperty('lombok.version')
+        version = catalog.versions.lombok.get()
     }
 
     repositories {
@@ -28,12 +28,11 @@ allprojects {
     }
 
     dependencies {
-        implementation platform(group: 'com.lys', name: 'lys-dependencies', version: getProperty('lys.version'))
+        implementation catalog.xz
-        implementation group: "org.tukaani", name: "xz"
 
-        testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api'
+        testImplementation catalog.junit.jupiter.api
-        testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params'
+        testImplementation catalog.junit.jupiter.params
-        testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine'
+        testRuntimeOnly catalog.junit.jupiter.engine
     }
 
     test {
@@ -50,11 +49,11 @@ ext {
 }
 
 dependencies {
-    implementation group: "net.woggioni", name: "jwo"
+    implementation catalog.jwo
-    implementation group: "org.slf4j", name: "slf4j-api"
+    implementation catalog.slf4j.api
 
     testImplementation project('test-utils')
-    testImplementation group: "com.fasterxml.jackson.core", name:  "jackson-databind"
+    testImplementation catalog.jackson.databind
 }
 
 java {

gradle.properties

@@ -1,10 +1,5 @@
-gradle.version=7.4.2
+gradle.version=7.5.1
 wson.version = 1.0-SNAPSHOT
 
-lys-gradle-plugins.version = 2022.06
-
 lys.version = 0.1-SNAPSHOT
 
-lombok.version = 1.18.22
-kotlin.version = 1.7.0
-

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

settings.gradle

@@ -11,12 +11,21 @@ pluginManagement {
         }
         gradlePluginPortal()
     }
+}
 
-    plugins {
+dependencyResolutionManagement {
-        id 'net.woggioni.gradle.envelope' version getProperty('lys-gradle-plugins.version')
+    repositories {
-        id 'net.woggioni.gradle.lombok' version getProperty('lys-gradle-plugins.version')
+        maven {
-        id 'net.woggioni.gradle.multi-release-jar' version getProperty('lys-gradle-plugins.version')
+            url = 'https://woggioni.net/mvn/'
-        id 'org.jetbrains.kotlin.jvm' version getProperty('kotlin.version')
+            content {
+                includeGroup 'com.lys'
+            }
+        }
+    }
+    versionCatalogs {
+        catalog {
+            from group: 'com.lys', name: 'lys-catalog', version: getProperty('lys.version')
+        }
     }
 }
 

wson-cli/build.gradle

@@ -1,8 +1,8 @@
 plugins {
     id 'maven-publish'
-    id 'net.woggioni.gradle.envelope'
+    alias catalog.plugins.envelope
-    id 'org.jetbrains.kotlin.jvm'
+    alias catalog.plugins.kotlin
-    id 'net.woggioni.gradle.multi-release-jar'
+    alias catalog.plugins.multi.release.jar
 }
 
 ext {
@@ -10,9 +10,9 @@ ext {
 }
 
 dependencies {
-    implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: getProperty('kotlin.version')
+    implementation catalog.kotlin.stdlib.jdk8
-    implementation group: 'com.beust', name: 'jcommander'
+    implementation catalog.jcommander
-    implementation group: "org.slf4j", name: "slf4j-simple"
+    implementation catalog.slf4j.simple
     implementation rootProject
 }
 

wson-w3c-json/build.gradle

@@ -4,6 +4,6 @@ plugins {
 
 dependencies {
     implementation rootProject
-    implementation group: 'jakarta.json', name: 'jakarta.json-api', version: '2.1.0'
+    implementation catalog.jakarta.json.api
-    implementation group: "net.woggioni", name: "jwo"
+    implementation catalog.jwo
 }