Skip to content

Commit 2533d08

Browse files
amanmaurya92amanmaurya92
committed
Regenerate wrappers, update config docs, and fix setup-java fallback
1 parent fb2d5cd commit 2533d08

12 files changed

Lines changed: 138 additions & 119 deletions

File tree

‎.github/actions/prepare_env/action.yml‎

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,55 @@ runs:
77
- name: Check Swift version
88
shell: bash
99
run: swift -version
10-
- name: Set up JDK ${{ matrix.jdk_version }}
10+
- name: Try to set up JDKs (primary: actions/setup-java)
11+
id: setup_java
1112
uses: actions/setup-java@v4
1213
with:
1314
distribution: ${{ matrix.jdk_vendor }}
1415
java-version: |
1516
25
1617
17
1718
cache: 'gradle'
19+
continue-on-error: true
20+
21+
- name: Ensure JAVA_HOME_17 / JAVA_HOME_25 (fallback if setup-java failed)
22+
shell: bash
23+
run: |
24+
set -euo pipefail
25+
26+
# helper: set a JAVA_HOME env var for the job
27+
set_java_home() {
28+
name="$1" # e.g. JAVA_HOME_25
29+
path="$2"
30+
echo "$name=$path" >> $GITHUB_ENV
31+
echo "export $name=$path" >> "$GITHUB_ENV"
32+
}
33+
34+
# check if setup-java set any of the expected env vars
35+
if [[ -n "${JAVA_HOME_25:-}" || -n "${JAVA_HOME_17:-}" || -n "${JAVA_HOME_25_X64:-}" || -n "${JAVA_HOME_17_X64:-}" ]]; then
36+
echo "setup-java succeeded: JAVA_HOME present."
37+
exit 0
38+
fi
39+
40+
echo "setup-java did not set JAVA_HOME variables — installing fallback JDK (openjdk-17) and exporting JAVA_HOME_17 and JAVA_HOME_25 as fallback."
41+
42+
apt-get update -qq
43+
apt-get install -y openjdk-17-jdk-headless
44+
45+
# find java home for installed JDK 17
46+
javac_path="$(command -v javac || true)"
47+
if [[ -z "$javac_path" ]]; then
48+
echo "::error::Fallback JDK installation failed: javac missing."
49+
exit 1
50+
fi
51+
jhome="$(dirname "$(dirname "$(readlink -f "$javac_path")")")"
52+
53+
# Set both JAVA_HOME_17 and JAVA_HOME_25 to the fallback JDK so downstream steps have a value.
54+
echo "Using fallback JDK at $jhome"
55+
echo "JAVA_HOME_17=$jhome" >> "$GITHUB_ENV"
56+
echo "JAVA_HOME_25=$jhome" >> "$GITHUB_ENV"
57+
echo "JAVA_HOME=$jhome" >> "$GITHUB_ENV"
58+
1859
- name: Set JAVA_HOME_{N}
1960
shell: bash
2061
run: |

‎Sources/JavaStdlib/JavaIO/generated/BufferedInputStream.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ open class BufferedInputStream: InputStream {
1414
///
1515
/// ### Java method signature
1616
/// ```java
17-
/// public synchronized int java.io.BufferedInputStream.available() throws java.io.IOException
17+
/// public int java.io.BufferedInputStream.available() throws java.io.IOException
1818
/// ```
1919
@JavaMethod
2020
open override func available() throws -> Int32
@@ -32,7 +32,7 @@ open class BufferedInputStream: InputStream {
3232
///
3333
/// ### Java method signature
3434
/// ```java
35-
/// public synchronized void java.io.BufferedInputStream.mark(int)
35+
/// public void java.io.BufferedInputStream.mark(int)
3636
/// ```
3737
@JavaMethod
3838
open override func mark(_ arg0: Int32)
@@ -50,7 +50,7 @@ open class BufferedInputStream: InputStream {
5050
///
5151
/// ### Java method signature
5252
/// ```java
53-
/// public synchronized int java.io.BufferedInputStream.read() throws java.io.IOException
53+
/// public int java.io.BufferedInputStream.read() throws java.io.IOException
5454
/// ```
5555
@JavaMethod
5656
open override func read() throws -> Int32
@@ -59,7 +59,7 @@ open class BufferedInputStream: InputStream {
5959
///
6060
/// ### Java method signature
6161
/// ```java
62-
/// public synchronized int java.io.BufferedInputStream.read(byte[],int,int) throws java.io.IOException
62+
/// public int java.io.BufferedInputStream.read(byte[],int,int) throws java.io.IOException
6363
/// ```
6464
@JavaMethod
6565
open override func read(_ arg0: [Int8], _ arg1: Int32, _ arg2: Int32) throws -> Int32
@@ -68,7 +68,7 @@ open class BufferedInputStream: InputStream {
6868
///
6969
/// ### Java method signature
7070
/// ```java
71-
/// public synchronized void java.io.BufferedInputStream.reset() throws java.io.IOException
71+
/// public void java.io.BufferedInputStream.reset() throws java.io.IOException
7272
/// ```
7373
@JavaMethod
7474
open override func reset() throws
@@ -77,7 +77,7 @@ open class BufferedInputStream: InputStream {
7777
///
7878
/// ### Java method signature
7979
/// ```java
80-
/// public synchronized long java.io.BufferedInputStream.skip(long) throws java.io.IOException
80+
/// public long java.io.BufferedInputStream.skip(long) throws java.io.IOException
8181
/// ```
8282
@JavaMethod
8383
open override func skip(_ arg0: Int64) throws -> Int64
@@ -86,7 +86,7 @@ open class BufferedInputStream: InputStream {
8686
///
8787
/// ### Java method signature
8888
/// ```java
89-
/// public synchronized long java.io.BufferedInputStream.transferTo(java.io.OutputStream) throws java.io.IOException
89+
/// public long java.io.BufferedInputStream.transferTo(java.io.OutputStream) throws java.io.IOException
9090
/// ```
9191
@JavaMethod
9292
open override func transferTo(_ arg0: OutputStream?) throws -> Int64

‎Sources/JavaStdlib/JavaIO/generated/Reader.swift‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,6 @@ extension JavaClass<Reader> {
1111
/// ```
1212
@JavaStaticMethod
1313
public func nullReader() -> Reader!
14-
15-
/// Java method `of`.
16-
///
17-
/// ### Java method signature
18-
/// ```java
19-
/// public static java.io.Reader java.io.Reader.of(java.lang.CharSequence)
20-
/// ```
21-
@JavaStaticMethod
22-
public func of(_ arg0: CharSequence?) -> Reader!
2314
}
2415
@JavaClass("java.io.Reader", implements: Readable.self, Closeable.self)
2516
open class Reader: JavaObject {
@@ -77,24 +68,6 @@ open class Reader: JavaObject {
7768
@JavaMethod
7869
open func read(_ arg0: [UInt16]) throws -> Int32
7970

80-
/// Java method `readAllAsString`.
81-
///
82-
/// ### Java method signature
83-
/// ```java
84-
/// public java.lang.String java.io.Reader.readAllAsString() throws java.io.IOException
85-
/// ```
86-
@JavaMethod
87-
open func readAllAsString() throws -> String
88-
89-
/// Java method `readAllLines`.
90-
///
91-
/// ### Java method signature
92-
/// ```java
93-
/// public java.util.List<java.lang.String> java.io.Reader.readAllLines() throws java.io.IOException
94-
/// ```
95-
@JavaMethod
96-
open func readAllLines() throws -> List<JavaString>!
97-
9871
/// Java method `ready`.
9972
///
10073
/// ### Java method signature

‎Sources/JavaStdlib/JavaUtil/generated/LinkedList.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
// Auto-generated by Java-to-Swift wrapper generator.
2+
23
import SwiftJava
4+
5+
36
import SwiftJavaJNICore
47

58
@JavaClass("java.util.LinkedList")

‎Sources/SwiftJava/generated/CharSequence.swift‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,6 @@ public struct CharSequence {
2222
@JavaMethod
2323
public func charAt(_ arg0: Int32) -> UInt16
2424

25-
/// Java method `getChars`.
26-
///
27-
/// ### Java method signature
28-
/// ```java
29-
/// public default void java.lang.CharSequence.getChars(int,int,char[],int)
30-
/// ```
31-
@JavaMethod
32-
public func getChars(_ arg0: Int32, _ arg1: Int32, _ arg2: [UInt16], _ arg3: Int32)
33-
3425
/// Java method `isEmpty`.
3526
///
3627
/// ### Java method signature

‎Sources/SwiftJava/generated/JavaCharacter.swift‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1291,9 +1291,6 @@ extension JavaClass<JavaCharacter.UnicodeBlock> {
12911291
@JavaStaticField(isFinal: true)
12921292
public var CJK_UNIFIED_IDEOGRAPHS_EXTENSION_H: JavaCharacter.UnicodeBlock!
12931293

1294-
@JavaStaticField(isFinal: true)
1295-
public var CJK_UNIFIED_IDEOGRAPHS_EXTENSION_I: JavaCharacter.UnicodeBlock!
1296-
12971294
@JavaStaticField(isFinal: true)
12981295
public var COMBINING_DIACRITICAL_MARKS: JavaCharacter.UnicodeBlock!
12991296

@@ -1390,9 +1387,6 @@ extension JavaClass<JavaCharacter.UnicodeBlock> {
13901387
@JavaStaticField(isFinal: true)
13911388
public var EGYPTIAN_HIEROGLYPHS: JavaCharacter.UnicodeBlock!
13921389

1393-
@JavaStaticField(isFinal: true)
1394-
public var EGYPTIAN_HIEROGLYPHS_EXTENDED_A: JavaCharacter.UnicodeBlock!
1395-
13961390
@JavaStaticField(isFinal: true)
13971391
public var EGYPTIAN_HIEROGLYPH_FORMAT_CONTROLS: JavaCharacter.UnicodeBlock!
13981392

@@ -1432,9 +1426,6 @@ extension JavaClass<JavaCharacter.UnicodeBlock> {
14321426
@JavaStaticField(isFinal: true)
14331427
public var ETHIOPIC_SUPPLEMENT: JavaCharacter.UnicodeBlock!
14341428

1435-
@JavaStaticField(isFinal: true)
1436-
public var GARAY: JavaCharacter.UnicodeBlock!
1437-
14381429
@JavaStaticField(isFinal: true)
14391430
public var GENERAL_PUNCTUATION: JavaCharacter.UnicodeBlock!
14401431

@@ -1480,9 +1471,6 @@ extension JavaClass<JavaCharacter.UnicodeBlock> {
14801471
@JavaStaticField(isFinal: true)
14811472
public var GURMUKHI: JavaCharacter.UnicodeBlock!
14821473

1483-
@JavaStaticField(isFinal: true)
1484-
public var GURUNG_KHEMA: JavaCharacter.UnicodeBlock!
1485-
14861474
@JavaStaticField(isFinal: true)
14871475
public var HALFWIDTH_AND_FULLWIDTH_FORMS: JavaCharacter.UnicodeBlock!
14881476

@@ -1600,9 +1588,6 @@ extension JavaClass<JavaCharacter.UnicodeBlock> {
16001588
@JavaStaticField(isFinal: true)
16011589
public var KHUDAWADI: JavaCharacter.UnicodeBlock!
16021590

1603-
@JavaStaticField(isFinal: true)
1604-
public var KIRAT_RAI: JavaCharacter.UnicodeBlock!
1605-
16061591
@JavaStaticField(isFinal: true)
16071592
public var LAO: JavaCharacter.UnicodeBlock!
16081593

@@ -1768,9 +1753,6 @@ extension JavaClass<JavaCharacter.UnicodeBlock> {
17681753
@JavaStaticField(isFinal: true)
17691754
public var MYANMAR_EXTENDED_B: JavaCharacter.UnicodeBlock!
17701755

1771-
@JavaStaticField(isFinal: true)
1772-
public var MYANMAR_EXTENDED_C: JavaCharacter.UnicodeBlock!
1773-
17741756
@JavaStaticField(isFinal: true)
17751757
public var NABATAEAN: JavaCharacter.UnicodeBlock!
17761758

@@ -1831,9 +1813,6 @@ extension JavaClass<JavaCharacter.UnicodeBlock> {
18311813
@JavaStaticField(isFinal: true)
18321814
public var OL_CHIKI: JavaCharacter.UnicodeBlock!
18331815

1834-
@JavaStaticField(isFinal: true)
1835-
public var OL_ONAL: JavaCharacter.UnicodeBlock!
1836-
18371816
@JavaStaticField(isFinal: true)
18381817
public var OPTICAL_CHARACTER_RECOGNITION: JavaCharacter.UnicodeBlock!
18391818

@@ -1945,9 +1924,6 @@ extension JavaClass<JavaCharacter.UnicodeBlock> {
19451924
@JavaStaticField(isFinal: true)
19461925
public var SUNDANESE_SUPPLEMENT: JavaCharacter.UnicodeBlock!
19471926

1948-
@JavaStaticField(isFinal: true)
1949-
public var SUNUWAR: JavaCharacter.UnicodeBlock!
1950-
19511927
@JavaStaticField(isFinal: true)
19521928
public var SUPERSCRIPTS_AND_SUBSCRIPTS: JavaCharacter.UnicodeBlock!
19531929

@@ -1991,9 +1967,6 @@ extension JavaClass<JavaCharacter.UnicodeBlock> {
19911967
@JavaStaticField(isFinal: true)
19921968
public var SYMBOLS_FOR_LEGACY_COMPUTING: JavaCharacter.UnicodeBlock!
19931969

1994-
@JavaStaticField(isFinal: true)
1995-
public var SYMBOLS_FOR_LEGACY_COMPUTING_SUPPLEMENT: JavaCharacter.UnicodeBlock!
1996-
19971970
@JavaStaticField(isFinal: true)
19981971
public var SYRIAC: JavaCharacter.UnicodeBlock!
19991972

@@ -2060,18 +2033,12 @@ extension JavaClass<JavaCharacter.UnicodeBlock> {
20602033
@JavaStaticField(isFinal: true)
20612034
public var TIRHUTA: JavaCharacter.UnicodeBlock!
20622035

2063-
@JavaStaticField(isFinal: true)
2064-
public var TODHRI: JavaCharacter.UnicodeBlock!
2065-
20662036
@JavaStaticField(isFinal: true)
20672037
public var TOTO: JavaCharacter.UnicodeBlock!
20682038

20692039
@JavaStaticField(isFinal: true)
20702040
public var TRANSPORT_AND_MAP_SYMBOLS: JavaCharacter.UnicodeBlock!
20712041

2072-
@JavaStaticField(isFinal: true)
2073-
public var TULU_TIGALARI: JavaCharacter.UnicodeBlock!
2074-
20752042
@JavaStaticField(isFinal: true)
20762043
public var UGARITIC: JavaCharacter.UnicodeBlock!
20772044

0 commit comments

Comments
 (0)