Skip to content

Commit 54c437c

Browse files
ktosoktoso
committed
[javakit] Generate some java.io types
1 parent 00df828 commit 54c437c

27 files changed

+863
-103
lines changed

‎Package.swift

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ let package = Package(
7676
targets: ["JavaKitNetwork"]
7777
),
7878

79+
.library(
80+
name: "JavaKitIO",
81+
targets: ["JavaKitIO"]
82+
),
83+
7984
.library(
8085
name: "JavaKitReflection",
8186
targets: ["JavaKitReflection"]
@@ -241,6 +246,15 @@ let package = Package(
241246
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
242247
]
243248
),
249+
.target(
250+
name: "JavaKitIO",
251+
dependencies: ["JavaKit", "JavaKitCollection"],
252+
exclude: ["swift-java.config"],
253+
swiftSettings: [
254+
.swiftLanguageMode(.v5),
255+
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
256+
]
257+
),
244258
.target(
245259
name: "JavaKitReflection",
246260
dependencies: ["JavaKit", "JavaKitCollection"],
@@ -448,6 +462,6 @@ let package = Package(
448462
swiftSettings: [
449463
.swiftLanguageMode(.v5)
450464
]
451-
)
465+
),
452466
]
453467
)

‎Sources/JavaKit/generated/Appendable.swift

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Auto-generated by Java-to-Swift wrapper generator.
2+
import JavaRuntime
3+
4+
@JavaInterface("java.lang.Appendable")
5+
public struct Appendable {
6+
@JavaMethod
7+
public func append(_ arg0: CharSequence?) throws -> Appendable!
8+
9+
@JavaMethod
10+
public func append(_ arg0: CharSequence?, _ arg1: Int32, _ arg2: Int32) throws -> Appendable!
11+
12+
@JavaMethod
13+
public func append(_ arg0: UInt16) throws -> Appendable!
14+
}

‎Sources/JavaKit/generated/CharSequence.swift

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Auto-generated by Java-to-Swift wrapper generator.
2+
import JavaRuntime
3+
4+
@JavaInterface("java.lang.CharSequence")
5+
public struct CharSequence {
6+
@JavaMethod
7+
public func length() -> Int32
8+
9+
@JavaMethod
10+
public func toString() -> String
11+
12+
@JavaMethod
13+
public func charAt(_ arg0: Int32) -> UInt16
14+
15+
@JavaMethod
16+
public func isEmpty() -> Bool
17+
18+
@JavaMethod
19+
public func subSequence(_ arg0: Int32, _ arg1: Int32) -> CharSequence!
20+
}
21+
extension JavaClass<CharSequence> {
22+
@JavaStaticMethod
23+
public func compare(_ arg0: CharSequence?, _ arg1: CharSequence?) -> Int32
24+
}

‎Sources/JavaKit/generated/JavaInteger.swift

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,14 @@ import JavaRuntime
33

44
@JavaClass("java.lang.Integer")
55
open class JavaInteger: JavaNumber {
6+
7+
// FIXME: this is a workaround
8+
public required init(fromJNI value: JNIType, in environment: JNIEnvironment) {
9+
fatalError()
10+
}
11+
612
@JavaMethod
7-
@_nonoverride public convenience init(_ arg0: Int32, environment: JNIEnvironment? = nil)
13+
@ _nonoverride public convenience init(_ arg0: Int32, environment: JNIEnvironment? = nil)
814

915
@JavaMethod
1016
@_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil) throws

‎Sources/JavaKit/generated/JavaLong.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,18 @@ extension JavaClass<JavaLong> {
167167
@JavaStaticMethod
168168
public func rotateRight(_ arg0: Int64, _ arg1: Int32) -> Int64
169169

170+
@JavaStaticMethod
171+
public func parseLong(_ arg0: CharSequence?, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32) throws -> Int64
172+
170173
@JavaStaticMethod
171174
public func parseLong(_ arg0: String, _ arg1: Int32) throws -> Int64
172175

173176
@JavaStaticMethod
174177
public func parseLong(_ arg0: String) throws -> Int64
175178

179+
@JavaStaticMethod
180+
public func parseUnsignedLong(_ arg0: CharSequence?, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32) throws -> Int64
181+
176182
@JavaStaticMethod
177183
public func parseUnsignedLong(_ arg0: String, _ arg1: Int32) throws -> Int64
178184

‎Sources/JavaKit/generated/JavaString.swift

Lines changed: 38 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Auto-generated by Java-to-Swift wrapper generator.
22
import JavaRuntime
33

4-
@JavaClass("java.lang.String")
4+
@JavaClass("java.lang.String", implements: CharSequence.self)
55
open class JavaString: JavaObject {
66
@JavaMethod
77
@_nonoverride public convenience init(_ arg0: [Int8], _ arg1: String, environment: JNIEnvironment? = nil) throws
@@ -52,16 +52,16 @@ open class JavaString: JavaObject {
5252
open func getChars(_ arg0: Int32, _ arg1: Int32, _ arg2: [UInt16], _ arg3: Int32)
5353

5454
@JavaMethod
55-
open func compareTo(_ arg0: JavaObject?) -> Int32
55+
open func compareTo(_ arg0: String) -> Int32
5656

5757
@JavaMethod
58-
open func compareTo(_ arg0: String) -> Int32
58+
open func compareTo(_ arg0: JavaObject?) -> Int32
5959

6060
@JavaMethod
61-
open func indexOf(_ arg0: String, _ arg1: Int32, _ arg2: Int32) -> Int32
61+
open func indexOf(_ arg0: String, _ arg1: Int32) -> Int32
6262

6363
@JavaMethod
64-
open func indexOf(_ arg0: String) -> Int32
64+
open func indexOf(_ arg0: String, _ arg1: Int32, _ arg2: Int32) -> Int32
6565

6666
@JavaMethod
6767
open func indexOf(_ arg0: Int32) -> Int32
@@ -73,7 +73,7 @@ open class JavaString: JavaObject {
7373
open func indexOf(_ arg0: Int32, _ arg1: Int32, _ arg2: Int32) -> Int32
7474

7575
@JavaMethod
76-
open func indexOf(_ arg0: String, _ arg1: Int32) -> Int32
76+
open func indexOf(_ arg0: String) -> Int32
7777

7878
@JavaMethod
7979
open func charAt(_ arg0: Int32) -> UInt16
@@ -90,48 +90,54 @@ open class JavaString: JavaObject {
9090
@JavaMethod
9191
open func offsetByCodePoints(_ arg0: Int32, _ arg1: Int32) -> Int32
9292

93-
@JavaMethod
94-
open func getBytes() -> [Int8]
95-
9693
@JavaMethod
9794
open func getBytes(_ arg0: String) throws -> [Int8]
9895

9996
@JavaMethod
10097
open func getBytes(_ arg0: Int32, _ arg1: Int32, _ arg2: [Int8], _ arg3: Int32)
10198

10299
@JavaMethod
103-
open func regionMatches(_ arg0: Bool, _ arg1: Int32, _ arg2: String, _ arg3: Int32, _ arg4: Int32) -> Bool
100+
open func getBytes() -> [Int8]
101+
102+
@JavaMethod
103+
open func contentEquals(_ arg0: CharSequence?) -> Bool
104104

105105
@JavaMethod
106106
open func regionMatches(_ arg0: Int32, _ arg1: String, _ arg2: Int32, _ arg3: Int32) -> Bool
107107

108+
@JavaMethod
109+
open func regionMatches(_ arg0: Bool, _ arg1: Int32, _ arg2: String, _ arg3: Int32, _ arg4: Int32) -> Bool
110+
108111
@JavaMethod
109112
open func startsWith(_ arg0: String) -> Bool
110113

111114
@JavaMethod
112115
open func startsWith(_ arg0: String, _ arg1: Int32) -> Bool
113116

114117
@JavaMethod
115-
open func lastIndexOf(_ arg0: String) -> Int32
118+
open func lastIndexOf(_ arg0: Int32) -> Int32
116119

117120
@JavaMethod
118-
open func lastIndexOf(_ arg0: Int32, _ arg1: Int32) -> Int32
121+
open func lastIndexOf(_ arg0: String) -> Int32
119122

120123
@JavaMethod
121124
open func lastIndexOf(_ arg0: String, _ arg1: Int32) -> Int32
122125

123126
@JavaMethod
124-
open func lastIndexOf(_ arg0: Int32) -> Int32
127+
open func lastIndexOf(_ arg0: Int32, _ arg1: Int32) -> Int32
125128

126129
@JavaMethod
127-
open func substring(_ arg0: Int32) -> String
130+
open func substring(_ arg0: Int32, _ arg1: Int32) -> String
128131

129132
@JavaMethod
130-
open func substring(_ arg0: Int32, _ arg1: Int32) -> String
133+
open func substring(_ arg0: Int32) -> String
131134

132135
@JavaMethod
133136
open func isEmpty() -> Bool
134137

138+
@JavaMethod
139+
open func replace(_ arg0: CharSequence?, _ arg1: CharSequence?) -> String
140+
135141
@JavaMethod
136142
open func replace(_ arg0: UInt16, _ arg1: UInt16) -> String
137143

@@ -189,9 +195,15 @@ open class JavaString: JavaObject {
189195
@JavaMethod
190196
open func endsWith(_ arg0: String) -> Bool
191197

198+
@JavaMethod
199+
open func subSequence(_ arg0: Int32, _ arg1: Int32) -> CharSequence!
200+
192201
@JavaMethod
193202
open func concat(_ arg0: String) -> String
194203

204+
@JavaMethod
205+
open func contains(_ arg0: CharSequence?) -> Bool
206+
195207
@JavaMethod
196208
open func indent(_ arg0: Int32) -> String
197209

@@ -215,39 +227,42 @@ open class JavaString: JavaObject {
215227
}
216228
}
217229
extension JavaClass<JavaString> {
230+
@JavaStaticMethod
231+
public func valueOf(_ arg0: JavaObject?) -> String
232+
218233
@JavaStaticMethod
219234
public func valueOf(_ arg0: Int64) -> String
220235

221236
@JavaStaticMethod
222-
public func valueOf(_ arg0: [UInt16]) -> String
237+
public func valueOf(_ arg0: Int32) -> String
223238

224239
@JavaStaticMethod
225-
public func valueOf(_ arg0: JavaObject?) -> String
240+
public func valueOf(_ arg0: UInt16) -> String
226241

227242
@JavaStaticMethod
228243
public func valueOf(_ arg0: [UInt16], _ arg1: Int32, _ arg2: Int32) -> String
229244

230245
@JavaStaticMethod
231-
public func valueOf(_ arg0: Float) -> String
246+
public func valueOf(_ arg0: Bool) -> String
232247

233248
@JavaStaticMethod
234249
public func valueOf(_ arg0: Double) -> String
235250

236251
@JavaStaticMethod
237-
public func valueOf(_ arg0: UInt16) -> String
252+
public func valueOf(_ arg0: [UInt16]) -> String
238253

239254
@JavaStaticMethod
240-
public func valueOf(_ arg0: Bool) -> String
255+
public func valueOf(_ arg0: Float) -> String
241256

242257
@JavaStaticMethod
243-
public func valueOf(_ arg0: Int32) -> String
258+
public func join(_ arg0: CharSequence?, _ arg1: [CharSequence?]) -> String
244259

245260
@JavaStaticMethod
246261
public func format(_ arg0: String, _ arg1: [JavaObject?]) -> String
247262

248263
@JavaStaticMethod
249-
public func copyValueOf(_ arg0: [UInt16]) -> String
264+
public func copyValueOf(_ arg0: [UInt16], _ arg1: Int32, _ arg2: Int32) -> String
250265

251266
@JavaStaticMethod
252-
public func copyValueOf(_ arg0: [UInt16], _ arg1: Int32, _ arg2: Int32) -> String
267+
public func copyValueOf(_ arg0: [UInt16]) -> String
253268
}

‎Sources/JavaKit/swift-java.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
"java.lang.String" : "JavaString",
2020
"java.lang.Throwable" : "Throwable",
2121
"java.lang.Void" : "JavaVoid",
22+
"java.lang.CharSequence": "CharSequence",
23+
"java.lang.Appendable": "Appendable",
2224
"java.util.Optional": "JavaOptional",
2325
"java.util.OptionalDouble": "JavaOptionalDouble",
2426
"java.util.OptionalInt": "JavaOptionalInt",

‎Sources/JavaKitCollection/generated/BitSet.swift

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,20 @@ import JavaRuntime
44

55
@JavaClass("java.util.BitSet")
66
open class BitSet: JavaObject {
7-
@JavaMethod
8-
@_nonoverride public convenience init(environment: JNIEnvironment? = nil)
9-
107
@JavaMethod
118
@_nonoverride public convenience init(_ arg0: Int32, environment: JNIEnvironment? = nil)
129

1310
@JavaMethod
14-
open func cardinality() -> Int32
15-
16-
@JavaMethod
17-
open func nextSetBit(_ arg0: Int32) -> Int32
18-
19-
@JavaMethod
20-
open func toLongArray() -> [Int64]
21-
22-
@JavaMethod
23-
open func previousSetBit(_ arg0: Int32) -> Int32
24-
25-
@JavaMethod
26-
open func previousClearBit(_ arg0: Int32) -> Int32
27-
28-
@JavaMethod
29-
open func intersects(_ arg0: BitSet?) -> Bool
11+
@_nonoverride public convenience init(environment: JNIEnvironment? = nil)
3012

3113
@JavaMethod
3214
open func size() -> Int32
3315

3416
@JavaMethod
35-
open func get(_ arg0: Int32, _ arg1: Int32) -> BitSet!
17+
open func get(_ arg0: Int32) -> Bool
3618

3719
@JavaMethod
38-
open func get(_ arg0: Int32) -> Bool
20+
open func get(_ arg0: Int32, _ arg1: Int32) -> BitSet!
3921

4022
@JavaMethod
4123
open override func equals(_ arg0: JavaObject?) -> Bool
@@ -52,29 +34,29 @@ open class BitSet: JavaObject {
5234
@JavaMethod
5335
open override func clone() -> JavaObject!
5436

55-
@JavaMethod
56-
open func clear(_ arg0: Int32)
57-
5837
@JavaMethod
5938
open func clear(_ arg0: Int32, _ arg1: Int32)
6039

6140
@JavaMethod
6241
open func clear()
6342

6443
@JavaMethod
65-
open func isEmpty() -> Bool
44+
open func clear(_ arg0: Int32)
6645

6746
@JavaMethod
68-
open func set(_ arg0: Int32, _ arg1: Int32, _ arg2: Bool)
47+
open func isEmpty() -> Bool
6948

7049
@JavaMethod
71-
open func set(_ arg0: Int32, _ arg1: Int32)
50+
open func set(_ arg0: Int32, _ arg1: Bool)
7251

7352
@JavaMethod
7453
open func set(_ arg0: Int32)
7554

7655
@JavaMethod
77-
open func set(_ arg0: Int32, _ arg1: Bool)
56+
open func set(_ arg0: Int32, _ arg1: Int32)
57+
58+
@JavaMethod
59+
open func set(_ arg0: Int32, _ arg1: Int32, _ arg2: Bool)
7860

7961
@JavaMethod
8062
open func flip(_ arg0: Int32, _ arg1: Int32)
@@ -99,6 +81,24 @@ open class BitSet: JavaObject {
9981

10082
@JavaMethod
10183
open func andNot(_ arg0: BitSet?)
84+
85+
@JavaMethod
86+
open func cardinality() -> Int32
87+
88+
@JavaMethod
89+
open func nextSetBit(_ arg0: Int32) -> Int32
90+
91+
@JavaMethod
92+
open func toLongArray() -> [Int64]
93+
94+
@JavaMethod
95+
open func previousSetBit(_ arg0: Int32) -> Int32
96+
97+
@JavaMethod
98+
open func previousClearBit(_ arg0: Int32) -> Int32
99+
100+
@JavaMethod
101+
open func intersects(_ arg0: BitSet?) -> Bool
102102
}
103103
extension JavaClass<BitSet> {
104104
@JavaStaticMethod

0 commit comments

Comments
 (0)