From 706ac35063e82a8f972d3d9a7c2259a4142f1ba6 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Fri, 14 May 2021 23:46:49 +0200 Subject: [PATCH] Update GitHub actions matching latest Java requirements --- .github/workflows/build.yml | 13 +++++-------- COMPILING.md | 4 ++-- CONTRIBUTING.md | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f13da59cb..2608813ee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,17 +6,16 @@ jobs: build: strategy: matrix: - java: ["8", "11"] os: ["ubuntu-latest"] runs-on: "${{ matrix.os }}" steps: - name: "Checkout Repository" uses: "actions/checkout@v2.3.4" - - name: "Setup JDK ${{ matrix.java }}" + - name: "Setup JDK 11" uses: "actions/setup-java@v2" with: distribution: "adopt" - java-version: "${{ matrix.java }}" + java-version: "11" - name: "Cache Gradle" uses: "actions/cache@v2.1.4" with: @@ -30,9 +29,9 @@ jobs: uses: "actions/cache@v2.1.4" with: path: "~/.m2/repository" - key: "${{ runner.os }}-${{ matrix.java }}-maven-${{ hashFiles('**/pom.xml') }}" + key: "${{ runner.os }}-11-maven-${{ hashFiles('**/pom.xml') }}" restore-keys: | - "${{ runner.os }}-${{ matrix.java }}-maven-" + "${{ runner.os }}-11-maven-" - name: "Cache BuildTools Decompiled Code" uses: "actions/cache@v2.1.4" with: @@ -40,7 +39,7 @@ jobs: key: "${{ runner.os }}-buildtools" restore-keys: | "${{ runner.os }}-buildtools" - - name: "Test Enviornment" + - name: "Test Environment" run: "echo $GITHUB_WORKSPACE" - name: "Download BuildTools" run: "wget https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar" @@ -54,5 +53,3 @@ jobs: run: | rm -f ~/.gradle/caches/modules-2/modules-2.lock rm -f ~/.gradle/caches/modules-2/gc.properties - - diff --git a/COMPILING.md b/COMPILING.md index 1bc20255d..75db3d923 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -1,12 +1,12 @@ Compiling ========= -You can compile FastAsyncWorldEdit as long as you have some version of Java greater than or equal to 8 installed. Gradle will download JDK 8 specifically if needed, +You can compile FastAsyncWorldEdit as long as you have some version of Java greater than or equal to 11 installed. Gradle will download JDK 11 specifically if needed, but it needs some version of Java to bootstrap from. Note that if you have JRE 8 installed, Gradle will currently attempt to use that to compile, which will not work. It is easiest to uninstall JRE 8 and replace it with JDK 8. -You can get the JDK 8 [here](https://adoptopenjdk.net/?variant=openjdk8&jvmVariant=hotspot). +You can get the JDK 11 [here](https://adoptopenjdk.net/?variant=openjdk11&jvmVariant=hotspot). The build process uses Gradle, which you do *not* need to download. FastAsyncWorldEdit is a multi-module project with three active modules: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9ca1f19ed..d75377ab6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,7 +8,7 @@ ask that you make note of the following guidelines. * **Follow the [Oracle coding conventions](http://www.oracle.com/technetwork/java/codeconv-138413.html).** We can't stress this enough; if your code has notable issues, it may delay the process significantly. -* **Target Java 8 for source and compilation.** Make sure to mark methods with +* **Target Java 11 for source and compilation.** Make sure to mark methods with ` @Override` that override methods of parent classes, or that implement methods of interfaces. * **Use only spaces for indentation.** Our indents are 4-spaces long, and tabs