Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-12-23 00:51:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] Gradle часть 2/3

Browse source
This commit is contained in:
Zaxar163 2020-03-11 16:40:27 +01:00
parent 01fa09a115
commit b8f25e669e
No known key found for this signature in database
GPG key ID: 1FE4F2E1F053831B
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
LaunchServer/build.gradle
View file

@ -99,14 +99,8 @@ pack project(':LauncherAPI')
exclude group: 'com.jgoodies' exclude group: 'com.jgoodies'
exclude group: 'org.slf4j' exclude group: 'org.slf4j'
} }
launch4j('net.sf.launch4j:launch4j:3.12:workdir-win32') { transitive = false }
launch4j('net.sf.launch4j:launch4j:3.12:workdir-win32') { launch4j('net.sf.launch4j:launch4j:3.12:workdir-linux') { transitive = false }
exclude group: '*'
}
launch4j('net.sf.launch4j:launch4j:3.12:workdir-linux') {
exclude group: '*'
}
compileOnly group: 'com.google.guava', name: 'guava', version: rootProject['verGuavaC'] compileOnly group: 'com.google.guava', name: 'guava', version: rootProject['verGuavaC']
// Do not update (laggy deps). // Do not update (laggy deps).
@ -123,19 +117,16 @@ task hikari(type: Copy) {
task launch4j(type: Copy) { task launch4j(type: Copy) {
duplicatesStrategy = 'EXCLUDE' duplicatesStrategy = 'EXCLUDE'
into "$buildDir/libs/libraries/launch4j" into "$buildDir/libs/libraries/launch4j"
from(configurations.launch4j.collect { it.isDirectory() ? it : (it.getName().contains("workdir") ? zipTree(it) : it) }) from(configurations.launch4j.collect { it.isDirectory() ? it : ((it.getName().startsWith("launch4j") && it.getName().contains("workdir")) ? zipTree(it) : it) })
includeEmptyDirs false includeEmptyDirs false
eachFile { FileCopyDetails fcp -> eachFile { FileCopyDetails fcp ->
if (fcp.relativePath.pathString.startsWith("launch4j-")) { if (fcp.relativePath.pathString.startsWith("launch4j-") &&
if (fcp.relativePath.pathString.contains("workdir")) { fcp.relativePath.pathString.contains("workdir")) {
def segments = fcp.relativePath.segments def segments = fcp.relativePath.segments
def pathSegments = segments[1..-1] as String[] def pathSegments = segments[1..-1] as String[]
fcp.relativePath = new RelativePath(!fcp.file.isDirectory(), pathSegments) fcp.relativePath = new RelativePath(!fcp.file.isDirectory(), pathSegments)
} }
fcp.mode = 0755 fcp.mode = 0755
} else {
fcp.exclude()
}
} }
} }
@ -166,7 +157,7 @@ task bundle(type: Zip) {
task dumpClientLibs(type: Copy) { task dumpClientLibs(type: Copy) {
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.destinationDir from parent.childProjects.Launcher.tasks.dumpLibs
} }
assemble.dependsOn tasks.dumpLibs, tasks.dumpCompileOnlyLibs, tasks.dumpClientLibs, tasks.bundle, tasks.cleanjar assemble.dependsOn tasks.dumpLibs, tasks.dumpCompileOnlyLibs, tasks.dumpClientLibs, tasks.bundle, tasks.cleanjar