From 53d2f85c6d2e579859605cbc73cc7b194484f83b Mon Sep 17 00:00:00 2001 From: Sammy Khamis Date: Tue, 1 Feb 2022 12:25:12 -1000 Subject: [PATCH] Generate update a-s based on fixes needed for firefox ios SPM changes (#35) Update package.swift to remove old dependencies --- Package.swift | 7 ++----- generate.sh | 4 +++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Package.swift b/Package.swift index 502025ec..298c7508 100644 --- a/Package.swift +++ b/Package.swift @@ -21,9 +21,6 @@ let package = Package( .library(name: "Places", targets: ["Places"]), ], dependencies: [ - // TODO: ship Glean via this same bundle? - .package(name: "Glean", url: "https://github.com/mozilla/glean-swift", from: "43.0.2"), - .package(name: "SwiftKeychainWrapper", url: "https://github.com/jrendel/SwiftKeychainWrapper", from: "4.0.1"), ], targets: [ /* @@ -68,7 +65,7 @@ let package = Package( ), .target( name: "Nimbus", - dependencies: ["MozillaRustComponentsWrapper", "Glean"], + dependencies: ["MozillaRustComponentsWrapper"], path: "generated/nimbus" ), .target( @@ -83,7 +80,7 @@ let package = Package( ), .target( name: "FxAClient", - dependencies: ["MozillaRustComponentsWrapper", "SwiftKeychainWrapper"], + dependencies: ["MozillaRustComponentsWrapper"], path: "generated/fxa-client" ), .target( diff --git a/generate.sh b/generate.sh index 176f9f59..3162add6 100755 --- a/generate.sh +++ b/generate.sh @@ -160,4 +160,6 @@ VIADUCT_DIR="$THIS_DIR/generated/viaduct" rm -rf "$VIADUCT_DIR" && mkdir -p "$VIADUCT_DIR" # We only need to copy the hand-written Swift, Viaduct does not use `uniffi` yet -cp -r "$APP_SERVICES_DIR/components/viaduct/ios/" $VIADUCT_DIR \ No newline at end of file +cp -r "$APP_SERVICES_DIR/components/viaduct/ios/" $VIADUCT_DIR + +echo "Successfully generated uniffi code!"