From a2dbd7c9421b9541459aec3254692a1400c162ac Mon Sep 17 00:00:00 2001 From: NoComment1105 Date: Sun, 30 May 2021 17:42:19 +0100 Subject: [PATCH] change: Clear up my failures and actually update everything --- .github/workflows/build.yml | 2 +- build.gradle | 5 +++-- src/main/resources/fabric.mod.json | 3 ++- src/main/resources/smoothbedrock.mixins.json | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9c64402..5b9fdb6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: - name: build run: ./gradlew build - name: capture build artifacts - if: ${{ runner.os == 'Linux' && matrix.java == '11' }} # Only upload artifacts built from LTS java on one OS + if: ${{ runner.os == 'Linux' && matrix.java == '16' }} # Only upload artifacts built from latest java on one OS uses: actions/upload-artifact@v2 with: name: Artifacts diff --git a/build.gradle b/build.gradle index 1de8c3a..04a6954 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,8 @@ plugins { id "com.matthewprenger.cursegradle" version "1.4.0" } -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 +sourceCompatibility = JavaVersion.VERSION_16 +targetCompatibility = JavaVersion.VERSION_16 archivesBaseName = "${project.archives_base_name}-${project.minecraft_version}" version = project.mod_version @@ -45,6 +45,7 @@ processResources { // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html tasks.withType(JavaCompile) { it.options.encoding = "UTF-8" + it.options.release = 16 } // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 9c42ba3..511484c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -15,7 +15,8 @@ ] }, "depends": { - "fabricloader": ">=0.11.3" + "fabricloader": ">=0.11.3", + "java": ">=16" }, "mixins": [ "smoothbedrock.mixins.json" diff --git a/src/main/resources/smoothbedrock.mixins.json b/src/main/resources/smoothbedrock.mixins.json index 1049e9a..9f4ea50 100644 --- a/src/main/resources/smoothbedrock.mixins.json +++ b/src/main/resources/smoothbedrock.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "com.nocomment1105.smoothbedrock.mixin", - "compatibilityLevel": "JAVA_8", + "compatibilityLevel": "JAVA_16", "mixins": [ "MixinFlatBedrock" ],