Переглянути джерело

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.
Tim Burks 8 роки тому
батько
коміт
65bca29f5d

+ 2 - 8
.travis-install.sh

@@ -28,22 +28,16 @@
 cd
 mkdir -p local
 
-# Install swift
-SWIFT_BRANCH=swift-3.0.2-release
-SWIFT_VERSION=swift-3.0.2-RELEASE
-SWIFT_PLATFORM=ubuntu14.04
-SWIFT_URL=https://swift.org/builds/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM" | tr -d .)/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz
 
+# Install swift
+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
 echo $SWIFT_URL
-
 curl -fSsL $SWIFT_URL -o swift.tar.gz 
 tar -xzf swift.tar.gz --strip-components=2 --directory=local
 
 # Install protoc
 PROTOC_URL=https://github.com/google/protobuf/releases/download/v3.2.0rc2/protoc-3.2.0rc2-linux-x86_64.zip
-
 echo $PROTOC_URL
-
 curl -fSsL $PROTOC_URL -o protoc.zip
 unzip protoc.zip -d local
 

+ 1 - 1
Examples/Echo/PackageManager/Package.swift

@@ -17,7 +17,7 @@ import PackageDescription
 let package = Package (
     name: "Echo",
     dependencies: [
-        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,1)),
+        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,2)),
         .Package(url: "https://github.com/apple/swift-protobuf.git", Version(0,9,904)),
     ]
 )

+ 1 - 1
Examples/Simple/PackageManager/Package.swift

@@ -17,6 +17,6 @@ import PackageDescription
 let package = Package (
     name: "Simple",
     dependencies: [
-        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,1)),
+        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,2,2)),
     ]
 )

+ 2 - 2
README.md

@@ -110,8 +110,8 @@ For an example of this in Swift, please see the
 grpc-swift depends on Swift, Xcode, and swift-proto. We are currently
 testing with the following versions:
 
-- Xcode 8.3.2 (8E2002) 
-- Swift 3.1 (swiftlang-802.0.53 clang-802.0.42)
+- Xcode 9 
+- Swift 4 (swiftlang-900.0.43 clang-900.0.22.8)
 - swift-protobuf 0.9.904 
 
 ## License

+ 0 - 1
Sources/CgRPC/include/module.modulemap

@@ -1,5 +1,4 @@
 module CgRPC {
     header "CgRPC.h"
-    link "CgRPC"
     export *
 }

+ 0 - 2
Tests/gRPCTests/GRPCTests.swift

@@ -25,9 +25,7 @@
   func testConnectivitySecure() {
     runTest(useSSL:true)
   }
- }
 
- extension gRPCTests {
   static var allTests : [(String, (gRPCTests) -> () throws -> Void)] {
     return [
       ("testConnectivity", testConnectivity),