Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,6 @@ Android.xcodeproj

# Java
*.jar

# VS Code
.vscode
4 changes: 2 additions & 2 deletions Demo/app/src/main/swift/HelloSubclass.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

@JavaClass("com.example.swift.HelloSubclass")
open class HelloSubclass: HelloSwift {
Expand Down
6 changes: 3 additions & 3 deletions Demo/app/src/main/swift/HelloSwift.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaKitFunction
import JavaRuntime
import SwiftJava
import JavaUtilFunction
import CSwiftJavaJNI

@JavaClass("com.example.swift.HelloSwift")
open class HelloSwift: JavaObject {
Expand Down
4 changes: 2 additions & 2 deletions Demo/app/src/main/swift/JavaKitExample.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//

import JavaKit
import JavaKitFunction
import SwiftJava
import JavaUtilFunction
import AndroidUtil
import AndroidLogging

Expand Down
4 changes: 2 additions & 2 deletions Demo/app/src/main/swift/JavaRetainedValue.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
// Created by Alsey Coleman Miller on 6/9/25.
//

import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

/// Java class that retains a Swift value for the duration of its lifetime.
@JavaClass("com.pureswift.swiftandroid.SwiftObject")
Expand Down
4 changes: 2 additions & 2 deletions Demo/app/src/main/swift/Runnable.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
// Created by Alsey Coleman Miller on 6/9/25.
//

import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI
import AndroidKit
import JavaLang

Expand Down
4 changes: 2 additions & 2 deletions Demo/app/src/main/swift/ThreadSafeHelperClass.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

@JavaClass("com.example.swift.ThreadSafeHelperClass")
open class ThreadSafeHelperClass: JavaObject {
Expand Down
2 changes: 1 addition & 1 deletion Demo/app/src/main/swift/UnitEmitter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Created by Alsey Coleman Miller on 7/13/25.
//

import JavaKit
import SwiftJava

/// Bridge from Swift to Kotlin Coroutines
@JavaClass("com.pureswift.swiftandroid.UnitEmitter")
Expand Down
40 changes: 16 additions & 24 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ var package = Package(
],
dependencies: [
.package(
url: "https://github.com/PureSwift/swift-java.git",
branch: "feature/android"
url: "https://github.com/swiftlang/swift-java.git",
branch: "main"
),
.package(
url: "https://github.com/PureSwift/JavaLang.git",
Expand Down Expand Up @@ -112,27 +112,23 @@ var package = Package(
name: "AndroidKit",
dependencies: [
.product(
name: "JavaKit",
package: "swift-java"
),
.product(
name: "JavaKitCollection",
name: "SwiftJava",
package: "swift-java"
),
.product(
name: "JavaKitIO",
name: "JavaIO",
package: "swift-java"
),
.product(
name: "JavaKitNetwork",
name: "JavaNet",
package: "swift-java"
),
.product(
name: "JavaKitFunction",
name: "JavaUtilFunction",
package: "swift-java"
),
.product(
name: "JavaKitReflection",
name: "JavaLangReflect",
package: "swift-java"
),
"AndroidNDK",
Expand Down Expand Up @@ -161,47 +157,43 @@ var package = Package(
name: "AndroidJava",
dependencies: [
.product(
name: "JavaKit",
name: "SwiftJava",
package: "swift-java"
),
.product(
name: "JavaKitCollection",
package: "swift-java"
),
.product(
name: "JavaKitIO",
name: "JavaIO",
package: "swift-java"
),
.product(
name: "JavaKitNetwork",
name: "JavaNet",
package: "swift-java"
),
.product(
name: "JavaKitFunction",
name: "JavaUtilFunction",
package: "swift-java"
),
.product(
name: "JavaKitReflection",
name: "JavaLangReflect",
package: "swift-java"
),
.product(
name: "JavaKitJar",
name: "JavaUtilJar",
package: "swift-java"
),
.product(
name: "JavaLang",
package: "JavaLang"
),
.product(
name: "JavaUtil",
name: "JavaLangUtil",
package: "JavaLang"
),
.product(
name: "JavaIO",
name: "JavaLangIO",
package: "JavaLang"
),
.product(
name: "JavaNet",
name: "JavaLangNet",
package: "JavaLang"
),
.product(
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidAnimation/AndroidAnimation.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
// Created by Alsey Coleman Miller on 6/7/25.
//

import JavaKit
import SwiftJava
4 changes: 2 additions & 2 deletions Sources/AndroidAnimation/Animator+AnimatorListener.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

extension Animator {
@JavaInterface("android.animation.Animator$AnimatorListener")
Expand Down
4 changes: 2 additions & 2 deletions Sources/AndroidAnimation/Animator+AnimatorPauseListener.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

extension Animator {
@JavaInterface("android.animation.Animator$AnimatorPauseListener")
Expand Down
7 changes: 4 additions & 3 deletions Sources/AndroidAnimation/Animator.swift
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaLang
import JavaKit
import JavaKitCollection
import JavaRuntime
import JavaUtil
import JavaLangUtil
import SwiftJava
import CSwiftJavaJNI

@JavaClass("android.animation.Animator", implements: Cloneable.self)
open class Animator: JavaObject {
Expand Down
4 changes: 2 additions & 2 deletions Sources/AndroidAnimation/AnimatorInflater.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

@JavaClass("android.animation.AnimatorInflater")
open class AnimatorInflater: JavaObject {
Expand Down
4 changes: 2 additions & 2 deletions Sources/AndroidAnimation/AnimatorListenerAdapter.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

@JavaClass("android.animation.AnimatorListenerAdapter", implements: Animator.AnimatorListener.self, Animator.AnimatorPauseListener.self)
open class AnimatorListenerAdapter: JavaObject {
Expand Down
4 changes: 2 additions & 2 deletions Sources/AndroidAnimation/AnimatorSet+Builder.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

extension AnimatorSet {
@JavaClass("android.animation.AnimatorSet$Builder")
Expand Down
6 changes: 3 additions & 3 deletions Sources/AndroidAnimation/AnimatorSet.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaKitCollection
import JavaRuntime
import SwiftJava
import JavaUtil
import CSwiftJavaJNI

@JavaClass("android.animation.AnimatorSet")
open class AnimatorSet: Animator {
Expand Down
4 changes: 2 additions & 2 deletions Sources/AndroidAnimation/ArgbEvaluator.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

@JavaClass("android.animation.ArgbEvaluator", implements: TypeEvaluator.self)
open class ArgbEvaluator: JavaObject {
Expand Down
4 changes: 2 additions & 2 deletions Sources/AndroidAnimation/BidirectionalTypeConverter.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

@JavaClass("android.animation.BidirectionalTypeConverter")
open class BidirectionalTypeConverter<T: AnyJavaObject, V: AnyJavaObject>: TypeConverter {
Expand Down
4 changes: 2 additions & 2 deletions Sources/AndroidAnimation/FloatArrayEvaluator.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

@JavaClass("android.animation.FloatArrayEvaluator", implements: TypeEvaluator.self)
open class FloatArrayEvaluator: JavaObject {
Expand Down
4 changes: 2 additions & 2 deletions Sources/AndroidAnimation/FloatEvaluator.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

@JavaClass("android.animation.FloatEvaluator", implements: TypeEvaluator.self)
open class FloatEvaluator: JavaObject {
Expand Down
4 changes: 2 additions & 2 deletions Sources/AndroidAnimation/IntArrayEvaluator.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

@JavaClass("android.animation.IntArrayEvaluator", implements: TypeEvaluator.self)
open class IntArrayEvaluator: JavaObject {
Expand Down
4 changes: 2 additions & 2 deletions Sources/AndroidAnimation/IntEvaluator.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

@JavaClass("android.animation.IntEvaluator", implements: TypeEvaluator.self)
open class IntEvaluator: JavaObject {
Expand Down
4 changes: 2 additions & 2 deletions Sources/AndroidAnimation/Keyframe.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaLang
import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

@JavaClass("android.animation.Keyframe", implements: Cloneable.self)
open class Keyframe: JavaObject {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

extension LayoutTransition {
@JavaInterface("android.animation.LayoutTransition$TransitionListener")
Expand Down
5 changes: 2 additions & 3 deletions Sources/AndroidAnimation/LayoutTransition.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaKitCollection
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

@JavaClass("android.animation.LayoutTransition")
open class LayoutTransition: JavaObject {
Expand Down
4 changes: 2 additions & 2 deletions Sources/AndroidAnimation/ObjectAnimator.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

@JavaClass("android.animation.ObjectAnimator")
open class ObjectAnimator: ValueAnimator {
Expand Down
4 changes: 2 additions & 2 deletions Sources/AndroidAnimation/PointFEvaluator.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

@JavaClass("android.animation.PointFEvaluator")
open class PointFEvaluator: JavaObject {
Expand Down
4 changes: 2 additions & 2 deletions Sources/AndroidAnimation/PropertyValuesHolder.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaLang
import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

@JavaClass("android.animation.PropertyValuesHolder", implements: Cloneable.self)
open class PropertyValuesHolder: JavaObject {
Expand Down
4 changes: 2 additions & 2 deletions Sources/AndroidAnimation/RectEvaluator.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

@JavaClass("android.animation.RectEvaluator")
open class RectEvaluator: JavaObject {
Expand Down
4 changes: 2 additions & 2 deletions Sources/AndroidAnimation/StateListAnimator.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaLang
import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

@JavaClass("android.animation.StateListAnimator", implements: Cloneable.self)
open class StateListAnimator: JavaObject {
Expand Down
4 changes: 2 additions & 2 deletions Sources/AndroidAnimation/TimeAnimator+TimeListener.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Auto-generated by Java-to-Swift wrapper generator.
import JavaKit
import JavaRuntime
import SwiftJava
import CSwiftJavaJNI

extension TimeAnimator {
@JavaInterface("android.animation.TimeAnimator$TimeListener")
Expand Down
Loading