From 3d2b9bc62834f145131310c48328d8ffe02de293 Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Sun, 28 Aug 2022 12:14:16 +0800 Subject: [PATCH] switch to lys-catalog --- build.gradle | 12 ++++++------ gradle.properties | 8 +------- settings.gradle | 18 ++++++++++++++---- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index c9481df..d61b23e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'maven-publish' - id 'net.woggioni.gradle.multi-release-jar' - id 'net.woggioni.gradle.lombok' apply false + alias catalog.plugins.lombok apply false + alias catalog.plugins.multi.release.jar } ext { @@ -22,7 +22,7 @@ allprojects { } lombok { - version = getProperty('lombok.version') + version = catalog.versions.lombok.get() } test { @@ -31,10 +31,10 @@ allprojects { } dependencies { - implementation group: 'net.woggioni', name: 'jwo', version: getProperty('jwo.version') + implementation catalog.jwo - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: getProperty('junit.jupiter.version') - testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: getProperty('junit.jupiter.version') + testImplementation catalog.junit.jupiter.api + testRuntimeOnly catalog.junit.jupiter.engine } java { diff --git a/gradle.properties b/gradle.properties index 8948059..1156325 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,4 @@ gradle.version=7.5.1 -lombok.gradle.plugin.version=2022.06 -multi-release-jar.gradle.plugin.version=2022.06 -envelope.gradle.plugin.version=2022.08 wdi.version=1.0=SNAPSHOT -jwo.version=1.0-SNAPSHOT -junit.jupiter.version=5.9.0 -lombok.version=1.18.24 -slf4j.version=2.0.0 \ No newline at end of file +lys.version=0.1-SNAPSHOT diff --git a/settings.gradle b/settings.gradle index 5b8f6d0..93f7ddb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,11 +5,21 @@ pluginManagement { } gradlePluginPortal() } +} - plugins { - id "net.woggioni.gradle.lombok" version getProperty('lombok.gradle.plugin.version') - id "net.woggioni.gradle.multi-release-jar" version getProperty('multi-release-jar.gradle.plugin.version') - id "net.woggioni.gradle.envelope" version getProperty('envelope.gradle.plugin.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') + } } }