hibiscus-client/fabric-loom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Java 16

Browse source
This commit is contained in:
modmuss50 2021-05-12 14:03:45 +01:00
parent 927180e36b
commit fc3a5ef052
4 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/test-push.yml vendored
View file

@ -5,8 +5,8 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
gradle: [7.0.0] gradle: [7.0.1]
java: [jdk8, jdk11, jdk16] java: [jdk16]
jvm: [hotspot] jvm: [hotspot]
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: container:
@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: container:
image: gradle:7.0.0-jdk16 image: gradle:7.0.1-jdk16
options: --user root options: --user root
steps: steps:
@ -43,7 +43,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
java: [jdk8, jdk11, jdk16] java: [jdk16]
test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }} test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }}
exclude: exclude:
- java: jdk16 - java: jdk16
@ -73,7 +73,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
java: [ 1.8, 11, 16 ] java: [ 16 ]
os: [ windows-2019, ubuntu-20.04, macos-10.15 ] os: [ windows-2019, ubuntu-20.04, macos-10.15 ]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}

9
build.gradle
View file

@ -11,15 +11,12 @@ plugins {
id "org.cadixdev.licenser" version "0.5.0" id "org.cadixdev.licenser" version "0.5.0"
} }
sourceCompatibility = 1.8 sourceCompatibility = 16
targetCompatibility = 1.8 targetCompatibility = 16
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {
it.options.encoding = "UTF-8" it.options.encoding = "UTF-8"
it.options.release = 16
if (JavaVersion.current().isJava9Compatible()) {
it.options.release = 8
}
} }

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

4
src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
View file

@ -28,8 +28,8 @@ import org.gradle.testkit.runner.BuildResult
import org.gradle.testkit.runner.GradleRunner import org.gradle.testkit.runner.GradleRunner
trait ProjectTestTrait { trait ProjectTestTrait {
final static String DEFAULT_GRADLE = "7.0" final static String DEFAULT_GRADLE = "7.0.1"
final static String PRE_RELEASE_GRADLE = "7.1-20210504162620+0000" final static String PRE_RELEASE_GRADLE = "7.1-20210511220046+0000"
static File gradleHome = File.createTempDir() static File gradleHome = File.createTempDir()
File testProjectDir = File.createTempDir() File testProjectDir = File.createTempDir()