From 42b9a9b244e1f1d71819d348a46e05de40d0a0ee Mon Sep 17 00:00:00 2001 From: ST0NEWALL <46624825+pklite@users.noreply.github.com> Date: Fri, 4 Oct 2019 23:25:29 -0400 Subject: [PATCH] gradle: add dependency dump for Bootstrapper (#1717) * Fix player attack options and player indicators * player attack options * buying checkstyle bypass method * for testing the bootstrapper. if the testing works, this can be merged Signed-off-by: PKLite * runtimeClasspath Signed-off-by: PKLite * runtimeClasspath Signed-off-by: PKLite * launcher version bump Signed-off-by: PKLite * , Signed-off-by: PKLite --- build.gradle | 3 +++ runelite-client/build.gradle | 14 ++++++++------ .../src/main/resources/open.osrs.properties | 3 ++- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 827f6c60d0..0095d5c901 100644 --- a/build.gradle +++ b/build.gradle @@ -26,6 +26,9 @@ ext { localGitCommitShort = grgit.head().getAbbreviatedId(7) localGitDirty = !grgit.status().clean + // sets the minimum launcher version that is output for the bootstrapper + launcherVersion = '2.0.3' + // Dependencies versions annotations = '17.0.0' antlr = '4.7.2' diff --git a/runelite-client/build.gradle b/runelite-client/build.gradle index bd92cdf209..b8a692b33a 100644 --- a/runelite-client/build.gradle +++ b/runelite-client/build.gradle @@ -47,7 +47,7 @@ dependencies { implementation(group: 'io.sigpipe', name: 'jbsdiff', version: jbsdiff) { exclude(module: 'xz') } - implementation group: 'com.github.joonasvali.naturalmouse', name: 'naturalmouse', version: '[1.0.0,)' + implementation group: 'com.github.joonasvali.naturalmouse', name: 'naturalmouse', version: '2.0.2' runtime group: 'net.runelite.pushingpixels', name: 'trident', version: trident runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: jogamp, classifier: 'natives-linux-amd64' runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: jogamp, classifier: 'natives-linux-i586' @@ -85,7 +85,8 @@ processResources { "project.version": project.version, "rs.version": rsversion.toString(), "open.osrs.version": plusVersion.toString(), - "open.osrs.builddate": buildDate.toString() + "open.osrs.builddate": buildDate.toString(), + "launcher.version": launcherVersion.toString() ]) } } @@ -107,10 +108,11 @@ shadowJar { exclude("net/runelite/injector/**") } -task copyToLib(type: Copy) { - into "$buildDir/lib" - from configurations.runtime +task dependencyReportFile(type: DependencyReportTask) { + outputFile = file('dependencies.txt') + Set configs = [project.configurations.runtimeClasspath] + setConfigurations(configs) } tasks.build.dependsOn tasks.shadowJar -tasks.shadowJar.dependsOn tasks.copyToLib +tasks.shadowJar.dependsOn tasks.dependencyReportFile diff --git a/runelite-client/src/main/resources/open.osrs.properties b/runelite-client/src/main/resources/open.osrs.properties index 179e396e29..aebfa762a4 100644 --- a/runelite-client/src/main/resources/open.osrs.properties +++ b/runelite-client/src/main/resources/open.osrs.properties @@ -10,4 +10,5 @@ open.osrs.version=@open.osrs.version@ open.osrs.builddate=@open.osrs.builddate@ runelite.wiki.troubleshooting.link=https://github.com/runelite/runelite/wiki/Troubleshooting-problems-with-the-client runelite.wiki.building.link=https://github.com/runelite-extended/runelite/wiki/Building-with-IntelliJ-IDEA -runelite.dnschange.link=https://1.1.1.1/dns/ \ No newline at end of file +runelite.dnschange.link=https://1.1.1.1/dns/ +launcher.version=@launcher.version@ \ No newline at end of file