diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle index d1569f29..ea5dcb76 100644 --- a/LaunchServer/build.gradle +++ b/LaunchServer/build.gradle @@ -92,17 +92,17 @@ pack project(':LauncherAPI') exclude group: 'org.slf4j' } - launch4j('net.sf.launch4j:launch4j:3.12') { + launch4j('net.sf.launch4j:launch4j:' + rootProject['verLaunch4j']) { exclude group: 'org.apache.ant' exclude group: 'net.java.abeille' exclude group: 'foxtrot' exclude group: 'com.jgoodies' exclude group: 'org.slf4j' } - launch4j('net.sf.launch4j:launch4j:3.12:workdir-win32') { transitive = false } - launch4j('net.sf.launch4j:launch4j:3.12:workdir-linux') { transitive = false } + launch4j('net.sf.launch4j:launch4j:' + rootProject['verLaunch4j'] + ':workdir-win32') { transitive = false } + launch4j('net.sf.launch4j:launch4j:' + rootProject['verLaunch4j'] + 'workdir-linux') { transitive = false } - compileOnly group: 'com.google.guava', name: 'guava', version: rootProject['verGuavaC'] + compileOnlyA group: 'com.google.guava', name: 'guava', version: rootProject['verGuavaC'] // Do not update (laggy deps). compileOnlyA 'log4j:log4j:1.2.17' compileOnlyA 'org.apache.logging.log4j:log4j-core:2.11.2' @@ -125,7 +125,7 @@ task launch4j(type: Copy) { def segments = fcp.relativePath.segments def pathSegments = segments[1..-1] as String[] fcp.relativePath = new RelativePath(!fcp.file.isDirectory(), pathSegments) - } + } else if (fcp.relativePath.pathString.contains("META-INF")) fcp.exclude() fcp.mode = 0755 } } @@ -150,7 +150,7 @@ task bundle(type: Zip) { destinationDirectory = file("$buildDir") from(tasks.dumpLibs.destinationDir) { into 'libraries' } from(tasks.dumpCompileOnlyLibs.destinationDir) { into 'launcher-libraries-compile' } - from tasks.jar + from(tasks.jar) from(parent.childProjects.Launcher.tasks.dumpLibs) { into 'launcher-libraries' } } diff --git a/props.gradle b/props.gradle index a59f7f53..2140b970 100644 --- a/props.gradle +++ b/props.gradle @@ -1,8 +1,8 @@ project.ext { - verAsm = '7.1' + verAsm = '7.2' verNetty = '4.1.43.Final' verOshiCore = '3.13.0' - verJunit = '5.4.1' + verJunit = '5.6.0' verGuavaC = '26.0-jre' verJansi = '1.18' verJline = '3.11.0' @@ -13,5 +13,6 @@ verMySQLConn = '8.0.16' verPostgreSQLConn = '42.2.6' verProguard = '6.2.0' + verLaunch4j = '3.12' verHibernate = '5.4.9.Final' }