Skip to content

set Java cross compile target to Java 8 #53

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
jimexist merged 6 commits into from
May 17, 2022
Merged

set Java cross compile target to Java 8 #53

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
fef70e6
java cross compile
May 17, 2022
3b58cd2
loosen up distribution req
May 17, 2022
b9031df
use 17 in ci
May 17, 2022
7048b41
ditto
May 17, 2022
af241e6
add back distribution: "temurin"
May 17, 2022
989f7cc
downgrade to java 8
May 17, 2022
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
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
toolchain: stable
components: rustfmt, clippy

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: "11"
java-version: "17"
distribution: "temurin"

- name: Validate Gradle wrapper
Expand Down Expand Up @@ -66,10 +66,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: 11
java-version: 17
distribution: "temurin"

- name: Validate Gradle wrapper
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
toolchain: stable
components: rustfmt, clippy

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: "11"
java-version: "17"
distribution: "temurin"

- name: Validate Gradle wrapper
Expand Down Expand Up @@ -66,10 +66,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: 11
java-version: 17
distribution: "temurin"

- name: Validate Gradle wrapper
Expand Down
7 changes: 6 additions & 1 deletion buildSrc/src/main/groovy/datafusion.java-conventions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ repositories {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
languageVersion = JavaLanguageVersion.of(15)
}
}

tasks.withType(JavaCompile) {
// down-compile to minimal version
options.release.set(8)
}
13 changes: 9 additions & 4 deletions datafusion-java/src/main/java/org/apache/arrow/datafusion/JNILoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -23,8 +22,6 @@ private enum OsName {
Linux
}

private static final Map<OsName, String> OS_NAME_STRING_MAP =
Map.of(OsName.Linux, "so", OsName.Osx, "dylib", OsName.Windows, "dll");
private static final String libraryName = "datafusion_jni";

private static final String ERROR_MSG =
Expand All @@ -49,7 +46,15 @@ private static String getResourceName() {
}

private static String getExtension() {
return OS_NAME_STRING_MAP.get(getOsName());
OsName osName = getOsName();
if (osName == OsName.Linux) {
return "so";
} else if (osName == OsName.Osx) {
return "dylib";
} else if (osName == OsName.Windows) {
return "dll";
}
throw new IllegalStateException("Cannot determin extension for " + osName);
}

static synchronized void load() {
Expand Down