Merge pull request #719 from artsy/run-ci-tests

Updates CocoaPods, CocoaPods source, Xcode version, CI config
artsy · Apr 22, 2020 · 33f9870 · 33f9870
2 parents 67fd72c + d96f59b
commit 33f9870
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 50 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -20,7 +20,7 @@ jobs:
       CardflightProductionMerchantAccountToken: "-"
       StripeProductionPublishableKey: "-"
     macos:
-      xcode: 9.2.0
+      xcode: 9.4.1
     shell: /bin/bash --login
 
     steps:
@@ -29,11 +29,13 @@ jobs:
       - run: ruby -v
       - run: xcodebuild -version
 
+      - run: xcrun simctl list
+
       # Try to restore installed Gems
       - restore_cache:
           keys:
-          - v1-gems-{{ checksum "Gemfile.lock" }}
-          - v1-gems-
+            - v1-gems-{{ checksum "Gemfile.lock" }}
+            - v1-gems-
       - run: bundle check || bundle install --path=vendor/bundle --jobs 4 --retry 3
       - save_cache:
           key: v1-gems-{{ checksum "Gemfile.lock" }}
@@ -43,10 +45,11 @@ jobs:
       # Try to restore CocoaPods dependencies
       - restore_cache:
           keys:
-          - v2-pods-{{ checksum "Podfile.lock" }}
-          - v2-pods-
-      - run: bundle exec pod check || curl -sS https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf
+            - v2-pods-{{ checksum "Podfile.lock" }}
+            - v2-pods-
+
       - run: bundle exec pod check || bundle exec pod install --verbose
+
       - save_cache:
           key: v2-pods-{{ checksum "Podfile.lock" }}
           paths:
@@ -55,16 +58,16 @@ jobs:
       # Restore the derived data cache (to speed up CI compile times), run the tests, and store the cache
       - restore_cache:
           keys:
-          - v1-derived-{{ .Branch }}
-          - v1-derived-
-      - run: 
+            - v1-derived-{{ .Branch }}
+            - v1-derived-
+      - run:
           name: Run tests
-          command: set -o pipefail && xcodebuild -destination "name=iPad Air 2,OS=11.2" -scheme "Kiosk" -workspace "Kiosk.xcworkspace" -derivedDataPath derived_data build | xcpretty --color
+          command: set -o pipefail && xcodebuild -destination "name=iPad Air 2,OS=11.2" -scheme "Kiosk" -workspace "Kiosk.xcworkspace" -derivedDataPath derived_data build test | xcpretty --color
       - save_cache:
           key: v1-derived-{{ .Branch }}
           paths:
-          - derived_data
-      
+            - derived_data
+
       # Teardown
       # Save the Xcode activity log
       - run: find $HOME/Library/Developer/Xcode/DerivedData -name '*.xcactivitylog' -exec cp {} $CIRCLE_ARTIFACTS/xcactivitylog \; || true

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,73 +1,82 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.0)
+    CFPropertyList (3.0.2)
     RubyInline (3.12.4)
       ZenTest (~> 4.3)
     ZenTest (4.12.0)
-    activesupport (4.2.10)
+    activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
+    algoliasearch (1.27.1)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
     atomos (0.1.3)
     aws-sdk-v1 (1.67.0)
       json (~> 1.4)
       nokogiri (~> 1)
     babosa (1.0.2)
-    claide (1.0.2)
-    cocoapods (1.5.3)
+    claide (1.0.3)
+    cocoapods (1.9.1)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.5.3)
-      cocoapods-deintegrate (>= 1.0.2, < 2.0)
-      cocoapods-downloader (>= 1.2.0, < 2.0)
+      cocoapods-core (= 1.9.1)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.3.0, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (~> 2.0.1)
+      fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.6.5)
+      molinillo (~> 0.6.6)
       nap (~> 1.0)
-      ruby-macho (~> 1.1)
-      xcodeproj (>= 1.5.7, < 2.0)
+      ruby-macho (~> 1.4)
+      xcodeproj (>= 1.14.0, < 2.0)
     cocoapods-check (1.0.2)
       cocoapods (~> 1.0)
-    cocoapods-core (1.5.3)
+    cocoapods-core (1.9.1)
       activesupport (>= 4.0.2, < 6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.2)
-    cocoapods-downloader (1.2.2)
+      netrc (~> 0.11)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.4)
+    cocoapods-downloader (1.3.0)
     cocoapods-keys (2.0.6)
       dotenv
       osx_keychain
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
-    cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.3.1)
+    cocoapods-stats (1.1.0)
+    cocoapods-trunk (1.4.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
-    cocoapods-try (1.1.0)
+    cocoapods-try (1.2.0)
     colored (1.2)
     colored2 (3.1.2)
     commander-fastlane (4.4.6)
       highline (~> 1.7.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.6)
     declarative (0.0.10)
     declarative-option (0.1.0)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.5.0)
     emoji_regex (0.1.1)
     escape (0.0.4)
+    ethon (0.12.0)
+      ffi (>= 1.3.0)
     excon (0.62.0)
     faraday (0.15.3)
       multipart-post (>= 1.2, < 3)
@@ -113,7 +122,8 @@ GEM
       xcodeproj (>= 1.6.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fourflusher (2.0.1)
+    ffi (1.12.2)
+    fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     google-api-client (0.23.9)
@@ -145,7 +155,7 @@ GEM
     mime-types-data (3.2018.0812)
     mini_magick (4.5.1)
     mini_portile2 (2.3.0)
-    minitest (5.11.3)
+    minitest (5.14.0)
     molinillo (0.6.6)
     multi_json (1.13.1)
     multi_xml (0.6.0)
@@ -168,7 +178,7 @@ GEM
       uber (< 0.2.0)
     retriable (3.1.2)
     rouge (2.0.7)
-    ruby-macho (1.3.1)
+    ruby-macho (1.4.0)
     rubyzip (1.2.2)
     sbconstants (1.2.0)
     second_curtain (0.6.0)
@@ -192,15 +202,17 @@ GEM
     tty-screen (0.6.5)
     tty-spinner (0.8.0)
       tty-cursor (>= 0.5.0)
-    tzinfo (1.2.5)
+    typhoeus (1.3.1)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
     unicode-display_width (1.4.0)
     word_wrap (1.0.0)
-    xcodeproj (1.7.0)
+    xcodeproj (1.16.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

diff --git a/Kiosk.xcodeproj/project.pbxproj b/Kiosk.xcodeproj/project.pbxproj
@@ -1088,7 +1088,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-KioskTests/Pods-KioskTests-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-KioskTests/Pods-KioskTests-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
 				"${BUILT_PRODUCTS_DIR}/FBSnapshotTestCase/FBSnapshotTestCase.framework",
 				"${BUILT_PRODUCTS_DIR}/Forgeries/Forgeries.framework",
@@ -1111,7 +1111,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-KioskTests/Pods-KioskTests-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-KioskTests/Pods-KioskTests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		22C6B74474A2FC89BCBEA1C5 /* [CP] Check Pods Manifest.lock */ = {
@@ -1138,7 +1138,8 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-Kiosk/Pods-Kiosk-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-Kiosk/Pods-Kiosk-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/Keys/Keys.framework",
 				"${BUILT_PRODUCTS_DIR}/ARAnalytics/ARAnalytics.framework",
 				"${BUILT_PRODUCTS_DIR}/ARCollectionViewMasonryLayout/ARCollectionViewMasonryLayout.framework",
 				"${BUILT_PRODUCTS_DIR}/ARTiledImageView/ARTiledImageView.framework",
@@ -1155,7 +1156,6 @@
 				"${BUILT_PRODUCTS_DIR}/FLKAutoLayout/FLKAutoLayout.framework",
 				"${BUILT_PRODUCTS_DIR}/HockeySDK-Source/HockeySDK_Source.framework",
 				"${BUILT_PRODUCTS_DIR}/ISO8601DateFormatter/ISO8601DateFormatter.framework",
-				"${BUILT_PRODUCTS_DIR}/Keys/Keys.framework",
 				"${BUILT_PRODUCTS_DIR}/Moya/Moya.framework",
 				"${BUILT_PRODUCTS_DIR}/NJKWebViewProgress/NJKWebViewProgress.framework",
 				"${BUILT_PRODUCTS_DIR}/NSObject+Rx/NSObject_Rx.framework",
@@ -1175,6 +1175,7 @@
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Keys.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ARAnalytics.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ARCollectionViewMasonryLayout.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ARTiledImageView.framework",
@@ -1191,7 +1192,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FLKAutoLayout.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HockeySDK_Source.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ISO8601DateFormatter.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Keys.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Moya.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NJKWebViewProgress.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NSObject_Rx.framework",
@@ -1211,7 +1211,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Kiosk/Pods-Kiosk-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Kiosk/Pods-Kiosk-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

diff --git a/Podfile b/Podfile
@@ -1,5 +1,5 @@
-source 'https://github.com/CocoaPods/Specs.git'
 source 'https://github.com/artsy/Specs.git'
+source 'https://cdn.cocoapods.org/'
 
 plugin 'cocoapods-keys', {
   :project => 'Eidolon',

diff --git a/Podfile.lock b/Podfile.lock
@@ -20,9 +20,9 @@ PODS:
     - "Artsy+UIColors (~> 3.0)"
     - "Artsy+UIFonts"
   - Artsy-UIButtons (2.1.0):
-    - Artsy+UIColors (~> 3.0)
-    - Artsy+UIFonts
-    - UIView+BooleanAnimations
+    - "Artsy+UIColors (~> 3.0)"
+    - "Artsy+UIFonts"
+    - "UIView+BooleanAnimations"
   - CardFlight-v4 (4.3.1)
   - DZNWebViewController (2.0):
     - NJKWebViewProgress (~> 0.2)
@@ -125,19 +125,20 @@ DEPENDENCIES:
   - XNGMarkdownParser
 
 SPEC REPOS:
+  https://cdn.cocoapods.org/:
+    - CardFlight-v4
   https://github.com/artsy/Specs.git:
     - "Artsy+UIColors"
     - "Artsy+UIFonts"
     - "Artsy+UILabels"
     - Artsy-UIButtons
-  https://github.com/cocoapods/specs.git:
+  https://github.com/CocoaPods/Specs.git:
     - Action
     - Alamofire
     - Analytics
     - ARAnalytics
     - ARCollectionViewMasonryLayout
     - ARTiledImageView
-    - CardFlight
     - ECPhoneNumberFormatter
     - FBSnapshotTestCase
     - FLKAutoLayout
@@ -227,6 +228,6 @@ SPEC CHECKSUMS:
   "UIView+BooleanAnimations": a760be9a066036e55f298b7b7350a6cb14cfcd97
   XNGMarkdownParser: aed98c14f0c0eb20064184ddf9bac26c482722b2
 
-PODFILE CHECKSUM: 9ab3f08861431cedc335a74566f4ea088dff3a0b
+PODFILE CHECKSUM: ce10ff768689cf9fdf33a44347efc78cc4d39c58
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.9.1