Skip to content

Add Java 14 support #1509

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

Merged
merged 3 commits into from
Apr 8, 2020
Merged

Add Java 14 support #1509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e28cbeb
Specify a JNA library path:
dmitry-timofeev Apr 7, 2020
6f2dc8e
Use a private lookup object:
dmitry-timofeev Apr 7, 2020
db35160
Enable Java 14 builds on Travis CI
dmitry-timofeev Apr 8, 2020
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
16 changes: 8 additions & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ env:

jobs:
include:
- name: "Linux / JDK 13 / CHECK_RUST=true"
- name: "Linux / JDK 14 / CHECK_RUST=true"
os: linux
jdk: openjdk13
jdk: openjdk14
env: CHECK_RUST=true
- name: "Linux / JDK 13 / CHECK_RUST=false"
- name: "Linux / JDK 14 / CHECK_RUST=false"
os: linux
jdk: openjdk13
jdk: openjdk14
env: CHECK_RUST=false
- name: "OSX / JDK 13 / CHECK_RUST=false"
- name: "OSX / JDK 14 / CHECK_RUST=false"
os: osx
# See: https://docs.travis-ci.com/user/reference/osx#macos-version
osx_image: xcode11.3
Expand Down Expand Up @@ -81,15 +81,15 @@ jobs:
jdk: openjdk-ea
env: CHECK_RUST=false
# Nightly Rust on Linux.
- name: "Linux / JDK 13 / CHECK_RUST=false / Nightly Rust"
- name: "Linux / JDK 14 / CHECK_RUST=false / Nightly Rust"
if: type=cron
os: linux
jdk: openjdk13
jdk: openjdk14
env:
- CHECK_RUST=false
- RUST_COMPILER_VERSION=nightly
# Nightly Rust on macOS.
- name: "OSX / JDK 13 / CHECK_RUST=false / Nightly Rust"
- name: "OSX / JDK 14 / CHECK_RUST=false / Nightly Rust"
if: type=cron
os: osx
osx_image: xcode11.3
Expand Down
4 changes: 4 additions & 0 deletions exonum-java-binding/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

### Added

- Java 14 support.

## [0.10.0] - 2020-04-03

### Overview
Expand Down
2 changes: 2 additions & 0 deletions exonum-java-binding/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,11 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<!-- Also specify the JNA library path for Mac / Java 14+, where sodium is installed -->
<argLine>
${jacoco.it.args}
${java.vm.assertionFlag}
-Djna.library.path=/usr/local/lib
</argLine>
<includes>
<include>**/*Test.java</include>
Expand Down
3 changes: 1 addition & 2 deletions ...n/src/main/java/com/exonum/binding/common/serialization/ProtobufReflectiveSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ class ProtobufReflectiveSerializer<MessageT extends MessageLite> implements Seri
// classloaders if several instances of the same artifact are loaded; or PF4J and TestKit
// classloaders), the lookup object must use the message class as its lookup class to satisfy
// linkage constraints.
MethodHandles.Lookup lookup = MethodHandles.publicLookup()
.in(messageType);
MethodHandles.Lookup lookup = MethodHandles.lookup().in(messageType);
try {
messageParseFrom = lookup
.findStatic(messageType, "parseFrom", MethodType.methodType(messageType, byte[].class));
Expand Down