Java 16
This commit is contained in:
parent
927180e36b
commit
fc3a5ef052
4 changed files with 11 additions and 14 deletions
10
.github/workflows/test-push.yml
vendored
10
.github/workflows/test-push.yml
vendored
|
@ -5,8 +5,8 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
gradle: [7.0.0]
|
||||
java: [jdk8, jdk11, jdk16]
|
||||
gradle: [7.0.1]
|
||||
java: [jdk16]
|
||||
jvm: [hotspot]
|
||||
runs-on: ubuntu-20.04
|
||||
container:
|
||||
|
@ -24,7 +24,7 @@ jobs:
|
|||
|
||||
runs-on: ubuntu-20.04
|
||||
container:
|
||||
image: gradle:7.0.0-jdk16
|
||||
image: gradle:7.0.1-jdk16
|
||||
options: --user root
|
||||
|
||||
steps:
|
||||
|
@ -43,7 +43,7 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
java: [jdk8, jdk11, jdk16]
|
||||
java: [jdk16]
|
||||
test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }}
|
||||
exclude:
|
||||
- java: jdk16
|
||||
|
@ -73,7 +73,7 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
java: [ 1.8, 11, 16 ]
|
||||
java: [ 16 ]
|
||||
os: [ windows-2019, ubuntu-20.04, macos-10.15 ]
|
||||
|
||||
runs-on: ${{ matrix.os }}
|
||||
|
|
|
@ -11,15 +11,12 @@ plugins {
|
|||
id "org.cadixdev.licenser" version "0.5.0"
|
||||
}
|
||||
|
||||
sourceCompatibility = 1.8
|
||||
targetCompatibility = 1.8
|
||||
sourceCompatibility = 16
|
||||
targetCompatibility = 16
|
||||
|
||||
tasks.withType(JavaCompile).configureEach {
|
||||
it.options.encoding = "UTF-8"
|
||||
|
||||
if (JavaVersion.current().isJava9Compatible()) {
|
||||
it.options.release = 8
|
||||
}
|
||||
it.options.release = 16
|
||||
}
|
||||
|
||||
|
||||
|
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,5 +1,5 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
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
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
|
@ -28,8 +28,8 @@ import org.gradle.testkit.runner.BuildResult
|
|||
import org.gradle.testkit.runner.GradleRunner
|
||||
|
||||
trait ProjectTestTrait {
|
||||
final static String DEFAULT_GRADLE = "7.0"
|
||||
final static String PRE_RELEASE_GRADLE = "7.1-20210504162620+0000"
|
||||
final static String DEFAULT_GRADLE = "7.0.1"
|
||||
final static String PRE_RELEASE_GRADLE = "7.1-20210511220046+0000"
|
||||
|
||||
static File gradleHome = File.createTempDir()
|
||||
File testProjectDir = File.createTempDir()
|
||||
|
|
Loading…
Reference in a new issue