Skip to content

Commit

Permalink
Support Java 20, remove Java 7 support (#672)
Browse files Browse the repository at this point in the history
* adding java 20 to build matrix

* change to zulu which has JDK20 available

* building class files for version 8 is the oldest now supported by JDJ > 17

* upgrade setup.py to java 8 too

* Exclude Java 20 for windows

* Switch back to temurin and skip windows-latest x86 java 20

---------

Co-authored-by: Mirko Galimberti <[email protected]>
  • Loading branch information
cmacdonald and misl6 authored Sep 23, 2023
1 parent fd748e5 commit 9ef610c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/push.yml
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
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
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

0 comments on commit 9ef610c

Please sign in to comment.