diff --git a/antlr/build.gradle b/antlr/build.gradle index c925999..578689c 100644 --- a/antlr/build.gradle +++ b/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 group: "org.tukaani", name: "xz" + testImplementation catalog.jackson.databind + testImplementation catalog.xz - antlr platform(group: 'com.lys', name: 'lys-dependencies', version: getProperty('lys.version')) - antlr group: "org.antlr", name: "antlr4" - antlr group: "org.antlr", name: "antlr4-runtime" + antlr catalog.antlr + antlr catalog.antlr.runtime } generateGrammarSource { diff --git a/benchmark/build.gradle b/benchmark/build.gradle index 8c8acf0..f9a63a2 100644 --- a/benchmark/build.gradle +++ b/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 group: 'com.beust', name: 'jcommander' - implementation group: "com.fasterxml.jackson.core", name: "jackson-databind" + + implementation catalog.jwo + implementation catalog.xz + implementation catalog.jcommander + implementation catalog.jackson.databind runtimeOnly project(':test-utils') } diff --git a/build.gradle b/build.gradle index d108118..71141e1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,18 @@ plugins { id 'maven-publish' - id 'net.woggioni.gradle.lombok' apply false - id 'net.woggioni.gradle.multi-release-jar' + alias catalog.plugins.lombok apply false + 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 group: "org.tukaani", name: "xz" + implementation catalog.xz - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api' - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params' - testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine' + testImplementation catalog.junit.jupiter.api + testImplementation catalog.junit.jupiter.params + testRuntimeOnly catalog.junit.jupiter.engine } test { @@ -50,11 +49,11 @@ ext { } dependencies { - implementation group: "net.woggioni", name: "jwo" - implementation group: "org.slf4j", name: "slf4j-api" + implementation catalog.jwo + implementation catalog.slf4j.api testImplementation project('test-utils') - testImplementation group: "com.fasterxml.jackson.core", name: "jackson-databind" + testImplementation catalog.jackson.databind } java { diff --git a/gradle.properties b/gradle.properties index a6819fc..98b0638 100644 --- a/gradle.properties +++ b/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 - diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..249e583 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aa991fc..ae04661 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/gradlew b/gradlew index 1b6c787..a69d9cb 100755 --- a/gradlew +++ b/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. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f..53a6b23 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -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 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +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 diff --git a/settings.gradle b/settings.gradle index ec85e6d..c3c49c0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,12 +11,21 @@ pluginManagement { } gradlePluginPortal() } +} - plugins { - id 'net.woggioni.gradle.envelope' version getProperty('lys-gradle-plugins.version') - id 'net.woggioni.gradle.lombok' version getProperty('lys-gradle-plugins.version') - id 'net.woggioni.gradle.multi-release-jar' version getProperty('lys-gradle-plugins.version') - id 'org.jetbrains.kotlin.jvm' version getProperty('kotlin.version') +dependencyResolutionManagement { + repositories { + maven { + url = 'https://woggioni.net/mvn/' + content { + includeGroup 'com.lys' + } + } + } + versionCatalogs { + catalog { + from group: 'com.lys', name: 'lys-catalog', version: getProperty('lys.version') + } } } diff --git a/wson-cli/build.gradle b/wson-cli/build.gradle index 5a551ca..8dbc13d 100644 --- a/wson-cli/build.gradle +++ b/wson-cli/build.gradle @@ -1,8 +1,8 @@ plugins { id 'maven-publish' - id 'net.woggioni.gradle.envelope' - id 'org.jetbrains.kotlin.jvm' - id 'net.woggioni.gradle.multi-release-jar' + alias catalog.plugins.envelope + alias catalog.plugins.kotlin + 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 group: 'com.beust', name: 'jcommander' - implementation group: "org.slf4j", name: "slf4j-simple" + implementation catalog.kotlin.stdlib.jdk8 + implementation catalog.jcommander + implementation catalog.slf4j.simple implementation rootProject } diff --git a/wson-w3c-json/build.gradle b/wson-w3c-json/build.gradle index 1ca9db1..0ab53ac 100644 --- a/wson-w3c-json/build.gradle +++ b/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 group: "net.woggioni", name: "jwo" + implementation catalog.jakarta.json.api + implementation catalog.jwo } \ No newline at end of file