Update dependencies (TakeScoop#185)

Updates Cocoapods and Ruby versions to match what we use elsewhere within Scoop. Drops Xcode 9 and adds Xcode 11 support. Tweaks simulator versions in order to establish a working, reliable test configuration. Update to Swift 5 (only 1 source change made, which is to test code).
bdeneux · Jun 3, 2020 · d67dd5d · d67dd5d
1 parent 78b7fff
commit d67dd5d
Show file tree

Hide file tree

Showing 10 changed files with 187 additions and 157 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,10 +1,10 @@
-dependencies-cache-key: &dependencies-cache-key dependencies-{{ checksum "Gemfile.lock" }}-{{ checksum "Podfile.lock" }}
+dependencies-cache-key: &dependencies-cache-key dependencies--{{ checksum "Gemfile.lock" }}-{{ checksum "Podfile.lock" }}
 
 version: 2
 jobs:
   dependencies:
     macos:
-      xcode: "10.0.0"
+      xcode: "11.4.0"
     environment:
       LC_ALL: en_US.UTF-8
       LANG: en_US.UTF-8
@@ -20,10 +20,7 @@ jobs:
       - run:
           name: Install Cocoapods dependencies
           command: |
-              function pod_install {
-                  curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf
-                  bundle exec pod install
-              }
+              bundle exec pod install
               diff ./Podfile.lock ./Pods/Manifest.lock > /dev/null || pod_install
       - save_cache:
           key: *dependencies-cache-key
@@ -32,7 +29,7 @@ jobs:
             - Pods/
   lint:
     macos:
-      xcode: "10.0.0"
+      xcode: "11.4.0"
     environment:
       LC_ALL: en_US.UTF-8
       LANG: en_US.UTF-8
@@ -43,9 +40,9 @@ jobs:
       - restore_cache:
           key: *dependencies-cache-key
       - run: bundle exec fastlane lint
-  test-xcode9:
+  test-xcode10:
     macos:
-      xcode: "9.4.1"
+      xcode: "10.3.0"
     environment:
       LC_ALL: en_US.UTF-8
       LANG: en_US.UTF-8
@@ -56,11 +53,16 @@ jobs:
       - restore_cache:
           key: *dependencies-cache-key
       - run: instruments -s devices
+      - run: xcodebuild -sdk -version
+      # Some different versions are installed on the Xcode 10 server, so we need to re-install ruby gems.
+      - run:
+          name: Install Ruby dependencies
+          command: bundle check || bundle install --jobs 4 --retry 3
       - run: bundle exec fastlane test_carthage
-      - run: FASTLANE_EXPLICIT_OPEN_SIMULATOR=2 bundle exec fastlane test_xcode9 --verbose
-  test-xcode10:
+      - run: FASTLANE_EXPLICIT_OPEN_SIMULATOR=2 bundle exec fastlane test_xcode10 --verbose
+  test-xcode11:
     macos:
-      xcode: "10.0.0"
+      xcode: "11.4.0"
     environment:
       LC_ALL: en_US.UTF-8
       LANG: en_US.UTF-8
@@ -71,8 +73,9 @@ jobs:
       - restore_cache:
           key: *dependencies-cache-key
       - run: instruments -s devices
+      - run: xcodebuild -sdk -version
       - run: bundle exec fastlane test_carthage
-      - run: FASTLANE_EXPLICIT_OPEN_SIMULATOR=2 bundle exec fastlane test_xcode10 --verbose
+      - run: FASTLANE_EXPLICIT_OPEN_SIMULATOR=2 bundle exec fastlane test_xcode11 --verbose
 workflows:
   version: 2
   build-and-deploy:
@@ -81,10 +84,10 @@ workflows:
       - lint:
           requires:
             - dependencies
-      - test-xcode9:
+      - test-xcode10:
           requires:
             - dependencies
-      - test-xcode10:
+      - test-xcode11:
           requires:
             - dependencies
 
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.4.4
+2.6.3
diff --git a/CarthageIntegrationTest/CarthageIntegrationTest.xcodeproj/project.pbxproj b/CarthageIntegrationTest/CarthageIntegrationTest.xcodeproj/project.pbxproj
@@ -111,6 +111,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = C0646A4C1CAF644800587FF1;
@@ -183,7 +184,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -226,7 +227,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -252,12 +253,13 @@
 				);
 				INFOPLIST_FILE = CarthageIntegrationTest/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.loisdiqual.CarthageIntegrationTest;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -277,11 +279,12 @@
 				);
 				INFOPLIST_FILE = CarthageIntegrationTest/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.loisdiqual.CarthageIntegrationTest;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'cocoapods', '1.5.0'
-gem 'fastlane'
+gem 'cocoapods', '1.9.1'
+gem 'fastlane', '2.131.0'