woggioni/jwo
1
0
Fork 0
Code Actions Packages Activity

switch to lys catalog

Browse Source
This commit is contained in:
Walter Oggioni
2022-08-28 12:05:56 +08:00
parent 6c19886369
commit 1a17f5ce22
5 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
benchmark/build.gradle
View File

@@ -1,5 +1,5 @@
plugins { plugins {
id 'application' alias(catalog.plugins.envelope)
} }
repositories { repositories {
@@ -10,7 +10,7 @@ dependencies {
implementation project(':') implementation project(':')
} }
application { envelopeJar {
mainClass = 'net.woggioni.jwo.benchmark.Main' mainClass = 'net.woggioni.jwo.benchmark.Main'
} }

18
build.gradle
View File

@@ -1,12 +1,12 @@
plugins { plugins {
id 'maven-publish' id 'maven-publish'
id 'net.woggioni.gradle.multi-release-jar' alias(catalog.plugins.multi.release.jar)
id 'net.woggioni.gradle.lombok' apply false alias(catalog.plugins.lombok) apply false
} }
allprojects { allprojects {
apply plugin: 'java-library' apply plugin: 'java-library'
apply plugin: 'net.woggioni.gradle.lombok' apply plugin: catalog.plugins.lombok.get().pluginId
group = "net.woggioni" group = "net.woggioni"
version = getProperty('jwo.version') version = getProperty('jwo.version')
@@ -17,15 +17,15 @@ allprojects {
} }
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
testImplementation platform(group: 'com.lys', name: 'lys-dependencies', version: getProperty('lys.version')) testImplementation catalog.junit.jupiter.api
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api' testImplementation catalog.junit.jupiter.params
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params' testRuntimeOnly catalog.junit.jupiter.engine
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine'
} }
lombok { lombok {
version = getProperty('lombok.version') version = catalog.versions.lombok.get()
} }
} }
@@ -39,7 +39,7 @@ configurations {
} }
dependencies { dependencies {
implementation group: "org.slf4j", name: "slf4j-api", version: getProperty('slf4j.version') implementation catalog.slf4j.api
pathClassloaderTest group: 'com.google.inject', name: 'guice', version: getProperty('guice.version') pathClassloaderTest group: 'com.google.inject', name: 'guice', version: getProperty('guice.version')
} }

4
gradle.properties
View File

@@ -1,6 +1,4 @@
gradle.version = 7.4.2 gradle.version = 7.5.1
jwo.version=1.0-SNAPSHOT jwo.version=1.0-SNAPSHOT
lys.version = 0.1-SNAPSHOT lys.version = 0.1-SNAPSHOT
lombok.version=1.18.22
guice.version = 5.0.1 guice.version = 5.0.1
slf4j.version=1.7.36

2
gradle/wrapper/gradle-wrapper.properties vendored
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.4.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

22
settings.gradle
View File

@@ -6,9 +6,25 @@ pluginManagement {
gradlePluginPortal() gradlePluginPortal()
} }
plugins { // plugins {
id "net.woggioni.gradle.lombok" version "0.1" // id "net.woggioni.gradle.lombok" version "0.1"
id "net.woggioni.gradle.multi-release-jar" version "0.1" // id "net.woggioni.gradle.multi-release-jar" version "0.1"
// }
}
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')
}
} }
} }