switch to lys-catalog

benchmark/build.gradle

@@ -1,20 +1,13 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm'
+    alias catalog.plugins.kotlin
-    id 'application'
+    alias catalog.plugins.envelope
 }
 
 dependencies {
-    implementation platform(group: 'com.lys', name: 'lys-dependencies', version: getProperty('version.lys'))
+    implementation catalog.jwo
-    implementation group: 'net.woggioni', name: 'jwo'
     implementation(rootProject)
-//    runtime(files(rootProject.projectDir.toPath().resolve("src/test/resources")))
 }
 
-java {
+envelopeJar {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    mainClass = "net.woggioni.klevtree.benchmark.BenchmarkKt"
-    targetCompatibility = JavaVersion.VERSION_11
-}
-
-application {
-    mainClassName = "net.woggioni.klevtree.benchmark.BenchmarkKt"
 }

build.gradle

@@ -1,13 +1,13 @@
 plugins {
     id 'maven-publish'
-    id 'net.woggioni.gradle.multi-release-jar'
+    alias catalog.plugins.kotlin
-    id 'org.jetbrains.kotlin.jvm'
+    alias catalog.plugins.multi.release.jar
 }
 
 
 allprojects {
     group = "net.woggioni"
-    version = getProperty('version.klevtree')
+    version = getProperty('klevtree.version')
 
     repositories {
         maven {
@@ -22,13 +22,12 @@ ext {
 }
 
 dependencies {
-    implementation platform(group: 'com.lys', name: 'lys-dependencies', version: getProperty('version.lys'))
+    implementation catalog.jwo
-    implementation group: 'net.woggioni', name: 'jwo'
 
-    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
-    testRuntimeOnly group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl'
+    testRuntimeOnly catalog.log4j.slf4j18.impl
 }
 
 compileJava {
@@ -48,7 +47,7 @@ test {
 
 wrapper {
     distributionType = Wrapper.DistributionType.BIN
-    gradleVersion = getProperty('version.gradle')
+    gradleVersion = getProperty('gradle.version')
 }
 
 publishing {

gradle.properties

@@ -2,8 +2,6 @@ kotlin.code.style=official
 
 woggioniMavenRepositoryUrl=https://woggioni.net/mvn/
 
-version.gradle = 7.5
+gradle.version = 7.5.1
-version.multiReleaseJarPlugin = 2022.06
+klevtree.version = 1.0-SNAPSHOT
-version.klevtree = 1.0-SNAPSHOT
+lys.version = 0.1-SNAPSHOT
-version.lys = 0.1-SNAPSHOT
-version.kotlin = 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.5-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

@@ -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
+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

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