Merge pull request #10 from skiptools/androidbundle

Expose AndroidBundle to non-os(Android) code

Author: aabewhite

Sources/SkipAndroidBridge/AndroidBridgeBootstrap.swift

@@ -86,7 +86,7 @@ public class AndroidBridgeBootstrap {
         logger.debug("initAndroidBridge: bootstrapSSLCertificates")
         try bootstrapSSLCertificates()
         logger.debug("initAndroidBridge: AndroidLooper.setupMainLooper")
-        AndroidLooper.setupMainLooper()
+        let _ = AndroidLooper.setupMainLooper()
         logger.debug("initAndroidBridge: done")
         #endif
         logger.debug("AndroidBridgeBootstrap.initAndroidBridge done in \(Date.now.timeIntervalSince(start)) applicationSupportDirectory=\(URL.applicationSupportDirectory.path)")

Sources/SkipAndroidBridge/AndroidBundle.swift

@@ -1,11 +1,11 @@
 // Copyright 2025 Skip
 // SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
-#if os(Android) || ROBOLECTRIC
 import Foundation
 import SkipBridge
 
 /// Override of native `Bundle` for Android that delegates to our `skip.foundation.Bundle` Kotlin object.
 open class AndroidBundle : Foundation.Bundle, @unchecked Sendable {
+    #if os(Android) || ROBOLECTRIC
     fileprivate let bundleAccess: BundleAccess
 
     open override class var main: AndroidBundle {
@@ -303,8 +303,11 @@ open class AndroidBundle : Foundation.Bundle, @unchecked Sendable {
     open override var executableArchitectures: [NSNumber]? {
         fatalError()
     }
+    #endif
 }
 
+#if os(Android) || ROBOLECTRIC
+
 extension AndroidBundle : JObjectProtocol, JConvertible {
     public static func fromJavaObject(_ obj: JavaObjectPointer?, options: JConvertibleOptions) -> Self {
         return try! Self.init(BundleAccess(AnyDynamicObject(for: obj!, options: options)))

Sources/SkipAndroidBridge/AssetURLProtocol.swift

@@ -59,18 +59,13 @@ public class AssetURLProtocol: URLProtocol {
             return
         }
 
-        do {
-            let assetPath = String(url.path.trimmingPrefix("/")) // Asset read paths are without preceeding slashes
-            if let data = assetManager.load(from: assetPath) {
-                sendHTTP(code: 200)
-                client.urlProtocol(self, didLoad: data)
-            } else {
-                sendHTTP(code: 404)
-            }
-        } catch {
-            client.urlProtocol(self, didFailWithError: error)
+        let assetPath = String(url.path.trimmingPrefix("/")) // Asset read paths are without preceeding slashes
+        if let data = assetManager.load(from: assetPath) {
+            sendHTTP(code: 200)
+            client.urlProtocol(self, didLoad: data)
+        } else {
+            sendHTTP(code: 404)
         }
-
     }
 
     public override class func canInit(with request: URLRequest) -> Bool {