Skip to content

Fix AndroidBundle for upcoming Swift 6.4 changes to resource_bundle_accessor.swift #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marcprux wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix AndroidBundle for upcoming Swift 6.4 changes to resource_bundle_accessor.swift #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4146cc
Fix AndroidBundle for upcoming Swift 6.4 changes to resource_bundle_a…
marcprux May 8, 2026
764c245
Build skip from source with skip-source: 'build-system'
marcprux May 8, 2026
75f4781
Return to using formula distribution of skip in CI
marcprux May 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ permissions:
jobs:
call-workflow:
uses: skiptools/actions/.github/workflows/skip-framework.yml@v1

with:
runs-on: "['macos-15-intel', 'ubuntu-24.04']"
swift-android-sdk-version: "['', 'nightly-main']"
13 changes: 8 additions & 5 deletions Sources/SkipAndroidBridge/AndroidBundle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,19 @@ open class AndroidBundle : Foundation.Bundle, @unchecked Sendable {
super.init(path: Foundation.Bundle.main.bundlePath)!
}

// These inits require 'override' on Android but not iOS or ROBOLECTRIC
// These inits require 'override' on Android but not iOS or ROBOLECTRIC.
// They must not be marked unavailable because the auto-generated
// resource_bundle_accessor.swift (produced by the swiftbuild build system)
// calls Bundle(for: BundleFinder.self) as part of its fallback chain.
#if os(Android)
@available(*, unavailable)
public override init(for aClass: AnyClass) {
fatalError()
self.bundleAccess = BundleAccess.main
super.init(path: Foundation.Bundle.main.bundlePath)!
}

@available(*, unavailable)
public override init?(identifier: String) {
fatalError()
self.bundleAccess = BundleAccess.main
super.init(path: Foundation.Bundle.main.bundlePath)!
}
#endif

Expand Down
Loading