Commit ec67bcd
committed
Fix CI: Resolve JDK versions for Android and runtime detection for iOS
- Updated `.github/workflows/maven.yml`:
- Android job now installs JDK 17, then JDK 11.
- JDK 17 is saved to `JAVA17_HOME` and explicitly used for Android SDK tools (`sdkmanager`, `avdmanager`) and the native build step to satisfy requirements.
- JDK 11 remains the default for `mvn install` and other build tasks.
- Updated `scripts/ci/run-ios-simulator.sh`:
- Added auto-detection logic to find the latest available iOS runtime if the specific requested version is missing, resolving failures on `macos-15` runners.
- Updated `scripts/ci/build-thirdparty-app.sh`:
- Removed `hellocodenameone` fallback logic; strictly targets `APP_DIR`.
- Removed implicit `LATEST` version overriding to fix Maven validation errors.1 parent 4c136e0 commit ec67bcd
2 files changed
+21
-8
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
35 | 39 | | |
36 | 40 | | |
37 | 41 | | |
| |||
45 | 49 | | |
46 | 50 | | |
47 | 51 | | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
| |||
64 | 64 | | |
65 | 65 | | |
66 | 66 | | |
| 67 | + | |
67 | 68 | | |
68 | 69 | | |
69 | 70 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
| 33 | + | |
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| 41 | + | |
41 | 42 | | |
42 | | - | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
43 | 50 | | |
44 | | - | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
45 | 54 | | |
46 | 55 | | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
47 | 59 | | |
48 | 60 | | |
49 | 61 | | |
| |||
0 commit comments