diff --git a/build.gradle b/build.gradle index ea7d5d8..5b5ce8c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.jetbrains.kotlin.jvm' - id 'net.woggioni.gradle.envelope' + alias catalog.plugins.kotlin + alias catalog.plugins.envelope id 'maven-publish' } @@ -23,17 +23,15 @@ repositories { } dependencies { - implementation platform(group: 'com.lys', name: 'lys-dependencies', version: getProperty('lys.version')) + implementation catalog.jwo + implementation catalog.slf4j.api + implementation catalog.netty.codec.http - implementation group: 'net.woggioni', name: 'jwo' - implementation group: 'org.slf4j', name: 'slf4j-api' - implementation group: 'io.netty', name: 'netty-codec-http' + runtimeOnly catalog.slf4j.jdk14 - runtimeOnly group: 'org.slf4j', name: 'slf4j-jdk14' - - 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 } java { diff --git a/gradle.properties b/gradle.properties index 0c047a4..de0a211 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,4 @@ gbcs.version = 0.1-SNAPSHOT -gradle.version = 7.4.1 -kotlin.version = 1.7.0 -envelope.gradle.plugin.version = 1.0-SNAPSHOT -lombok.gradle.plugin.version = 0.1 +gradle.version = 7.5.1 lys.version = 0.1-SNAPSHOT -lombok.version = 1.18.22 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927..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 00e33ed..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.1-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 107acd3..f127cfd 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 c2511d2..64f3239 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,11 +11,21 @@ pluginManagement { } gradlePluginPortal() } +} - plugins { - id "net.woggioni.gradle.lombok" version getProperty('lombok.gradle.plugin.version') - id "net.woggioni.gradle.envelope" version getProperty('envelope.gradle.plugin.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') + } } }