Merge pull request #475 from tonyarnold/fix/build-configuration

Revise and update workspace build configuration
apollographql · Mar 30, 2019 · 07133eb · 07133eb
2 parents 5a647ba + 5c1b3da
commit 07133eb
Show file tree

Hide file tree

Showing 50 changed files with 472 additions and 889 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+4.2
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode10
+osx_image: xcode10.2
 xcode_workspace: Apollo.xcworkspace
 
 matrix:
@@ -8,49 +8,49 @@ matrix:
     xcode_sdk: macosx10.14
     env: DESTINATION="platform=macOS,arch=x86_64"
   - xcode_scheme: Apollo
-    xcode_sdk: iphonesimulator12.0
-    env: DESTINATION="platform=iOS Simulator,OS=12.0,name=iPhone XS"
+    xcode_sdk: iphonesimulator12.2
+    env: DESTINATION="platform=iOS Simulator,OS=12.2,name=iPhone XS"
   - xcode_scheme: Apollo
-    xcode_sdk: iphonesimulator12.0
+    xcode_sdk: iphonesimulator12.2
     env: DESTINATION="platform=iOS Simulator,OS=11.4,name=iPhone 8"
   - xcode_scheme: Apollo
-    xcode_sdk: iphonesimulator12.0
+    xcode_sdk: iphonesimulator12.2
     env: DESTINATION="platform=iOS Simulator,OS=10.3.1,name=iPhone 7"
   - xcode_scheme: Apollo
-    xcode_sdk: iphonesimulator12.0
+    xcode_sdk: iphonesimulator12.2
     env: DESTINATION="platform=iOS Simulator,OS=9.3,name=iPhone 6s"
   - xcode_scheme: Apollo
-    xcode_sdk: appletvsimulator12.0
-    env: DESTINATION="platform=tvOS Simulator,OS=12.0,name=Apple TV"
+    xcode_sdk: appletvsimulator12.2
+    env: DESTINATION="platform=tvOS Simulator,OS=12.2,name=Apple TV"
   - xcode_scheme: ApolloSQLite
     xcode_sdk: macosx10.14
     env: DESTINATION="platform=macOS,arch=x86_64"
   - xcode_scheme: ApolloSQLite
-    xcode_sdk: iphonesimulator12.0
-    env: DESTINATION="platform=iOS Simulator,OS=12.0,name=iPhone XS"
+    xcode_sdk: iphonesimulator12.2
+    env: DESTINATION="platform=iOS Simulator,OS=12.2,name=iPhone XS"
   - xcode_scheme: ApolloSQLite
-    xcode_sdk: iphonesimulator12.0
+    xcode_sdk: iphonesimulator12.2
     env: DESTINATION="platform=iOS Simulator,OS=11.4,name=iPhone 8"
   - xcode_scheme: ApolloSQLite
-    xcode_sdk: iphonesimulator12.0
+    xcode_sdk: iphonesimulator12.2
     env: DESTINATION="platform=iOS Simulator,OS=10.3.1,name=iPhone 7"
   - xcode_scheme: ApolloSQLite
-    xcode_sdk: iphonesimulator12.0
+    xcode_sdk: iphonesimulator12.2
     env: DESTINATION="platform=iOS Simulator,OS=9.3,name=iPhone 6s"
   - xcode_scheme: ApolloWebSocket
     xcode_sdk: macosx10.14
     env: DESTINATION="platform=macOS,arch=x86_64"
   - xcode_scheme: ApolloWebSocket
-    xcode_sdk: iphonesimulator12.0
-    env: DESTINATION="platform=iOS Simulator,OS=12.0,name=iPhone XS"
+    xcode_sdk: iphonesimulator12.2
+    env: DESTINATION="platform=iOS Simulator,OS=12.2,name=iPhone XS"
   - xcode_scheme: ApolloWebSocket
-    xcode_sdk: iphonesimulator12.0
+    xcode_sdk: iphonesimulator12.2
     env: DESTINATION="platform=iOS Simulator,OS=11.4,name=iPhone 8"
   - xcode_scheme: ApolloWebSocket
-    xcode_sdk: iphonesimulator12.0
+    xcode_sdk: iphonesimulator12.2
     env: DESTINATION="platform=iOS Simulator,OS=10.3.1,name=iPhone 7"
   - xcode_scheme: ApolloWebSocket
-    xcode_sdk: iphonesimulator12.0
+    xcode_sdk: iphonesimulator12.2
     env: DESTINATION="platform=iOS Simulator,OS=9.3,name=iPhone 6s"
 
 cache:

diff --git a/Apollo.xcodeproj/project.pbxproj b/Apollo.xcodeproj/project.pbxproj
diff --git a/Apollo.xcworkspace/contents.xcworkspacedata b/Apollo.xcworkspace/contents.xcworkspacedata