Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add standard SwiftPM versioning support #6860

Merged
merged 5 commits into from
Oct 29, 2020
Merged

Add standard SwiftPM versioning support #6860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4acaa63
Switch to versions
paulb777 Oct 27, 2020
31f561c
Update docs
paulb777 Oct 28, 2020
41728b1
Improve instruction
paulb777 Oct 28, 2020
f81f2ba
style
paulb777 Oct 28, 2020
56a3c31
Use hash for ocmock since it requires unsafe ARC disabling
paulb777 Oct 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 7 additions & 9 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,19 +100,17 @@ let package = Package(
),
.package(
name: "nanopb",
url: "https://github.com/nanopb/nanopb.git",
url: "https://github.com/firebase/nanopb.git",
// This revision adds SPM enablement to the 0.3.9.6 release tag.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this comment out of date?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's still accurate. The Swift PM changes wrap up and should be exactly the same source as the nanopb 0.3.9.6 release

.revision("8119dfe5631f2616d11e50ead95448d12e816062")
),
.package(
name: "abseil",
url: "https://github.com/firebase/abseil-cpp-SwiftPM.git",
.revision("05d8107f2971a37e6c77245b7c4c6b0a7e97bc99")
"2.30906.0" ..< "2.30907.0"
),
.package(name: "abseil",
url: "https://github.com/firebase/abseil-cpp-SwiftPM.git",
from: "0.20200225.0"),
.package(
name: "gRPC",
url: "https://github.com/firebase/grpc-SwiftPM.git",
.revision("5bb2669317ae2183f4cb00c675423af1924f0b46")
"1.28.2" ..< "1.29.0"
),
.package(
name: "OCMock",
Expand All @@ -122,7 +120,7 @@ let package = Package(
.package(
name: "leveldb",
url: "https://github.com/firebase/leveldb.git",
.revision("fa1f25f296a766e5a789c4dacd4798dea798b2c2")
"1.22.1" ..< "1.23.0"
),
// Branches need a force update with a run with the revision set like below.
// .package(url: "https://github.com/paulb777/nanopb.git", .revision("564392bd87bd093c308a3aaed3997466efb95f74"))
Expand Down
11 changes: 6 additions & 5 deletions SwiftPackageManager.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,13 @@ Select the Firebase GitHub repository - `https://github.com/firebase/firebase-io

<img src="docs/resources/SPMChoose.png">

Select the beta branch.
Select the version.

Note: Starting with the 6.31.0 release, the versions are specified
in a format like 6.34-spm-beta. We won't support standard repository
versioning until later in the beta or with general availability of the SPM
distribution.
Note: Prior to the 7.0.0 release, version selection is not available. Instead, the releases
are available in branches with names like 6.34-spm-beta.

Note: The Swift Package Manager distribution continues to be in beta even though it now
supports standard Swift Package Manager versioning.

<img src="docs/resources/SPMSelect.png">

Expand Down
Binary file modified docs/resources/SPMSelect.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.