Firmer SPM dependency versions and iOS device build check (#7838)

Author: paulb777

.github/workflows/spm.yml

@@ -20,13 +20,24 @@ jobs:
     runs-on: macOS-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Xcode 12
-      run: sudo xcode-select -s /Applications/Xcode_12.app/Contents/Developer
     - name: Initialize xcodebuild
       run: xcodebuild -list
     - name: iOS Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh Firebase-Package iOS spm
 
+  # Test iOS Device build since some Firestore dependencies build different files.
+  iOS-Device:
+    # Don't run on private repo unless it is a PR.
+    if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
+    runs-on: macOS-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Initialize xcodebuild
+      run: xcodebuild -list
+    - name: iOS Unit Tests
+      # TODO (#7785) Change to Firebase-Package when #7785 is resolved.
+      run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestoreSwift-Beta iOS-device spmbuildonly
+
   platforms:
     # Don't run on private repo unless it is a PR.
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
@@ -39,8 +50,6 @@ jobs:
         test: [objc-import-test, swift-test, version-test]
     steps:
     - uses: actions/checkout@v2
-    - name: Xcode 12
-      run: sudo xcode-select -s /Applications/Xcode_12.app/Contents/Developer
     - name: Initialize xcodebuild
       run: xcodebuild -list
     - name: Unit Tests

Package.swift

@@ -102,11 +102,15 @@ let package = Package(
     ),
   ],
   dependencies: [
-    .package(name: "Promises", url: "https://github.com/google/promises.git", "1.2.8" ..< "1.3.0"),
+    .package(
+      name: "Promises",
+      url: "https://github.com/google/promises.git",
+      "1.2.8" ..< "1.3.0"
+    ),
     .package(
       name: "SwiftProtobuf",
       url: "https://github.com/apple/swift-protobuf.git",
-      from: "1.14.0"
+      "1.15.0" ..< "2.0.0"
     ),
     .package(
       name: "GoogleAppMeasurement",
@@ -131,18 +135,17 @@ let package = Package(
     .package(
       name: "nanopb",
       url: "https://github.com/firebase/nanopb.git",
-      // This revision adds SPM enablement to the 0.3.9.6 release tag.
       "2.30908.0" ..< "2.30909.0"
     ),
     .package(
       name: "abseil",
       url: "https://github.com/firebase/abseil-cpp-SwiftPM.git",
-      from: "0.20200225.1"
+      "0.20200225.3" ..< "0.20200226.0"
     ),
     .package(
       name: "gRPC",
       url: "https://github.com/firebase/grpc-SwiftPM.git",
-      "1.28.3" ..< "1.29.0"
+      "1.28.4" ..< "1.29.0"
     ),
     .package(
       name: "OCMock",

scripts/build.sh

@@ -46,6 +46,7 @@ product can be one of:
 
 platform can be one of:
   iOS (default)
+  iOS-device
   macOS
   tvOS
   watchOS
@@ -154,6 +155,10 @@ else
   )
 fi
 
+ios_device_flags=(
+  -sdk 'iphoneos'
+)
+
 ipad_flags=(
   -sdk 'iphonesimulator'
   -destination 'platform=iOS Simulator,name=iPad Pro (9.7-inch)'
@@ -183,6 +188,11 @@ case "$platform" in
     gen_platform=ios
     ;;
 
+  iOS-device)
+    xcb_flags=("${ios_device_flags[@]}")
+    gen_platform=ios
+    ;;
+
   iPad)
     xcb_flags=("${ipad_flags[@]}")
   ;;