From 0b4b2882b076271c23ce506c27c1dc48743cd441 Mon Sep 17 00:00:00 2001
From: Walter Oggioni <oggioni.walter@gmail.com>
Date: Thu, 1 Sep 2022 12:38:23 +0800
Subject: [PATCH] switch to lys-catalog

---
 build.gradle                             | 10 +++++-----
 gradle.properties                        |  7 ++-----
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 launcher/build.gradle                    |  2 +-
 loader/build.gradle                      |  2 +-
 settings.gradle                          | 18 ++++++++++++++----
 6 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index 232b158..4b45323 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,13 +2,13 @@ import java.nio.file.Files
 
 plugins {
     id 'java-gradle-plugin'
-    id 'net.woggioni.gradle.lombok' apply false
+    alias(catalog.plugins.lombok) apply false
     id 'maven-publish'
 }
 
 allprojects {
     apply plugin: 'java-library'
-    apply plugin: 'net.woggioni.gradle.lombok'
+    apply plugin: catalog.plugins.lombok.get().pluginId
 
     repositories {
         mavenCentral()
@@ -23,7 +23,7 @@ allprojects {
     }
 
     lombok {
-        version = getProperty('version.lombok')
+        version = catalog.versions.lombok
     }
 
     configurations.all {
@@ -31,8 +31,8 @@ allprojects {
     }
 
     dependencies {
-        add("testImplementation", create(group: "org.junit.jupiter", name:"junit-jupiter-api", version: project["version.junitJupiter"]))
-        add("testRuntimeOnly", create(group: "org.junit.jupiter", name: "junit-jupiter-engine", version: project["version.junitJupiter"]))
+        testImplementation catalog.junit.jupiter.api
+        testRuntimeOnly catalog.junit.jupiter.engine
     }
 
     tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) {
diff --git a/gradle.properties b/gradle.properties
index 7b89936..24df651 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,10 +1,7 @@
 woggioniMavenRepositoryUrl=https://woggioni.net/mvn/
 publishMavenRepositoryUrl=https://mvn.woggioni.net/
 
-lys-gradle-plugins.version = 2022.06
+lys.version = 0.1-SNAPSHOT
 
 version.envelope=2022.08
-version.gradle=7.5
-version.lombok=1.18.22
-version.junitJupiter=5.7.2
-version.junitPlatform=1.7.0
+version.gradle=7.5.1
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2ec77e5..8fad3f5 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.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/launcher/build.gradle b/launcher/build.gradle
index 3caccf9..0b780ed 100644
--- a/launcher/build.gradle
+++ b/launcher/build.gradle
@@ -1,6 +1,6 @@
 import java.util.jar.Attributes
 plugins {
-    id 'net.woggioni.gradle.multi-release-jar'
+    alias catalog.plugins.multi.release.jar
 }
 
 ext {
diff --git a/loader/build.gradle b/loader/build.gradle
index 8376290..863bf66 100644
--- a/loader/build.gradle
+++ b/loader/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'net.woggioni.gradle.multi-release-jar'
+    alias catalog.plugins.multi.release.jar
 }
 
 ext {
diff --git a/settings.gradle b/settings.gradle
index eb679ad..0810950 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,11 +12,21 @@ pluginManagement {
             url = 'https://woggioni.net/mvn/'
         }
     }
+}
 
-    plugins {
-        id 'net.woggioni.gradle.lombok' version getProperty('lys-gradle-plugins.version')
-        id 'net.woggioni.gradle.multi-version-jar' version getProperty('lys-gradle-plugins.version')
-        id 'net.woggioni.gradle.multi-release-jar' version getProperty('lys-gradle-plugins.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')
+        }
     }
 }