[FIX] Всё в gradle-скриптах кроме конфигураций compile/testCompile.

This commit is contained in:
Zaxar163 2020-02-21 06:20:54 +01:00
parent e84530cce4
commit 19ac80d449
No known key found for this signature in database
GPG key ID: 1FE4F2E1F053831B
5 changed files with 10 additions and 16 deletions

View file

@ -8,7 +8,7 @@
url "https://oss.sonatype.org/content/repositories/snapshots"
}
maven {
url "http://maven.geomajas.org/"
url "https://maven.geomajas.org/"
}
}
@ -31,7 +31,6 @@
dependsOn parent.childProjects.Launcher.tasks.build
from { configurations.pack.collect { it.isDirectory() ? it : zipTree(it) } }
from(parent.childProjects.Launcher.tasks.shadowJar.archivePath)
from(parent.childProjects.Launcher.tasks.genRuntimeJS.archivePath)
manifest.attributes("Main-Class": mainClassName,
"Premain-Class": mainAgentName,
"Can-Redefine-Classes": "true",
@ -125,6 +124,7 @@ task hikari(type: Copy) {
task launch4jM(type: Copy) {
into "$buildDir/libs/libraries/launch4j"
from(configurations.launch4jCJ.collect { it.isDirectory() ? it : zipTree(it) })
duplicatesStrategy = 'INCLUDE'
includeEmptyDirs false
eachFile { FileCopyDetails fcp ->
if (fcp.relativePath.pathString.startsWith("launch4j-")) {
@ -163,8 +163,8 @@ task dumpCompileOnlyLibs(type: Copy) {
task bundle(type: Zip) {
dependsOn parent.childProjects.Launcher.tasks.build, tasks.dumpLibs, tasks.dumpCompileOnlyLibs, tasks.jar
archiveName 'LaunchServer.zip'
destinationDir file("$buildDir")
archiveFileName = 'LaunchServer.zip'
destinationDirectory = file("$buildDir")
from(tasks.dumpLibs.destinationDir) { into 'libraries' }
from(tasks.dumpCompileOnlyLibs.destinationDir) { into 'launcher-libraries-compile' }
from tasks.jar.archivePath

View file

@ -8,7 +8,7 @@
repositories {
maven {
url "http://repo.spring.io/plugins-release/"
url "https://repo.spring.io/plugins-release/"
}
}
javafx {
@ -59,19 +59,13 @@ pack project(':LauncherAPI')
pack 'org.ow2.asm:asm-tree:7.1'
}
task genRuntimeJS(type: Zip) {
archiveName = "runtime.zip"
destinationDir = file("${buildDir}/tmp")
from "runtime/"
}
task dumpLibs(type: Copy) {
into "$buildDir/libs/libraries"
from configurations.bundle
}
assemble.dependsOn tasks.genRuntimeJS, tasks.dumpLibs, tasks.shadowJar
assemble.dependsOn tasks.dumpLibs, tasks.shadowJar
publishing {
publications {

View file

@ -10,7 +10,7 @@
repositories {
maven {
url "http://repo.spring.io/plugins-release/"
url "https://repo.spring.io/plugins-release/"
}
}

View file

@ -15,9 +15,9 @@
repositories {
mavenCentral()
maven { url 'http://oss.sonatype.org/content/groups/public' }
maven { url 'https://oss.sonatype.org/content/groups/public' }
maven {
url "http://clojars.org/repo/"
url "https://clojars.org/repo/"
}
}

@ -1 +1 @@
Subproject commit 0fbc3fb26c505800a61976cdf1310cad6ab7808d
Subproject commit fa9403131f0d3caed104d323128b241ac05ecda3