flowkey · ephemer · Dec 5, 2022 · Dec 5, 2022 · Dec 6, 2022 · Dec 6, 2022
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,28 @@
+// swift-tools-version:5.7
+import PackageDescription
+
+let package = Package(
+    name: "UIKit",
+    platforms: [.macOS(.v10_15)],
+    products: [
+        .library(name: "UIKit", targets: ["UIKit"])
+    ],
+    dependencies: [
+        .package(path: "./swift-jni"),
+        .package(path: "./SDL"),
+    ],
+    targets: [
+        .target(
+            name: "UIKit",
+            dependencies: [
+                .product(name: "SDL_macOS", package: "SDL", condition: .when(platforms: [.macOS])),
+                .product(name: "SDL_Android", package: "SDL", condition: .when(platforms: [.android])),
+                .product(name: "JNI", package: "swift-jni", condition: .when(platforms: [.android])),
+                .target(name: "UIKit_C_API", condition: .when(platforms: [.android])),
+            ],
+            path: "Sources",
+            exclude: ["Mac-Info.plist"]
+        ),
+        .target(name: "UIKit_C_API", path: "UIKit_C_API"),
+    ]
+)
diff --git a/SDL b/SDL
diff --git a/Sources/AVPlayer+Android.swift b/Sources/AVPlayer+Android.swift
@@ -1,3 +1,4 @@
+#if os(Android)
 //
 //  JNIVideo.swift
 //  UIKit
@@ -85,3 +86,4 @@ public func nativeOnVideoError(env: UnsafeMutablePointer<JNIEnv>, cls: JavaObjec
     )
     globalAVPlayer?.onError?(error)
 }
+#endif
diff --git a/Sources/AVPlayerItem+Mac.swift b/Sources/AVPlayerItem+Mac.swift
@@ -1,3 +1,4 @@
+#if os(macOS)
 //
 //  AVPlayerItem+Mac.swift
 //  UIKit
@@ -17,3 +18,4 @@ extension AVPlayerItem {
         return duration.seconds * 1000
     }
 }
+#endif
diff --git a/Sources/AVPlayerLayer+Android.swift b/Sources/AVPlayerLayer+Android.swift
@@ -1,3 +1,4 @@
+#if os(Android)
 //
 //  JNIVideo.swift
 //  UIKit
@@ -50,3 +51,4 @@ public class AVPlayerLayer: JNIObject {
         }
     }
 }
+#endif
diff --git a/Sources/AVPlayerLayer+Mac.swift b/Sources/AVPlayerLayer+Mac.swift
@@ -1,3 +1,4 @@
+#if os(macOS)
 //
 //  AVPlayerLayer+Mac.swift
 //  UIKit
@@ -123,3 +124,4 @@ public final class AVPlayerLayer: CALayer {
         contents?.replacePixels(with: pixelBytes, bytesPerPixel: 4)
     }
 }
+#endif
diff --git a/Sources/AVURLAsset+Android.swift b/Sources/AVURLAsset+Android.swift
@@ -1,3 +1,4 @@
+#if os(Android)
 //
 //  AVPlayerItem+Android.swift
 //  UIKit
@@ -26,3 +27,4 @@ public class AVURLAsset: JNIObject {
         self.url = url
     }
 }
+#endif
diff --git a/Sources/Button.swift b/Sources/Button.swift
@@ -11,14 +11,15 @@
 
 fileprivate let labelVerticalPadding: CGFloat = 6
 
+@MainActor
 open class Button: UIControl {
     internal (set) public var imageView: UIImageView? {
         didSet {
             oldValue?.removeFromSuperview()
             if let imageView = imageView { addSubview(imageView) }
         }
     }
-    
+
     internal (set) public var titleLabel: UILabel? {
         didSet {
             oldValue?.removeFromSuperview()
@@ -75,22 +76,24 @@ open class Button: UIControl {
         }
     }
 
-    public let tapGestureRecognizer = UITapGestureRecognizer()
+    public let tapGestureRecognizer: UITapGestureRecognizer
     public var onPress: (@MainActor () -> Void)? {
         get { return tapGestureRecognizer.onPress }
         set { tapGestureRecognizer.onPress = newValue }
     }
 
+    @MainActor
     public override init(frame: CGRect) {
+        tapGestureRecognizer = UITapGestureRecognizer(onPress: nil)
         super.init(frame: frame)
 
-        let titleLabel = UILabel()
+        let titleLabel = UILabel(frame: .zero)
         titleLabel.isHidden = true
         addSubview(titleLabel)
         setTitleColor(.white, for: .normal)
         self.titleLabel = titleLabel
 
-        let imageView = UIImageView()
+        let imageView = UIImageView(frame: .zero)
         imageView.isHidden = true
         imageView.contentMode = .scaleAspectFit
         addSubview(imageView)

@@ -6,9 +6,10 @@
 //  Copyright © 2017 flowkey. All rights reserved.
 //
 
-import SDL_gpu
+@_implementationOnly import SDL_gpu
 
 extension CALayer {
+    @MainActor
     final func sdlRender(parentAbsoluteOpacity: Float = 1) {
         guard let renderer = UIScreen.main else { return }
         let opacity = self.opacity * parentAbsoluteOpacity

diff --git a/Sources/CALayer.swift b/Sources/CALayer.swift
@@ -1,4 +1,4 @@
-import SDL
+@_implementationOnly import SDL
 
 @MainActor
 open class CALayer {

diff --git a/Sources/CATransform3D+SDL_gpu.swift b/Sources/CATransform3D+SDL_gpu.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2018 flowkey. All rights reserved.
 //
 
-import SDL_gpu
+@_implementationOnly import SDL_gpu
 
 extension CATransform3D {
     /// Set the current transformation as SDL_GPU's current transform matrix

diff --git a/Sources/CATransform3D+animations.swift b/Sources/CATransform3D+animations.swift
@@ -5,7 +5,7 @@
 //  Created by Michael Knoch on 19.01.18.
 //
 
-import SDL_gpu
+@_implementationOnly import SDL_gpu
 
 // It doesn't make sense to make these public, they're only to simplify our animation code:
 internal extension CATransform3D {

diff --git a/Sources/CGDataProvider.swift b/Sources/CGDataProvider.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 flowkey. All rights reserved.
 //
 
-import SDL
+@_implementationOnly import SDL
 
 public class CGDataProvider {
     public var data: [CChar]

diff --git a/Sources/CGImage.swift b/Sources/CGImage.swift
@@ -1,5 +1,5 @@
-import SDL
-import SDL_gpu
+@_implementationOnly import SDL
+@_implementationOnly import SDL_gpu
 
 public class CGImage {
     /// Be careful using this pointer e.g. for another CGImage instance.

diff --git a/Sources/Data+fromRelativePathCrossPlatform.swift b/Sources/Data+fromRelativePathCrossPlatform.swift
@@ -6,8 +6,10 @@
 //  Copyright © 2018 flowkey. All rights reserved.
 //
 
+@_implementationOnly import SDL
+
 extension Data {
-    public static func _fromPathCrossPlatform(_ path: String) -> Data? {
+    static func _fromPathCrossPlatform(_ path: String) -> Data? {
         guard let fileReader = SDL_RWFromFile(path, "r") else {
             return nil
         }

@@ -6,7 +6,7 @@
 //  Copyright © 2018 flowkey. All rights reserved.
 //
 
-import SDL_ttf
+@_implementationOnly import SDL_ttf
 
 extension FontRenderer {
     func getFontKerningOffset(between previousIndex: FT_UInt?, and currentIndex: FT_UInt) -> Int32 {

@@ -6,7 +6,7 @@
 //  Copyright © 2018 flowkey. All rights reserved.
 //
 
-import SDL_ttf
+@_implementationOnly import SDL_ttf
 
 extension FontRenderer {
     // From `TTF_HANDLE_STYLE_BOLD`

@@ -6,7 +6,7 @@
 //  Copyright © 2017 flowkey. All rights reserved.
 //
 
-import SDL_ttf
+@_implementationOnly import SDL_ttf
 
 
 extension FontRenderer {

diff --git a/Sources/Logging.swift b/Sources/Logging.swift
@@ -1,3 +1,4 @@
+#if os(Android)
 //
 //  Logging.swift
 //  UIKit
@@ -6,13 +7,8 @@
 //  Copyright © 2017 flowkey. All rights reserved.
 //
 
-import SDL
-
-#if os(Android)
+@_implementationOnly import SDL
 import Glibc
-#else
-import Darwin.C.stdio
-#endif
 
 private let loggingTag = "Swift"
 
@@ -48,3 +44,4 @@ public func fatalError(_ message: @autoclosure () -> String = "", file: StaticSt
 public enum LogPriority: Int32 {
     case `unknown`,`default`,`verbose`,`debug`,`info`,`warn`,`error`,`fatal`,`silent`
 }
+#endif
diff --git a/Sources/Math.swift b/Sources/Math.swift
@@ -0,0 +1,25 @@
+#if os(WASI)
+@_exported import func WASILibc.pow
+@_exported import func WASILibc.log10
+@_exported import func WASILibc.log2
+@_exported import func WASILibc.sin
+@_exported import func WASILibc.cos
+#elseif canImport(Glibc)
+@_exported import func Glibc.pow
+@_exported import func Glibc.log10
+@_exported import func Glibc.log2
+@_exported import func Glibc.sin
+@_exported import func Glibc.cos
+@_exported import var Glibc.CLOCK_REALTIME
+@_exported import func Glibc.clock_gettime
+@_exported import struct Glibc.timespec
+@_exported import struct Glibc.clockid_t
+#elseif canImport(Darwin)
+@_exported import func Foundation.pow
+@_exported import func Foundation.log10
+@_exported import func Foundation.log2
+@_exported import func Foundation.sin
+@_exported import func Foundation.cos
+@_exported import func Foundation.clock_gettime
+@_exported import struct Foundation.timespec
+#endif
diff --git a/Sources/MeteringView.swift b/Sources/MeteringView.swift
@@ -35,7 +35,7 @@ class MeteringView: UILabel {
 
     private func updateDisplay(to value: Double) {
         guard value.isFinite else { return }
-        let value = Int(round(value))
+        let value = Int(value.rounded())
         self.text = metric + ": \(value)"
         self.sizeToFit()
     }

diff --git a/Sources/NotificationCenter.swift b/Sources/NotificationCenter.swift
@@ -1,4 +1,11 @@
+#if os(Android)
 import JNI
+#elseif canImport(Darwin)
+import class Foundation.Thread
+private var isMainThread: Bool {
+    return Thread.isMainThread
+}
+#endif
 
 public class NotificationCenter {
     public internal(set) static var `default` = NotificationCenter()

diff --git a/Sources/SDL+JNIExtensions.swift b/Sources/SDL+JNIExtensions.swift
@@ -1,3 +1,4 @@
+#if os(Android)
 //
 //  SDL+JNIExtensions.swift
 //  UIKit
@@ -50,3 +51,4 @@ struct JavaSDLView: JavaParameterConvertible {
         return self.init(javaStringObject)
     }
 }
+#endif
diff --git a/Sources/SDL2-Shims.swift b/Sources/SDL2-Shims.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Geordie Jay. All rights reserved.
 //
 
-import SDL
+@_implementationOnly import SDL
 
 struct SDLError: Error {
     let description: String
@@ -27,30 +27,7 @@ extension SDLDisplayMode {
     }
 }
 
-extension SDLBool: ExpressibleByBooleanLiteral {
+extension SDLBool {
     static let `true` = __SDL_TRUE
     static let `false` = __SDL_FALSE
-
-    public init(booleanLiteral value: Bool) {
-        self = (value ? .true : .false)
-    }
-}
-
-extension SDLRect: Equatable {
-    public func intersects(_ other: SDLRect) -> Bool {
-        var other = other
-        return self.intersects(&other) == .true
-    }
-
-    public func intersection(with other: SDLRect) -> SDLRect {
-        var other = other
-        var result = SDLRect()
-        self.intersection(with: &other, result: &result)
-        return result
-    }
-
-    public static func == (lhs: SDLRect, rhs: SDLRect) -> Bool {
-        var rhs = rhs
-        return lhs.equals(&rhs) == .true
-    }
 }
@@ -6,7 +6,7 @@
 //  Copyright © 2017 flowkey. All rights reserved.
 //
 
-import SDL_gpu
+@_implementationOnly import SDL_gpu
 
 class VertexShader: Shader {
     // Some keywords have changed since the earlier shader language versions available on Android:

@@ -6,7 +6,7 @@
 //  Copyright © 2017 flowkey. All rights reserved.
 //
 
-import SDL_gpu
+@_implementationOnly import SDL_gpu
 
 extension ShaderProgram {
     static let mask = try! MaskShaderProgram()

@@ -6,7 +6,7 @@
 //  Copyright © 2017 flowkey. All rights reserved.
 //
 
-import SDL_gpu
+@_implementationOnly import SDL_gpu
 
 // A ShaderProgram consists of a VertexShader and a FragmentShader linked together
 // This is a class because Shaders need to be freed after use