From d41cb552a1d564be7e0d1f0b7953f4268e6370a0 Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 28 Aug 2019 17:08:36 -0700 Subject: [PATCH] Use official launch4j plugin to potentially fix build. --- Jenkinsfile | 6 +++--- build.gradle | 16 ++++++++++------ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0bbcde46f2..7fabf45052 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,9 +43,9 @@ pipeline { steps { sh './gradlew ${GRADLE_ARGS} --refresh-dependencies --continue ciWriteBuildNumber' script { - env.MYGROUP = sh(returnStdout: true, script: './gradlew :forge:properties -q | grep "group:" | awk \'{print $2}\'').trim() - env.MYARTIFACT = sh(returnStdout: true, script: './gradlew :forge:properties -q | grep "version:" | awk \'{print $2}\'').trim() - env.MYVERSION = sh(returnStdout: true, script: './gradlew :forge:properties -q | grep "version:" | awk \'{print $2}\'').trim() + env.MYGROUP = sh(returnStdout: true, script: './gradlew properties -q | grep "group:" | awk \'{print $2}\'').trim() + env.MYARTIFACT = sh(returnStdout: true, script: './gradlew properties -q | grep "version:" | awk \'{print $2}\'').trim() + env.MYVERSION = sh(returnStdout: true, script: './gradlew properties -q | grep "version:" | awk \'{print $2}\'').trim() } } } diff --git a/build.gradle b/build.gradle index 9e858cf387..fcb2a178d4 100644 --- a/build.gradle +++ b/build.gradle @@ -10,8 +10,12 @@ buildscript { name = "sonatype" url = "https://oss.sonatype.org/content/repositories/snapshots/" } + maven { + url "https://plugins.gradle.org/m2/" + } } dependencies { + classpath 'edu.sc.seis.launch4j:launch4j:2.4.6' classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' } } @@ -22,7 +26,7 @@ plugins { apply plugin: "maven" def patcher_plugin = plugins.apply('net.minecraftforge.gradle.patcher') -apply plugin: "net.minecraftforge.gradle.launch4j" +apply plugin: 'edu.sc.seis.launch4j' minecraft.version = "1.12.2" @@ -283,14 +287,14 @@ tasks.build.dependsOn makeMdk launch4j { jar = installer.archivePath.canonicalPath - outfile = file("build/distributions/${project.name}-${project.version}-installer-win.exe").canonicalPath + outfile = "${project.name}-${project.version}-installer-win.exe" icon = file('icon.ico').canonicalPath manifest = file('l4jManifest.xml').canonicalPath - jreMinVersion = '1.8.0' - initialHeapPercent = 5; - maxHeapPercent = 100; + jreMinVersion = '1.8.0_101' + initialHeapPercent = 5 + maxHeapPercent = 100 } -tasks.generateXmlConfig.dependsOn installer +tasks.createExe.dependsOn installer tasks.build.dependsOn 'launch4j' // MAVEN