Skip to content

Commit d1870fd

Browse files
authored
Add standard SwiftPM versioning support (#6860)
1 parent ab758f2 commit d1870fd

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

Package.swift

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,19 +100,17 @@ let package = Package(
100100
),
101101
.package(
102102
name: "nanopb",
103-
url: "https://github.com/nanopb/nanopb.git",
103+
url: "https://github.com/firebase/nanopb.git",
104104
// This revision adds SPM enablement to the 0.3.9.6 release tag.
105-
.revision("8119dfe5631f2616d11e50ead95448d12e816062")
106-
),
107-
.package(
108-
name: "abseil",
109-
url: "https://github.com/firebase/abseil-cpp-SwiftPM.git",
110-
.revision("05d8107f2971a37e6c77245b7c4c6b0a7e97bc99")
105+
"2.30906.0" ..< "2.30907.0"
111106
),
107+
.package(name: "abseil",
108+
url: "https://github.com/firebase/abseil-cpp-SwiftPM.git",
109+
from: "0.20200225.0"),
112110
.package(
113111
name: "gRPC",
114112
url: "https://github.com/firebase/grpc-SwiftPM.git",
115-
.revision("5bb2669317ae2183f4cb00c675423af1924f0b46")
113+
"1.28.2" ..< "1.29.0"
116114
),
117115
.package(
118116
name: "OCMock",
@@ -122,7 +120,7 @@ let package = Package(
122120
.package(
123121
name: "leveldb",
124122
url: "https://github.com/firebase/leveldb.git",
125-
.revision("fa1f25f296a766e5a789c4dacd4798dea798b2c2")
123+
"1.22.1" ..< "1.23.0"
126124
),
127125
// Branches need a force update with a run with the revision set like below.
128126
// .package(url: "https://github.com/paulb777/nanopb.git", .revision("564392bd87bd093c308a3aaed3997466efb95f74"))

SwiftPackageManager.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@ Select the Firebase GitHub repository - `https://github.com/firebase/firebase-io
2828

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

31-
Select the beta branch.
31+
Select the version.
3232

33-
Note: Starting with the 6.31.0 release, the versions are specified
34-
in a format like 6.34-spm-beta. We won't support standard repository
35-
versioning until later in the beta or with general availability of the SPM
36-
distribution.
33+
Note: Prior to the 7.0.0 release, version selection is not available. Instead, the releases
34+
are available in branches with names like 6.34-spm-beta.
35+
36+
Note: The Swift Package Manager distribution continues to be in beta even though it now
37+
supports standard Swift Package Manager versioning.
3738

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

docs/resources/SPMSelect.png

17 KB
Loading

0 commit comments

Comments
 (0)