Skip to content

Commit

Permalink
Generate update a-s based on fixes needed for firefox ios SPM changes (
Browse files Browse the repository at this point in the history
…#35)

Update package.swift to remove old dependencies
  • Loading branch information
skhamis authored Feb 1, 2022
1 parent 3d00374 commit 53d2f85
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
7 changes: 2 additions & 5 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
/*
Expand Down Expand Up @@ -68,7 +65,7 @@ let package = Package(
),
.target(
name: "Nimbus",
dependencies: ["MozillaRustComponentsWrapper", "Glean"],
dependencies: ["MozillaRustComponentsWrapper"],
path: "generated/nimbus"
),
.target(
Expand All @@ -83,7 +80,7 @@ let package = Package(
),
.target(
name: "FxAClient",
dependencies: ["MozillaRustComponentsWrapper", "SwiftKeychainWrapper"],
dependencies: ["MozillaRustComponentsWrapper"],
path: "generated/fxa-client"
),
.target(
Expand Down
4 changes: 3 additions & 1 deletion generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
cp -r "$APP_SERVICES_DIR/components/viaduct/ios/" $VIADUCT_DIR

echo "Successfully generated uniffi code!"

0 comments on commit 53d2f85

Please sign in to comment.