From b0a6008c184c1010dac11e14bf20afe4261d8c36 Mon Sep 17 00:00:00 2001
From: Maxim Makhun <maxim.makhun@mapbox.com>
Date: Wed, 20 Oct 2021 16:10:43 -0400
Subject: [PATCH] Improve CircleCi build configuration. (#48)

---
 .circleci/config.yml                               | 14 +++++++-------
 Cartfile.private                                   |  2 +-
 Cartfile.resolved                                  |  2 +-
 MapboxSpeech.xcodeproj/project.pbxproj             |  2 +-
 .../xcschemes/MapboxSpeech Mac.xcscheme            |  2 +-
 .../xcschemes/MapboxSpeech iOS.xcscheme            |  2 +-
 .../xcschemes/MapboxSpeech tvOS.xcscheme           |  2 +-
 .../xcschemes/MapboxSpeech watchOS.xcscheme        |  2 +-
 Tests/MapboxSpeechTests/MapboxVoiceTests.swift     |  4 ++--
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2c5f73c..2781610 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,7 +19,7 @@ step-library:
       run:
         name: Build and Test for iOS
         command: |
-          xcodebuild -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=12.2,name=iPhone X' -project MapboxSpeech.xcodeproj -scheme "MapboxSpeech iOS" clean build test
+          xcodebuild -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=13.5,name=iPhone 11 Pro Max' -project MapboxSpeech.xcodeproj -scheme "MapboxSpeech iOS" clean build test
     
     - &macos-build-test
       run:
@@ -31,13 +31,13 @@ step-library:
       run:
         name: Build and Test for tvOS
         command: |
-          xcodebuild -destination 'platform=tvOS Simulator,OS=12.2,name=Apple TV 4K (at 1080p)' -project MapboxSpeech.xcodeproj -scheme "MapboxSpeech tvOS" clean build test
+          xcodebuild -destination 'platform=tvOS Simulator,OS=13.4,name=Apple TV 4K (at 1080p)' -project MapboxSpeech.xcodeproj -scheme "MapboxSpeech tvOS" clean build test
     
     - &watchos-build
       run:
         name: Build for watchOS
         command: |
-          xcodebuild -destination 'platform=watchOS Simulator,OS=5.2,name=Apple Watch Series 3 - 42mm' -project MapboxSpeech.xcodeproj -scheme "MapboxSpeech watchOS" clean build
+          xcodebuild -destination 'platform=watchOS Simulator,OS=6.2.1,name=Apple Watch Series 5 - 44mm' -project MapboxSpeech.xcodeproj -scheme "MapboxSpeech watchOS" clean build
     
     - &publish-codecov
       run:
@@ -47,7 +47,7 @@ step-library:
 jobs:
   ios-build-test:
     macos:
-      xcode: "10.2.1"
+      xcode: "11.5.0"
     environment:
       HOMEBREW_NO_AUTO_UPDATE: 0
     steps:
@@ -59,13 +59,13 @@ jobs:
       - *watchos-build
   spm:
     macos:
-      xcode: "10.2.1"
+      xcode: "11.5.0"
     steps:
       - checkout
       - run: swift build
   pod:
     macos:
-      xcode: "10.2.1"
+      xcode: "11.5.0"
     steps:
       - checkout
       - run: 
@@ -76,4 +76,4 @@ jobs:
             xcodegen generate
             bundle install
             bundle exec pod install
-            xcodebuild -workspace PodTest.xcworkspace -scheme PodTest -destination 'platform=iOS Simulator,OS=latest,name=iPhone X' build
+            xcodebuild -workspace PodTest.xcworkspace -scheme PodTest -destination 'platform=iOS Simulator,OS=latest,name=iPhone 11 Pro Max' build
diff --git a/Cartfile.private b/Cartfile.private
index 7ad353e..91b97bc 100644
--- a/Cartfile.private
+++ b/Cartfile.private
@@ -1 +1 @@
-github "AliSoftware/OHHTTPStubs" ~> 7.0
+github "AliSoftware/OHHTTPStubs" ~> 9.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 97d41ed..9a67850 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1 +1 @@
-github "AliSoftware/OHHTTPStubs" "7.0.0"
+github "AliSoftware/OHHTTPStubs" "9.1.0"
diff --git a/MapboxSpeech.xcodeproj/project.pbxproj b/MapboxSpeech.xcodeproj/project.pbxproj
index b822edc..e26129b 100644
--- a/MapboxSpeech.xcodeproj/project.pbxproj
+++ b/MapboxSpeech.xcodeproj/project.pbxproj
@@ -373,7 +373,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1010;
-				LastUpgradeCheck = 1220;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = Mapbox;
 				TargetAttributes = {
 					C54F534B1F6C754D00BFCC66 = {
diff --git a/MapboxSpeech.xcodeproj/xcshareddata/xcschemes/MapboxSpeech Mac.xcscheme b/MapboxSpeech.xcodeproj/xcshareddata/xcschemes/MapboxSpeech Mac.xcscheme
index 845845a..1cdd279 100644
--- a/MapboxSpeech.xcodeproj/xcshareddata/xcschemes/MapboxSpeech Mac.xcscheme	
+++ b/MapboxSpeech.xcodeproj/xcshareddata/xcschemes/MapboxSpeech Mac.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1220"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/MapboxSpeech.xcodeproj/xcshareddata/xcschemes/MapboxSpeech iOS.xcscheme b/MapboxSpeech.xcodeproj/xcshareddata/xcschemes/MapboxSpeech iOS.xcscheme
index 2bce972..56e766b 100644
--- a/MapboxSpeech.xcodeproj/xcshareddata/xcschemes/MapboxSpeech iOS.xcscheme	
+++ b/MapboxSpeech.xcodeproj/xcshareddata/xcschemes/MapboxSpeech iOS.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1220"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/MapboxSpeech.xcodeproj/xcshareddata/xcschemes/MapboxSpeech tvOS.xcscheme b/MapboxSpeech.xcodeproj/xcshareddata/xcschemes/MapboxSpeech tvOS.xcscheme
index 5be3d5d..60b83f0 100644
--- a/MapboxSpeech.xcodeproj/xcshareddata/xcschemes/MapboxSpeech tvOS.xcscheme	
+++ b/MapboxSpeech.xcodeproj/xcshareddata/xcschemes/MapboxSpeech tvOS.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1220"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/MapboxSpeech.xcodeproj/xcshareddata/xcschemes/MapboxSpeech watchOS.xcscheme b/MapboxSpeech.xcodeproj/xcshareddata/xcschemes/MapboxSpeech watchOS.xcscheme
index 9ef2582..0b8a919 100644
--- a/MapboxSpeech.xcodeproj/xcshareddata/xcschemes/MapboxSpeech watchOS.xcscheme	
+++ b/MapboxSpeech.xcodeproj/xcshareddata/xcschemes/MapboxSpeech watchOS.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1220"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Tests/MapboxSpeechTests/MapboxVoiceTests.swift b/Tests/MapboxSpeechTests/MapboxVoiceTests.swift
index 1c43b16..28e6756 100644
--- a/Tests/MapboxSpeechTests/MapboxVoiceTests.swift
+++ b/Tests/MapboxSpeechTests/MapboxVoiceTests.swift
@@ -12,7 +12,7 @@ class MapboxVoiceTests: XCTestCase {
     }
     
     override func tearDown() {
-        OHHTTPStubs.removeAllStubs()
+        HTTPStubs.removeAllStubs()
         super.tearDown()
     }
     
@@ -31,7 +31,7 @@ class MapboxVoiceTests: XCTestCase {
             && isPath("/voice/v1/speak/hello")
             && containsQueryParams(queryParams)) { _ in
                 let path = Bundle(for: type(of: self)).path(forResource: "hello", ofType: "mp3")
-                return OHHTTPStubsResponse(fileAtPath: path!, statusCode: 200, headers: nil)
+                return HTTPStubsResponse(fileAtPath: path!, statusCode: 200, headers: nil)
         }
         
         let voice = SpeechSynthesizer(accessToken: BogusToken)