Skip to content

Remove expicit .dynamic for SkipAndroidBridge product #11

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.

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
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 3 additions & 9 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,23 @@ let package = Package(
defaultLocalization: "en",
platforms: [.iOS(.v16), .macOS(.v13), .tvOS(.v16), .watchOS(.v9), .macCatalyst(.v16)],
products: [
.library(name: "SkipAndroidBridge", type: .dynamic, targets: ["SkipAndroidBridge"]),
.library(name: "SkipAndroidBridge", targets: ["SkipAndroidBridge"]),
.library(name: "SkipAndroidBridgeSamples", type: .dynamic, targets: ["SkipAndroidBridgeSamples"]),
],
dependencies: [
.package(url: "https://source.skip.tools/skip.git", from: "1.2.34"),
.package(url: "https://source.skip.tools/skip-foundation.git", from: "1.3.1"),
.package(url: "https://source.skip.tools/swift-jni.git", "0.0.0"..<"2.0.0"),
.package(url: "https://source.skip.tools/skip-bridge.git", "0.0.0"..<"2.0.0"),
//.package(url: "https://source.skip.tools/skip-bridge.git", "0.0.0"..<"2.0.0"),
.package(url: "https://source.skip.tools/skip-bridge.git", branch: "no-dynamic"),
.package(url: "https://source.skip.tools/swift-android-native.git", "0.0.0"..<"2.0.0")
],
targets: [
.target(name: "SkipAndroidBridge", dependencies: [
.product(name: "SkipBridge", package: "skip-bridge"),
.product(name: "SwiftJNI", package: "swift-jni"),
.product(name: "SkipFoundation", package: "skip-foundation"),
.product(name: "AndroidNative", package: "swift-android-native", condition: .when(platforms: [.android])),
], plugins: [.plugin(name: "skipstone", package: "skip")]),

.testTarget(name: "SkipAndroidBridgeTests", dependencies: [
"SkipAndroidBridge",
.product(name: "SkipTest", package: "skip"),
], plugins: [.plugin(name: "skipstone", package: "skip")]),

.target(name: "SkipAndroidBridgeSamples", dependencies: [
"SkipAndroidBridge",
], resources: [.process("Resources")], plugins: [.plugin(name: "skipstone", package: "skip")]),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,34 @@ final class SkipAndroidBridgeSamplesTests: XCTestCase {
#endif
}

func testAndroidBridge() throws {
#if SKIP
let context = ProcessInfo.processInfo.androidContext
XCTAssertNotNil(context, "ProcessInfo.processInfo.androidContext was nil")

let filesDir = URL(fileURLWithPath: context.getFilesDir().getAbsolutePath(), isDirectory: true)
let cacheDir = URL(fileURLWithPath: context.getCacheDir().getAbsolutePath(), isDirectory: true)

if isRobolectric {
// Robolectric's files folder is tough to predict (e.g. /var/folders/zl/wkdjv4s1271fbm6w0plzknkh0000gn/T/robolectric-AndroidBridgeTests_testAndroidBridge_SkipAndroidBridge_debugUnitTest10131350412654065418/skip.android.bridge.samples.test-dataDir/files)
XCTAssertTrue(filesDir.path.hasSuffix("/files"), "unexpected filesDir.path: \(filesDir.path)")
XCTAssertTrue(cacheDir.path.hasSuffix("/cache"), "unexpected cacheDir.path: \(cacheDir.path)")
} else {
// …but Android is predictably the app's "files" and "cache" directories
XCTAssertEqual("/data/user/0/skip.android.bridge.samples.test/files", filesDir.path)
XCTAssertEqual("/data/user/0/skip.android.bridge.samples.test/cache", cacheDir.path)
}

// make sure we can read and write to the filesDir
try "ABC".write(to: filesDir.appendingPathComponent("test.txt"), atomically: true, encoding: .utf8)
try "XYZ".write(to: cacheDir.appendingPathComponent("test.txt"), atomically: true, encoding: .utf8)

try AndroidBridgeBootstrap.initAndroidBridge(filesDir: filesDir.path, cacheDir: cacheDir.path)
#else
throw XCTSkip("testAndroidBridge only works from SKIP")
#endif
}

func testSimpleConstants() {
XCTAssertEqual(swiftStringConstant, "s")
}
Expand Down
50 changes: 0 additions & 50 deletions Tests/SkipAndroidBridgeTests/AndroidBridgeTests.swift

This file was deleted.

8 changes: 0 additions & 8 deletions Tests/SkipAndroidBridgeTests/Skip/skip.yml

This file was deleted.

30 changes: 0 additions & 30 deletions Tests/SkipAndroidBridgeTests/XCSkipTests.swift

This file was deleted.