Skip to content

Commit a43882d

Browse files
authored
Update Cocoapods (grpc#1130)
Motivation: We did a release, we should release new pods and update the version number in docs too. Modifications: - Update pods - Update docs - Update pods script to sort dependencies by name (so diffs are more stable) Result: Cocoapods are available. Docs are more up-to-date.
1 parent 9e464a7 commit a43882d

7 files changed

+14
-14
lines changed

Diff for: CGRPCZlib.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
22

33
s.name = 'CGRPCZlib'
44
s.module_name = 'CGRPCZlib'
5-
s.version = '1.0.0-alpha.24'
5+
s.version = '1.0.0'
66
s.license = { :type => 'Apache 2.0', :file => 'LICENSE' }
77
s.summary = 'Compression library that provides in-memory compression and decompression functions'
88
s.homepage = 'https://www.grpc.io'

Diff for: README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ package dependency to your `Package.swift`:
4949

5050
```swift
5151
dependencies: [
52-
.package(url: "https://github.com/grpc/grpc-swift.git", from: "1.0.0-alpha.23")
52+
.package(url: "https://github.com/grpc/grpc-swift.git", from: "1.0.0")
5353
]
5454
```
5555

@@ -82,7 +82,7 @@ gRPC Swift is currently available [from CocoaPods][pod-new]. To integrate, add
8282
the following line to your `Podfile`:
8383

8484
```ruby
85-
pod 'gRPC-Swift', '~> 1.0.0-alpha.23'
85+
pod 'gRPC-Swift', '~> 1.0.0'
8686
```
8787

8888
Then, run `pod install` from command line and use your project's generated

Diff for: docs/basic-tutorial.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ To download the example, clone the latest release in `grpc-swift` repository by
3939
running the following command:
4040

4141
```sh
42-
$ git clone -b 1.0.0-alpha.20 https://github.com/grpc/grpc-swift
42+
$ git clone -b 1.0.0 https://github.com/grpc/grpc-swift
4343
```
4444

4545
Then change your current directory to `grpc-swift/Sources/Examples/RouteGuide`:

Diff for: docs/quick-start.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ and other tutorials):
2828

2929
```sh
3030
$ # Clone the repository at the latest release to get the example code:
31-
$ git clone -b 1.0.0-alpha.20 https://github.com/grpc/grpc-swift
31+
$ git clone -b 1.0.0 https://github.com/grpc/grpc-swift
3232
$ # Navigate to the repository
3333
$ cd grpc-swift/
3434
```

Diff for: gRPC-Swift-Plugins.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = 'gRPC-Swift-Plugins'
4-
s.version = '1.0.0-alpha.24'
4+
s.version = '1.0.0'
55
s.license = { :type => 'Apache 2.0', :file => 'LICENSE' }
66
s.summary = 'Swift gRPC code generator plugin binaries'
77
s.homepage = 'https://www.grpc.io'

Diff for: gRPC-Swift.podspec

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
22

33
s.name = 'gRPC-Swift'
44
s.module_name = 'GRPC'
5-
s.version = '1.0.0-alpha.24'
5+
s.version = '1.0.0'
66
s.license = { :type => 'Apache 2.0', :file => 'LICENSE' }
77
s.summary = 'Swift gRPC code generator plugin and runtime library'
88
s.homepage = 'https://www.grpc.io'
@@ -17,13 +17,13 @@ Pod::Spec.new do |s|
1717

1818
s.source_files = 'Sources/GRPC/**/*.{swift,c,h}'
1919

20-
s.dependency 'SwiftProtobuf', '>= 1.9.0', '< 2.0.0'
20+
s.dependency 'CGRPCZlib', s.version.to_s
21+
s.dependency 'Logging', '>= 1.4.0', '< 2.0.0'
2122
s.dependency 'SwiftNIO', '>= 2.22.0', '< 3.0.0'
22-
s.dependency 'SwiftNIOTransportServices', '>= 1.6.0', '< 2.0.0'
23-
s.dependency 'SwiftNIOSSL', '>= 2.8.0', '< 3.0.0'
2423
s.dependency 'SwiftNIOExtras', '>= 1.4.0', '< 2.0.0'
25-
s.dependency 'Logging', '>= 1.4.0', '< 2.0.0'
2624
s.dependency 'SwiftNIOHTTP2', '>= 1.16.1', '< 2.0.0'
27-
s.dependency 'CGRPCZlib', s.version.to_s
25+
s.dependency 'SwiftNIOSSL', '>= 2.8.0', '< 3.0.0'
26+
s.dependency 'SwiftNIOTransportServices', '>= 1.6.0', '< 2.0.0'
27+
s.dependency 'SwiftProtobuf', '>= 1.9.0', '< 2.0.0'
2828

2929
end

Diff for: scripts/build_podspecs.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def as_podspec(self):
8383

8484
podspec += "\n" if len(self.dependencies) > 0 else ""
8585

86-
for dep in self.dependencies:
86+
for dep in sorted(self.dependencies, key=lambda x: x.name):
8787
podspec += indent + str(dep) + "\n"
8888

8989
podspec += "\nend"
@@ -105,7 +105,7 @@ def publish(self, pod_name):
105105
subprocess.check_call(['pod', 'repo', 'update'])
106106
print(' Publishing %s.podspec' % (pod_name))
107107
subprocess.check_call(['pod', 'trunk', 'push', '--synchronous',
108-
self.directory + '/' + pod_name])
108+
self.directory + '/' + pod_name + ".podspec"])
109109

110110
def build_pods(self):
111111
cgrpczlib_pod = Pod(

0 commit comments

Comments
 (0)