Update SwiftProtobuf to 1.5.0 (#440)

Updates SwiftProtobuf to 1.5.0, which brings full support for Swift 5.

After building/running on this branch, no warnings are emitted with Swift 5 mode.

Docker/README.md

@@ -11,5 +11,3 @@ The following commands push the image to Google Container Registry.
 
     docker tag grpc/swift gcr.io/swift-services/grpc
     gcloud docker -- push gcr.io/swift-services/grpc
-
-

Examples/Google/Datastore/Package.swift

@@ -21,7 +21,7 @@ let package = Package(
   name: "Datastore",
   dependencies: [
     .package(url: "../../..", .branch("HEAD")),
-    .package(url: "https://github.com/apple/swift-protobuf.git", .upToNextMinor(from: "1.3.1")),
+    .package(url: "https://github.com/apple/swift-protobuf.git", .upToNextMinor(from: "1.5.0")),
     .package(url: "https://github.com/kylef/Commander.git", from: "0.8.0"),
     .package(url: "https://github.com/google/auth-library-swift.git", from: "0.3.6")
   ],

Examples/Google/Spanner/Package.swift

@@ -21,7 +21,7 @@ let package = Package(
   name: "Spanner",
   dependencies: [
     .package(url: "../../..", .branch("HEAD")),
-    .package(url: "https://github.com/apple/swift-protobuf.git", .upToNextMinor(from: "1.3.1")),
+    .package(url: "https://github.com/apple/swift-protobuf.git", .upToNextMinor(from: "1.5.0")),
     .package(url: "https://github.com/kylef/Commander.git", from: "0.8.0"),
     .package(url: "https://github.com/google/auth-library-swift.git", from: "0.3.6")
   ],

Package.resolved

@@ -60,8 +60,8 @@
         "repositoryURL": "https://github.com/apple/swift-protobuf.git",
         "state": {
           "branch": null,
-          "revision": "6520fb185db88c0774a929acea1f7d5981a30d3a",
-          "version": "1.4.0"
+          "revision": "7bf52ab1f5ee87aeb89f2a6b9bfc6369408476f7",
+          "version": "1.5.0"
         }
       }
     ]

Package.swift

@@ -19,7 +19,7 @@ import Foundation
 
 var packageDependencies: [Package.Dependency] = [
   // Official SwiftProtobuf library, for [de]serializing data to send on the wire.
-  .package(url: "https://github.com/apple/swift-protobuf.git", .upToNextMajor(from: "1.3.1")),
+  .package(url: "https://github.com/apple/swift-protobuf.git", .upToNextMajor(from: "1.5.0")),
 
   // Command line argument parser for our auxiliary command line tools.
   .package(url: "https://github.com/kylef/Commander.git", .upToNextMinor(from: "0.8.0")),

README.md

@@ -167,9 +167,9 @@ Original SwiftGRPC issue: https://github.com/grpc/grpc-swift/issues/337.
 grpc-swift depends on Swift, Xcode, and swift-protobuf. We are currently
 testing with the following versions:
 
-- Xcode 10.0 / 10.2
+- Xcode 10.2
 - Swift 4.2 / 5.0
-- swift-protobuf 1.3.1
+- swift-protobuf 1.5.0
 
 ## `SwiftGRPCNIO` package
 

SwiftGRPC-Carthage.xcodeproj/GeneratedModuleMap/CNIONghttp2/module.modulemap

@@ -1,4 +1,4 @@
 module CNIONghttp2 {
-    umbrella "/Users/timburks/Desktop/grpc-swift/.build/checkouts/swift-nio-http2/Sources/CNIONghttp2/include"
+    umbrella "/Users/mrebello/Development/grpc-swift/.build/checkouts/swift-nio-http2.git-1684232237084789971/Sources/CNIONghttp2/include"
     export *
 }

SwiftGRPC-Carthage.xcodeproj/xcshareddata/xcschemes/Simple.xcscheme

@@ -24,7 +24,7 @@
           <BuildableReference
             BuildableIdentifier = "primary"
             BuildableName = "'$(TARGET_NAME)'"
-            BlueprintName = "SwiftGRPCNIOTests"
+            BlueprintName = "SwiftGRPCTests"
             ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
           </BuildableReference>
         </TestableReference>
@@ -33,7 +33,7 @@
           <BuildableReference
             BuildableIdentifier = "primary"
             BuildableName = "'$(TARGET_NAME)'"
-            BlueprintName = "SwiftGRPCTests"
+            BlueprintName = "SwiftGRPCNIOTests"
             ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
           </BuildableReference>
         </TestableReference>

SwiftGRPC-Carthage.xcodeproj/xcshareddata/xcschemes/SwiftGRPC-Package.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "9999"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -32,8 +32,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BuildableName = "'$(TARGET_NAME)'"
-               BlueprintName = "Simple"
+               BlueprintIdentifier = "SwiftGRPC::SwiftGRPC"
+               BuildableName = "SwiftGRPC.framework"
+               BlueprintName = "SwiftGRPC"
                ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -45,8 +46,8 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BuildableName = "'lib$(TARGET_NAME)'"
-               BlueprintName = "SwiftGRPCNIO"
+               BuildableName = "&apos;$(TARGET_NAME)&apos;"
+               BlueprintName = "Echo"
                ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -58,7 +59,8 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BuildableName = "'lib$(TARGET_NAME)'"
+               BlueprintIdentifier = "SwiftGRPC::CgRPC"
+               BuildableName = "CgRPC.framework"
                BlueprintName = "CgRPC"
                ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
@@ -71,8 +73,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BuildableName = "'$(TARGET_NAME)'"
-               BlueprintName = "Echo"
+               BlueprintIdentifier = "SwiftGRPC::BoringSSL"
+               BuildableName = "BoringSSL.framework"
+               BlueprintName = "BoringSSL"
                ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -84,8 +87,8 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BuildableName = "'$(TARGET_NAME)'"
-               BlueprintName = "protoc-gen-swiftgrpc"
+               BuildableName = "&apos;$(TARGET_NAME)&apos;"
+               BlueprintName = "Simple"
                ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -97,8 +100,8 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BuildableName = "'lib$(TARGET_NAME)'"
-               BlueprintName = "SwiftGRPC"
+               BuildableName = "&apos;$(TARGET_NAME)&apos;"
+               BlueprintName = "protoc-gen-swiftgrpc"
                ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -110,7 +113,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BuildableName = "'$(TARGET_NAME)'"
+               BuildableName = "&apos;$(TARGET_NAME)&apos;"
                BlueprintName = "RootsEncoder"
                ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
@@ -123,8 +126,8 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BuildableName = "'lib$(TARGET_NAME)'"
-               BlueprintName = "BoringSSL"
+               BuildableName = "&apos;$(TARGET_NAME)&apos;"
+               BlueprintName = "EchoNIO"
                ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -136,23 +139,23 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BuildableName = "'$(TARGET_NAME)'"
-               BlueprintName = "EchoNIO"
+               BuildableName = "&apos;lib$(TARGET_NAME)&apos;"
+               BlueprintName = "SwiftGRPCNIO"
                ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
-            buildForAnalyzing = "YES"
             buildForTesting = "YES"
             buildForRunning = "YES"
             buildForProfiling = "YES"
-            buildForArchiving = "YES">
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "SwiftProtobuf::SwiftProtobuf"
+               BuildableName = "SwiftProtobuf.framework"
                BlueprintName = "SwiftProtobuf"
-               ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj"
-               BuildableName = "SwiftProtobuf.framework">
+               ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -161,14 +164,13 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "NO">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BuildableName = "'$(TARGET_NAME)'"
+               BuildableName = "&apos;$(TARGET_NAME)&apos;"
                BlueprintName = "SwiftGRPCNIOTests"
                ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
@@ -177,11 +179,49 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BuildableName = "'$(TARGET_NAME)'"
+               BuildableName = "&apos;$(TARGET_NAME)&apos;"
                BlueprintName = "SwiftGRPCTests"
                ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "SwiftGRPC::SwiftGRPC"
+            BuildableName = "SwiftGRPC.framework"
+            BlueprintName = "SwiftGRPC"
+            ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
 </Scheme>

SwiftGRPC.podspec

@@ -41,5 +41,5 @@ Pod::Spec.new do |s|
 
   s.dependency 'gRPC-Core', '~> 1.19.0'
   s.dependency 'BoringSSL', '~> 10.0'
-  s.dependency 'SwiftProtobuf', '~> 1.3.1'
+  s.dependency 'SwiftProtobuf', '~> 1.5.0'
 end

Tests/SwiftGRPCTests/ChannelConnectivityTests.swift

@@ -61,7 +61,7 @@ extension ChannelConnectivityTests {
       completionHandlerExpectation.fulfill()
     }
 
-    waitForExpectations(timeout: 0.5)
+    waitForExpectations(timeout: 1.0)
     XCTAssertTrue(firstObserverCalled)
     XCTAssertTrue(secondObserverCalled)
   }