Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support Java 20, remove Java 7 support #672

Merged
merged 6 commits into from
Sep 23, 2023
Merged

Support Java 20, remove Java 7 support #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
43521b7
adding java 20 to build matrix
cmacdonald Sep 19, 2023
1ccb9ef
change to zulu which has JDK20 available
cmacdonald Sep 19, 2023
aca2d69
building class files for version 8 is the oldest now supported by JDJ…
cmacdonald Sep 19, 2023
2068ddb
upgrade setup.py to java 8 too
cmacdonald Sep 19, 2023
cdd361b
Exclude Java 20 for windows
cmacdonald Sep 19, 2023
d77371a
Switch back to temurin and skip windows-latest x86 java 20
misl6 Sep 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
java:
- '8'
- '11'
- '17'
- '20'
os:
- 'ubuntu-latest'
- 'windows-latest'
Expand All @@ -45,6 +45,9 @@ jobs:
- os: windows-latest
architecture: 'x86'
python: 'pypy-3.9'
- os: windows-latest
architecture: 'x86'
java: '20'

runs-on: ${{ matrix.os }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<project>
<property name="ant.build.javac.source" value="1.7" />
<property name="ant.build.javac.target" value="1.7" />
<property name="ant.build.javac.source" value="8" />
<property name="ant.build.javac.target" value="8" />

<target name="clean">
<delete dir="build/classes"/>
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def getenv(key):
def compile_native_invocation_handler(java):
'''Find javac and compile NativeInvocationHandler.java.'''
javac = java.get_javac()
source_level = '1.7'
source_level = '8'
try:
subprocess.check_call([
javac, '-target', source_level, '-source', source_level,
Expand Down