Skip to content

Commit 65bca29

Browse files
committed
Moving to Swift 4.
Because building with Swift 4 required changes to the CgRPC module.modulemap, grpc-swift now will probably not build with Swift 3 without modification.
1 parent 3252f97 commit 65bca29

File tree

6 files changed

+6
-15
lines changed

6 files changed

+6
-15
lines changed

.travis-install.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,16 @@
2828
cd
2929
mkdir -p local
3030

31-
# Install swift
32-
SWIFT_BRANCH=swift-3.0.2-release
33-
SWIFT_VERSION=swift-3.0.2-RELEASE
34-
SWIFT_PLATFORM=ubuntu14.04
35-
SWIFT_URL=https://swift.org/builds/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM" | tr -d .)/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz
3631

32+
# Install swift
33+
SWIFT_URL=https://swift.org/builds/swift-4.0-branch/ubuntu1404/swift-4.0-DEVELOPMENT-SNAPSHOT-2017-09-01-a/swift-4.0-DEVELOPMENT-SNAPSHOT-2017-09-01-a-ubuntu14.04.tar.gz
3734
echo $SWIFT_URL
38-
3935
curl -fSsL $SWIFT_URL -o swift.tar.gz
4036
tar -xzf swift.tar.gz --strip-components=2 --directory=local
4137

4238
# Install protoc
4339
PROTOC_URL=https://github.com/google/protobuf/releases/download/v3.2.0rc2/protoc-3.2.0rc2-linux-x86_64.zip
44-
4540
echo $PROTOC_URL
46-
4741
curl -fSsL $PROTOC_URL -o protoc.zip
4842
unzip protoc.zip -d local
4943

Examples/Echo/PackageManager/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import PackageDescription
1717
let package = Package (
1818
name: "Echo",
1919
dependencies: [
20-
.Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,1)),
20+
.Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,2)),
2121
.Package(url: "https://github.com/apple/swift-protobuf.git", Version(0,9,904)),
2222
]
2323
)

Examples/Simple/PackageManager/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ import PackageDescription
1717
let package = Package (
1818
name: "Simple",
1919
dependencies: [
20-
.Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,1)),
20+
.Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,2)),
2121
]
2222
)

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ For an example of this in Swift, please see the
110110
grpc-swift depends on Swift, Xcode, and swift-proto. We are currently
111111
testing with the following versions:
112112

113-
- Xcode 8.3.2 (8E2002)
114-
- Swift 3.1 (swiftlang-802.0.53 clang-802.0.42)
113+
- Xcode 9
114+
- Swift 4 (swiftlang-900.0.43 clang-900.0.22.8)
115115
- swift-protobuf 0.9.904
116116

117117
## License
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
module CgRPC {
22
header "CgRPC.h"
3-
link "CgRPC"
43
export *
54
}

Tests/gRPCTests/GRPCTests.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@
2525
func testConnectivitySecure() {
2626
runTest(useSSL:true)
2727
}
28-
}
2928

30-
extension gRPCTests {
3129
static var allTests : [(String, (gRPCTests) -> () throws -> Void)] {
3230
return [
3331
("testConnectivity", testConnectivity),

0 commit comments

Comments
 (0)