Skip to content

Commit d3da0a5

Browse files
colemancdacolemancda
authored
Merge pull request #22 from PureSwift/feature/swift-java-update
Update `swift-java`
2 parents 8f7b971 + 45bdde1 commit d3da0a5

1,892 files changed

Lines changed: 3995 additions & 4008 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,6 @@ Android.xcodeproj
7474

7575
# Java
7676
*.jar
77+
78+
# VS Code
79+
.vscode

‎Demo/app/src/main/swift/HelloSubclass.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Auto-generated by Java-to-Swift wrapper generator.
2-
import JavaKit
3-
import JavaRuntime
2+
import SwiftJava
3+
import CSwiftJavaJNI
44

55
@JavaClass("com.example.swift.HelloSubclass")
66
open class HelloSubclass: HelloSwift {

‎Demo/app/src/main/swift/HelloSwift.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Auto-generated by Java-to-Swift wrapper generator.
2-
import JavaKit
3-
import JavaKitFunction
4-
import JavaRuntime
2+
import SwiftJava
3+
import JavaUtilFunction
4+
import CSwiftJavaJNI
55

66
@JavaClass("com.example.swift.HelloSwift")
77
open class HelloSwift: JavaObject {

‎Demo/app/src/main/swift/JavaKitExample.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import JavaKit
16-
import JavaKitFunction
15+
import SwiftJava
16+
import JavaUtilFunction
1717
import AndroidUtil
1818
import AndroidLogging
1919

‎Demo/app/src/main/swift/JavaRetainedValue.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// Created by Alsey Coleman Miller on 6/9/25.
66
//
77

8-
import JavaKit
9-
import JavaRuntime
8+
import SwiftJava
9+
import CSwiftJavaJNI
1010

1111
/// Java class that retains a Swift value for the duration of its lifetime.
1212
@JavaClass("com.pureswift.swiftandroid.SwiftObject")

‎Demo/app/src/main/swift/Runnable.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// Created by Alsey Coleman Miller on 6/9/25.
66
//
77

8-
import JavaKit
9-
import JavaRuntime
8+
import SwiftJava
9+
import CSwiftJavaJNI
1010
import AndroidKit
1111
import JavaLang
1212

‎Demo/app/src/main/swift/ThreadSafeHelperClass.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Auto-generated by Java-to-Swift wrapper generator.
2-
import JavaKit
3-
import JavaRuntime
2+
import SwiftJava
3+
import CSwiftJavaJNI
44

55
@JavaClass("com.example.swift.ThreadSafeHelperClass")
66
open class ThreadSafeHelperClass: JavaObject {

‎Demo/app/src/main/swift/UnitEmitter.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Created by Alsey Coleman Miller on 7/13/25.
66
//
77

8-
import JavaKit
8+
import SwiftJava
99

1010
/// Bridge from Swift to Kotlin Coroutines
1111
@JavaClass("com.pureswift.swiftandroid.UnitEmitter")

‎Package.swift‎

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ var package = Package(
7979
],
8080
dependencies: [
8181
.package(
82-
url: "https://github.com/PureSwift/swift-java.git",
83-
branch: "feature/android"
82+
url: "https://github.com/swiftlang/swift-java.git",
83+
branch: "main"
8484
),
8585
.package(
8686
url: "https://github.com/PureSwift/JavaLang.git",
@@ -112,27 +112,23 @@ var package = Package(
112112
name: "AndroidKit",
113113
dependencies: [
114114
.product(
115-
name: "JavaKit",
116-
package: "swift-java"
117-
),
118-
.product(
119-
name: "JavaKitCollection",
115+
name: "SwiftJava",
120116
package: "swift-java"
121117
),
122118
.product(
123-
name: "JavaKitIO",
119+
name: "JavaIO",
124120
package: "swift-java"
125121
),
126122
.product(
127-
name: "JavaKitNetwork",
123+
name: "JavaNet",
128124
package: "swift-java"
129125
),
130126
.product(
131-
name: "JavaKitFunction",
127+
name: "JavaUtilFunction",
132128
package: "swift-java"
133129
),
134130
.product(
135-
name: "JavaKitReflection",
131+
name: "JavaLangReflect",
136132
package: "swift-java"
137133
),
138134
"AndroidNDK",
@@ -161,47 +157,43 @@ var package = Package(
161157
name: "AndroidJava",
162158
dependencies: [
163159
.product(
164-
name: "JavaKit",
160+
name: "SwiftJava",
165161
package: "swift-java"
166162
),
167163
.product(
168-
name: "JavaKitCollection",
169-
package: "swift-java"
170-
),
171-
.product(
172-
name: "JavaKitIO",
164+
name: "JavaIO",
173165
package: "swift-java"
174166
),
175167
.product(
176-
name: "JavaKitNetwork",
168+
name: "JavaNet",
177169
package: "swift-java"
178170
),
179171
.product(
180-
name: "JavaKitFunction",
172+
name: "JavaUtilFunction",
181173
package: "swift-java"
182174
),
183175
.product(
184-
name: "JavaKitReflection",
176+
name: "JavaLangReflect",
185177
package: "swift-java"
186178
),
187179
.product(
188-
name: "JavaKitJar",
180+
name: "JavaUtilJar",
189181
package: "swift-java"
190182
),
191183
.product(
192184
name: "JavaLang",
193185
package: "JavaLang"
194186
),
195187
.product(
196-
name: "JavaUtil",
188+
name: "JavaLangUtil",
197189
package: "JavaLang"
198190
),
199191
.product(
200-
name: "JavaIO",
192+
name: "JavaLangIO",
201193
package: "JavaLang"
202194
),
203195
.product(
204-
name: "JavaNet",
196+
name: "JavaLangNet",
205197
package: "JavaLang"
206198
),
207199
.product(

‎Sources/AndroidAnimation/AndroidAnimation.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
// Created by Alsey Coleman Miller on 6/7/25.
66
//
77

8-
import JavaKit
8+
import SwiftJava

0 commit comments

Comments
 (0)