switch to lys-dependencies

This commit is contained in:
2022-06-24 23:00:20 +08:00
parent b75f7a7655
commit 93244f35f0
2 changed files with 20 additions and 15 deletions

View File

@@ -5,6 +5,7 @@ plugins {
} }
import net.woggioni.gradle.envelope.EnvelopeJarTask import net.woggioni.gradle.envelope.EnvelopeJarTask
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
group = 'net.woggioni' group = 'net.woggioni'
@@ -15,21 +16,24 @@ repositories {
url = 'https://woggioni.net/mvn' url = 'https://woggioni.net/mvn'
content { content {
includeModule 'net.woggioni', 'jwo' includeModule 'net.woggioni', 'jwo'
includeGroup 'com.lys'
} }
} }
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
implementation group: 'net.woggioni', name: 'jwo', version: getProperty('jwo.version') implementation platform(group: 'com.lys', name: 'lys-dependencies', version: getProperty('lys.version'))
implementation group: 'org.slf4j', name: 'slf4j-api', version: getProperty('slf4j.version')
implementation group: 'io.netty', name: 'netty-codec-http', version: getProperty('netty.version')
runtimeOnly group: 'org.slf4j', name: 'slf4j-jdk14', version: getProperty('slf4j.version') implementation group: 'net.woggioni', name: 'jwo'
implementation group: 'org.slf4j', name: 'slf4j-api'
implementation group: 'io.netty', name: 'netty-codec-http'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: getProperty('junit.jupiter.version') runtimeOnly group: 'org.slf4j', name: 'slf4j-jdk14'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: getProperty('junit.jupiter.version')
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: getProperty('junit.jupiter.version') testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine'
} }
java { java {
@@ -39,7 +43,13 @@ java {
tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) { tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) {
modularity.inferModulePath = true modularity.inferModulePath = true
options.compilerArgs << '--patch-module' << 'net.woggioni.gbcs=' + project.sourceSets.main.output.asPath options.compilerArgs << '--patch-module' << 'net.woggioni.gbcs=' + project.sourceSets.main.output.asPath
options.release = 11 options.release = 17
}
tasks.named("compileKotlin", KotlinCompile.class) {
kotlinOptions {
jvmTarget = 17
}
} }
Provider<EnvelopeJarTask> envelopeJarTaskProvider = tasks.named('envelopeJar', EnvelopeJarTask.class) { Provider<EnvelopeJarTask> envelopeJarTaskProvider = tasks.named('envelopeJar', EnvelopeJarTask.class) {

View File

@@ -1,13 +1,8 @@
gbcs.version = 0.1-SNAPSHOT gbcs.version = 0.1-SNAPSHOT
gradle.version = 7.4.1 gradle.version = 7.4.1
kotlin.version = 1.6.10 kotlin.version = 1.7.0
envelope.gradle.plugin.version = 1.0-SNAPSHOT envelope.gradle.plugin.version = 1.0-SNAPSHOT
lombok.gradle.plugin.version = 0.1 lombok.gradle.plugin.version = 0.1
lys.version = 0.1-SNAPSHOT
jwo.version = 1.0-SNAPSHOT
junit.jupiter.version = 5.8.2
netty.version = 4.1.74.Final
h2.version = 2.1.210
slf4j.version = 1.7.36
lombok.version = 1.18.22 lombok.version = 1.18.22