Skip to content

Commit 8c017a4

Browse files
authored
Merge pull request #4 from PureSwift/feature/apple-platform-requirements
Declare Apple platform requirements and fix AndroidManifest dependency
2 parents 27e3747 + 6d5f5e1 commit 8c017a4

1 file changed

Lines changed: 16 additions & 2 deletions

File tree

Package.swift

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,14 @@ let sdkVersionDefine = SwiftSetting.define("ANDROID_SDK_VERSION_" + sdkVersion.d
1717
let package = Package(
1818
name: "AndroidBluetooth",
1919
platforms: [
20-
.macOS(.v15)
20+
.macOS(.v15),
21+
// Declared to match the Bluetooth/GATT/Socket dependencies. This package only ever builds
22+
// for Android, but SwiftPM validates platform requirements across the whole graph, and
23+
// leaving these unspecified defaults them to iOS 12 — which conflicts with dependencies
24+
// that require iOS 13 and breaks any Apple-platform resolve of a package that includes it.
25+
.iOS(.v13),
26+
.watchOS(.v6),
27+
.tvOS(.v13)
2128
],
2229
products: [
2330
.library(
@@ -36,6 +43,13 @@ let package = Package(
3643
.package(
3744
url: "https://github.com/PureSwift/Bluetooth.git",
3845
from: "7.2.0"
46+
),
47+
// `AndroidManifest` moved out of PureSwift/Android into swift-android-native (Android PR
48+
// #40); it must now be depended on directly. The URL and branch must match the ones
49+
// PureSwift/Android and skip-android-bridge use, or the identity conflicts.
50+
.package(
51+
url: "https://github.com/MillerTechnologyPeru/swift-android-native.git",
52+
branch: "feature/pureswift"
3953
)
4054
],
4155
targets: [
@@ -72,7 +86,7 @@ let package = Package(
7286
),
7387
.product(
7488
name: "AndroidManifest",
75-
package: "Android"
89+
package: "swift-android-native"
7690
)
7791
],
7892
exclude: ["swift-java.config"],

0 commit comments

Comments
 (0)