Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit a371221

Browse files
Merge remote-tracking branch '3flex/java-17'
# Conflicts: # build.gradle
2 parents 50c7e5e + 81cb8fc commit a371221

File tree

2 files changed

+2
-38
lines changed

2 files changed

+2
-38
lines changed

‎.github/workflows/ci.yml

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
if: ${{ needs.check_duplicate_workflows.outputs.should_skip != 'true' }}
2424
strategy:
2525
matrix:
26-
java: [ '8', '11', '16' ]
26+
java: [ '8', '11', '17' ]
2727
platform: ['windows-latest', 'ubuntu-latest']
2828
steps:
2929
- uses: actions/checkout@v3
@@ -35,16 +35,6 @@ jobs:
3535
cache: 'gradle'
3636
- name: print Java version
3737
run: java -version
38-
- name: Set JVM options for JDK 16
39-
if: ${{ matrix.java == 16 }}
40-
run: echo org.gradle.jvmargs="--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
41-
--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
42-
--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
43-
--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED \
44-
--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \
45-
--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
46-
--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
47-
--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" >> gradle.properties
4838
- name: Run build
4939
run: ./gradlew clean assemble --info
5040

@@ -54,7 +44,7 @@ jobs:
5444
needs: [build]
5545
strategy:
5646
matrix:
57-
java: [ '8', '11', '16' ]
47+
java: [ '8', '11', '17' ]
5848
platform: ['windows-latest', 'ubuntu-latest']
5949
steps:
6050
- uses: actions/checkout@v3
@@ -68,16 +58,6 @@ jobs:
6858
cache: 'gradle'
6959
- name: print Java version
7060
run: java -version
71-
- name: Set JVM options for JDK 16
72-
if: ${{ matrix.java == 16 }}
73-
run: echo org.gradle.jvmargs="--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
74-
--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
75-
--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
76-
--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED \
77-
--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \
78-
--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
79-
--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
80-
--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" >> gradle.properties
8161
- name: Run test
8262
run: ./gradlew check --info
8363

‎build.gradle

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -166,20 +166,4 @@ subprojects {
166166
jvmTarget = JvmTarget.JVM_1_8
167167
}
168168
}
169-
170-
if (JavaVersion.current() >= JavaVersion.VERSION_16) {
171-
test {
172-
jvmArgs = [
173-
"--illegal-access=permit",
174-
"--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
175-
"--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
176-
"--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
177-
"--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED",
178-
"--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
179-
"--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
180-
"--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
181-
"--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"
182-
]
183-
}
184-
}
185169
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /