Skip to content

Commit 9dcd2c3

Browse files
committed
Remove JNI dependency for AndroidManifest target
1 parent 9f6f7cf commit 9dcd2c3

6 files changed

Lines changed: 14 additions & 811 deletions

File tree

Package.swift

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -219,18 +219,6 @@ var package = Package(
219219
sdkVersionDefine
220220
]
221221
),
222-
.target(
223-
name: "AndroidManifest",
224-
dependencies: [
225-
"AndroidJava"
226-
],
227-
exclude: ["swift-java.config"],
228-
swiftSettings: [
229-
.swiftLanguageMode(.v5),
230-
ndkVersionDefine,
231-
sdkVersionDefine
232-
]
233-
),
234222
.target(
235223
name: "AndroidR",
236224
dependencies: [
@@ -487,6 +475,20 @@ var package = Package(
487475
linkerSettings: [
488476
.linkedLibrary("android", .when(platforms: [.android]))
489477
]
478+
),
479+
.target(
480+
name: "AndroidManifest",
481+
dependencies: [
482+
"AndroidNDK"
483+
],
484+
swiftSettings: [
485+
.swiftLanguageMode(.v6),
486+
ndkVersionDefine,
487+
sdkVersionDefine
488+
],
489+
linkerSettings: [
490+
.linkedLibrary("android", .when(platforms: [.android]))
491+
]
490492
)
491493
],
492494
swiftLanguageModes: [.v5, .v6]

Sources/AndroidManifest/AndroidManifest.swift

Lines changed: 0 additions & 8 deletions
This file was deleted.

Sources/AndroidManifest/generated/Manifest+Permission+Group.swift

Lines changed: 0 additions & 57 deletions
This file was deleted.

0 commit comments

Comments
 (0)