package/readme/templateplugin: Update to gradle 6.2 release

This commit is contained in:
Max Weber
2020-02-18 15:10:27 -07:00
parent c3432e63f3
commit 831dd8e0d3
4 changed files with 8 additions and 13 deletions

View File

@@ -117,13 +117,9 @@ will not merge it__.
## Third party dependencies
We require any dependencies that are not a transitive dependency of runelite-client to
be have their cryptographic hash verified during the build to prevent [supply chain attacks](https://en.wikipedia.org/wiki/Supply_chain_attack) and ensure build reproducability.
To do this we rely on [Gradle's dependency verification](https://docs.gradle.org/nightly/userguide/dependency_verification.html),
which is currently only available in nightly builds. To enable this you must first run:
```
./gradlew wrapper --gradle-version=6.2-20200117230024+0000
```
To do this we rely on [Gradle's dependency verification](https://docs.gradle.org/nightly/userguide/dependency_verification.html).
Then create `gradle/verification-metadata.xml` with the following contents
Create `gradle/verification-metadata.xml` with the following contents
```xml
<?xml version="1.0" encoding="UTF-8"?>

View File

@@ -54,10 +54,10 @@ done < "$PLUGINFILE"
[[ $commit =~ ^[a-fA-F0-9]{40}+$ ]]
# we need gradle 6.2 for dependency verification
GRADLE_VER=gradle-6.2-20200117230024+0000
GRADLE_VER=gradle-6.2
if [[ ! -e "/tmp/$GRADLE_VER/bin/gradle" ]]; then
wget -q -O/tmp/gradle.zip "https://services.gradle.org/distributions-snapshots/$GRADLE_VER-bin.zip"
echo 'b684259e5a0fcce1ed183929c6dcecab8a9613e7b73d7fbc664807b751822323 */tmp/gradle.zip' | shasum -a256 -c
wget -q -O/tmp/gradle.zip "https://services.gradle.org/distributions/$GRADLE_VER-bin.zip"
echo 'b93a5f30d01195ec201e240f029c8b42d59c24086b8d1864112c83558e23cf8a */tmp/gradle.zip' | shasum -a256 -c
unzip -q /tmp/gradle.zip -d /tmp/
[[ -e "/tmp/$GRADLE_VER/bin/gradle" ]]
fi

View File

@@ -1,6 +1,5 @@
#Thu Dec 12 13:37:44 MST 2019
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

View File

@@ -97,7 +97,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="/usr/lib/jvm/java-11-openjdk/bin/java"
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the