[FIX] Build fix

This commit is contained in:
Gravita 2022-12-22 21:10:15 +07:00
parent 80153458be
commit 96b521184f
6 changed files with 20 additions and 20 deletions

View file

@ -50,17 +50,17 @@
} }
} }
tasks.register('sourcesJar') { tasks.register('sourcesJar', Jar.class) {
from sourceSets.main.allJava from sourceSets.main.allJava
archiveClassifier.set('sources') archiveClassifier.set('sources')
} }
tasks.register('javadocJar') { tasks.register('javadocJar', Jar.class) {
from javadoc from javadoc
archiveClassifier.set('javadoc') archiveClassifier.set('javadoc')
} }
tasks.register('cleanjar') { tasks.register('cleanjar', Jar.class) {
archiveClassifier.set('clean') archiveClassifier.set('clean')
manifest.attributes("Main-Class": mainClassName, manifest.attributes("Main-Class": mainClassName,
"Premain-Class": mainAgentName, "Premain-Class": mainAgentName,
@ -117,13 +117,13 @@ pack project(':LauncherAPI')
compileOnlyA 'org.apache.logging.log4j:log4j-core:2.14.1' compileOnlyA 'org.apache.logging.log4j:log4j-core:2.14.1'
} }
tasks.register('hikari') { tasks.register('hikari', Copy.class) {
duplicatesStrategy = 'EXCLUDE' duplicatesStrategy = 'EXCLUDE'
into "$buildDir/libs/libraries/hikaricp" into "$buildDir/libs/libraries/hikaricp"
from configurations.hikari from configurations.hikari
} }
tasks.register('launch4j') { tasks.register('launch4j', Copy.class) {
duplicatesStrategy = 'EXCLUDE' duplicatesStrategy = 'EXCLUDE'
into "$buildDir/libs/libraries/launch4j" into "$buildDir/libs/libraries/launch4j"
from(configurations.launch4j.collect { from(configurations.launch4j.collect {
@ -141,20 +141,20 @@ pack project(':LauncherAPI')
} }
} }
tasks.register('dumpLibs') { tasks.register('dumpLibs', Copy.class) {
duplicatesStrategy = 'EXCLUDE' duplicatesStrategy = 'EXCLUDE'
dependsOn tasks.hikari, tasks.launch4j dependsOn tasks.hikari, tasks.launch4j
into "$buildDir/libs/libraries" into "$buildDir/libs/libraries"
from configurations.bundleOnly from configurations.bundleOnly
} }
tasks.register('dumpCompileOnlyLibs') { tasks.register('dumpCompileOnlyLibs', Copy.class) {
duplicatesStrategy = 'EXCLUDE' duplicatesStrategy = 'EXCLUDE'
into "$buildDir/libs/launcher-libraries-compile" into "$buildDir/libs/launcher-libraries-compile"
from configurations.compileOnlyA from configurations.compileOnlyA
} }
tasks.register('bundle') { tasks.register('bundle', Zip.class) {
duplicatesStrategy = 'EXCLUDE' duplicatesStrategy = 'EXCLUDE'
dependsOn parent.childProjects.Launcher.tasks.build, tasks.dumpLibs, tasks.dumpCompileOnlyLibs, tasks.jar dependsOn parent.childProjects.Launcher.tasks.build, tasks.dumpLibs, tasks.dumpCompileOnlyLibs, tasks.jar
archiveFileName = 'LaunchServer.zip' archiveFileName = 'LaunchServer.zip'
@ -165,7 +165,7 @@ pack project(':LauncherAPI')
from(parent.childProjects.Launcher.tasks.dumpLibs) { into 'launcher-libraries' } from(parent.childProjects.Launcher.tasks.dumpLibs) { into 'launcher-libraries' }
} }
tasks.register('dumpClientLibs') { tasks.register('dumpClientLibs', Copy.class) {
dependsOn parent.childProjects.Launcher.tasks.build dependsOn parent.childProjects.Launcher.tasks.build
into "$buildDir/libs/launcher-libraries" into "$buildDir/libs/launcher-libraries"
from parent.childProjects.Launcher.tasks.dumpLibs from parent.childProjects.Launcher.tasks.dumpLibs

View file

@ -29,12 +29,12 @@
"Multi-Release": "true") "Multi-Release": "true")
} }
tasks.register('sourcesJar') { tasks.register('sourcesJar', Jar.class) {
from sourceSets.main.allJava from sourceSets.main.allJava
archiveClassifier.set('sources') archiveClassifier.set('sources')
} }
tasks.register('javadocJar') { tasks.register('javadocJar', Jar.class) {
from javadoc from javadoc
archiveClassifier.set('javadoc') archiveClassifier.set('javadoc')
} }
@ -53,14 +53,14 @@ pack project(':LauncherAPI')
pack group: 'io.netty', name: 'netty-codec-http', version: rootProject['verNetty'] pack group: 'io.netty', name: 'netty-codec-http', version: rootProject['verNetty']
} }
tasks.register('genRuntimeJS') { tasks.register('genRuntimeJS', Zip.class) {
duplicatesStrategy = 'EXCLUDE' duplicatesStrategy = 'EXCLUDE'
archiveFileName = "runtime.zip" archiveFileName = "runtime.zip"
destinationDirectory = file("${buildDir}/tmp") destinationDirectory = file("${buildDir}/tmp")
from "runtime/" from "runtime/"
} }
tasks.register('dumpLibs') { tasks.register('dumpLibs', Copy.class) {
duplicatesStrategy = 'EXCLUDE' duplicatesStrategy = 'EXCLUDE'
into "$buildDir/libs/libraries" into "$buildDir/libs/libraries"
from configurations.bundle from configurations.bundle

View file

@ -21,12 +21,12 @@ api project(':LauncherCore')
archiveClassifier.set('clean') archiveClassifier.set('clean')
} }
tasks.register('sourcesJar') { tasks.register('sourcesJar', Jar.class) {
from sourceSets.main.allJava from sourceSets.main.allJava
archiveClassifier.set('sources') archiveClassifier.set('sources')
} }
tasks.register('javadocJar') { tasks.register('javadocJar', Jar.class) {
from javadoc from javadoc
archiveClassifier.set('javadoc') archiveClassifier.set('javadoc')
} }

View file

@ -27,12 +27,12 @@
archiveClassifier.set('clean') archiveClassifier.set('clean')
} }
tasks.register('sourcesJar') { tasks.register('sourcesJar', Jar.class) {
from sourceSets.main.allJava from sourceSets.main.allJava
archiveClassifier.set('sources') archiveClassifier.set('sources')
} }
tasks.register('javadocJar') { tasks.register('javadocJar', Jar.class) {
from javadoc from javadoc
archiveClassifier.set('javadoc') archiveClassifier.set('javadoc')
} }

View file

@ -30,12 +30,12 @@
"Multi-Release": "true") "Multi-Release": "true")
} }
tasks.register('sourcesJar') { tasks.register('sourcesJar', Jar.class) {
from sourceSets.main.allJava from sourceSets.main.allJava
archiveClassifier.set('sources') archiveClassifier.set('sources')
} }
tasks.register('javadocJar') { tasks.register('javadocJar', Jar.class) {
from javadoc from javadoc
archiveClassifier.set('javadoc') archiveClassifier.set('javadoc')
} }

@ -1 +1 @@
Subproject commit d8687992cd5e14b01fb9dc3c20e48796065183c6 Subproject commit 142f71ae1b23a1eefe85a7b95d89e685bb50551e