Skip to content

Commit bb14062

Browse files
authored
Use Java 17 for mobile native CI builds (jMonkeyEngine#2697)
* Use Java 17 for native CI builds * Use JAVA_HOME for iOS JNI headers
1 parent 4bf1a51 commit bb14062

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
uses: actions/setup-java@v5.2.0
110110
with:
111111
distribution: 'temurin'
112-
java-version: '11.0.26+4'
112+
java-version: '17'
113113

114114
- name: Setup the XCode version to 15.1.0
115115
uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
@@ -148,11 +148,11 @@ jobs:
148148
with:
149149
fetch-depth: 1
150150

151-
- name: Setup Java 11
151+
- name: Setup Java 17
152152
uses: actions/setup-java@v5.2.0
153153
with:
154154
distribution: temurin
155-
java-version: '11'
155+
java-version: '17'
156156

157157
- name: Check java version
158158
run: java -version

jme3-ios-native/jme3-ios-native.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,8 @@
324324
DYLIB_INSTALL_NAME_BASE = "@rpath";
325325
HEADER_SEARCH_PATHS = (
326326
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/JavaVM.framework/Headers/,
327-
"/Library/Java/JavaVirtualMachines/jdk-11.0.6.jdk/Contents/Home/include/**",
328-
"/Users/runner/hostedtoolcache/Java_Temurin-Hotspot_jdk/11.0.26-4/arm64/Contents/Home/include/**",
327+
"$(JAVA_HOME)/include",
328+
"$(JAVA_HOME)/include/darwin",
329329
);
330330
INFOPLIST_FILE = src/Info.plist;
331331
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -345,8 +345,8 @@
345345
SUPPORTS_MACCATALYST = YES;
346346
USER_HEADER_SEARCH_PATHS = (
347347
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/JavaVM.framework/Headers/,
348-
"/Library/Java/JavaVirtualMachines/jdk-11.0.6.jdk/Contents/Home/include/**",
349-
"/Users/runner/hostedtoolcache/Java_Temurin-Hotspot_jdk/11.0.26-4/arm64/Contents/Home/include/**",
348+
"$(JAVA_HOME)/include",
349+
"$(JAVA_HOME)/include/darwin",
350350
);
351351
};
352352
name = Debug;
@@ -362,8 +362,8 @@
362362
DYLIB_INSTALL_NAME_BASE = "@rpath";
363363
HEADER_SEARCH_PATHS = (
364364
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/JavaVM.framework/Headers/,
365-
"/Library/Java/JavaVirtualMachines/jdk-11.0.6.jdk/Contents/Home/include/**",
366-
"/Users/runner/hostedtoolcache/Java_Temurin-Hotspot_jdk/11.0.26-4/arm64/Contents/Home/include/**",
365+
"$(JAVA_HOME)/include",
366+
"$(JAVA_HOME)/include/darwin",
367367
);
368368
INFOPLIST_FILE = src/Info.plist;
369369
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -383,8 +383,8 @@
383383
SUPPORTS_MACCATALYST = YES;
384384
USER_HEADER_SEARCH_PATHS = (
385385
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/JavaVM.framework/Headers/,
386-
"/Library/Java/JavaVirtualMachines/jdk-11.0.6.jdk/Contents/Home/include/**",
387-
"/Users/runner/hostedtoolcache/Java_Temurin-Hotspot_jdk/11.0.26-4/arm64/Contents/Home/include/**",
386+
"$(JAVA_HOME)/include",
387+
"$(JAVA_HOME)/include/darwin",
388388
);
389389
};
390390
name = Release;

0 commit comments

Comments
 (0)