switch to lys-catalog

This commit is contained in:
2022-09-01 12:38:23 +08:00
parent 40bd8e71bd
commit 0b4b2882b0
6 changed files with 24 additions and 17 deletions

View File

@@ -2,13 +2,13 @@ import java.nio.file.Files
plugins { plugins {
id 'java-gradle-plugin' id 'java-gradle-plugin'
id 'net.woggioni.gradle.lombok' apply false alias(catalog.plugins.lombok) apply false
id 'maven-publish' id 'maven-publish'
} }
allprojects { allprojects {
apply plugin: 'java-library' apply plugin: 'java-library'
apply plugin: 'net.woggioni.gradle.lombok' apply plugin: catalog.plugins.lombok.get().pluginId
repositories { repositories {
mavenCentral() mavenCentral()
@@ -23,7 +23,7 @@ allprojects {
} }
lombok { lombok {
version = getProperty('version.lombok') version = catalog.versions.lombok
} }
configurations.all { configurations.all {
@@ -31,8 +31,8 @@ allprojects {
} }
dependencies { dependencies {
add("testImplementation", create(group: "org.junit.jupiter", name:"junit-jupiter-api", version: project["version.junitJupiter"])) testImplementation catalog.junit.jupiter.api
add("testRuntimeOnly", create(group: "org.junit.jupiter", name: "junit-jupiter-engine", version: project["version.junitJupiter"])) testRuntimeOnly catalog.junit.jupiter.engine
} }
tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) { tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) {

View File

@@ -1,10 +1,7 @@
woggioniMavenRepositoryUrl=https://woggioni.net/mvn/ woggioniMavenRepositoryUrl=https://woggioni.net/mvn/
publishMavenRepositoryUrl=https://mvn.woggioni.net/ publishMavenRepositoryUrl=https://mvn.woggioni.net/
lys-gradle-plugins.version = 2022.06 lys.version = 0.1-SNAPSHOT
version.envelope=2022.08 version.envelope=2022.08
version.gradle=7.5 version.gradle=7.5.1
version.lombok=1.18.22
version.junitJupiter=5.7.2
version.junitPlatform=1.7.0

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@@ -1,6 +1,6 @@
import java.util.jar.Attributes import java.util.jar.Attributes
plugins { plugins {
id 'net.woggioni.gradle.multi-release-jar' alias catalog.plugins.multi.release.jar
} }
ext { ext {

View File

@@ -1,5 +1,5 @@
plugins { plugins {
id 'net.woggioni.gradle.multi-release-jar' alias catalog.plugins.multi.release.jar
} }
ext { ext {

View File

@@ -12,11 +12,21 @@ pluginManagement {
url = 'https://woggioni.net/mvn/' url = 'https://woggioni.net/mvn/'
} }
} }
}
plugins { dependencyResolutionManagement {
id 'net.woggioni.gradle.lombok' version getProperty('lys-gradle-plugins.version') repositories {
id 'net.woggioni.gradle.multi-version-jar' version getProperty('lys-gradle-plugins.version') maven {
id 'net.woggioni.gradle.multi-release-jar' version getProperty('lys-gradle-plugins.version') url = 'https://woggioni.net/mvn/'
content {
includeGroup 'com.lys'
}
}
}
versionCatalogs {
catalog {
from group: 'com.lys', name: 'lys-catalog', version: getProperty('lys.version')
}
} }
} }