Update CI to run jobs with Xcode 11.0 to 11.4 (realm#3168)

* Update CI to run jobs with Xcode 11.0 to 11.4 In the process, remove CI jobs running with Swift 5.0.x and indicate in the changelog that the next release will be the last one to support building with Swift 5.0.x. * fixup! Update CI to run jobs with Xcode 11.0 to 11.4 * fixup! Update CI to run jobs with Xcode 11.0 to 11.4 * fixup! Update CI to run jobs with Xcode 11.0 to 11.4 * fixup! Update CI to run jobs with Xcode 11.0 to 11.4 * Disable Swift 5.2 tests on Linux due to SR-12500 * Update ruby gems Mostly to get jazzy 0.13.2 with Swift 5.2 bug fixes.
RFBrost · Apr 4, 2020 · bc4b7d2 · bc4b7d2
1 parent da3e1a7
commit bc4b7d2
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Master
 
+This is the last release to support building with Swift 5.0.x.
+
 #### Breaking
 
 * None.

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -18,10 +18,10 @@ GEM
       cork
       nap
       open4 (~> 1.3)
-    cocoapods (1.8.4)
+    cocoapods (1.9.1)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.8.4)
+      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)
@@ -36,13 +36,15 @@ GEM
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.11.1, < 2.0)
-    cocoapods-core (1.8.4)
+      xcodeproj (>= 1.14.0, < 2.0)
+    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)
+      netrc (~> 0.11)
+      typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.4)
     cocoapods-downloader (1.3.0)
     cocoapods-plugins (1.0.0)
@@ -54,36 +56,39 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (6.1.0)
+    danger (6.3.2)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
       cork (~> 0.1)
       faraday (~> 0.9)
       faraday-http-cache (~> 2.0)
-      git (~> 1.5)
+      git (~> 1.6)
       kramdown (~> 2.0)
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
       octokit (~> 4.7)
       terminal-table (~> 1)
     escape (0.0.4)
+    ethon (0.12.0)
+      ffi (>= 1.3.0)
     faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
-    ffi (1.11.3)
+    ffi (1.12.2)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    git (1.5.0)
+    git (1.6.0)
+      rchardet (~> 1.8)
     httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jazzy (0.13.1)
+    jazzy (0.13.2)
       cocoapods (~> 1.5)
       mustache (~> 1.1)
       open4
@@ -97,21 +102,22 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liferaft (0.0.6)
-    minitest (5.13.0)
+    minitest (5.14.0)
     molinillo (0.6.6)
     multipart-post (2.1.1)
     mustache (1.1.1)
     nanaimo (0.2.6)
     nap (1.1.0)
     netrc (0.11.0)
     no_proxy_fix (0.1.2)
-    octokit (4.15.0)
+    octokit (4.18.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
     public_suffix (4.0.3)
+    rchardet (1.8.0)
     redcarpet (3.5.0)
-    rouge (3.14.0)
+    rouge (3.17.0)
     ruby-macho (1.4.0)
     sassc (2.2.1)
       ffi (~> 1.9)
@@ -122,12 +128,14 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.6)
+    typhoeus (1.3.1)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.7.0)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.14.0)
+    xcodeproj (1.15.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

diff --git a/Tests/SwiftLintFrameworkTests/LinterCacheTests.swift b/Tests/SwiftLintFrameworkTests/LinterCacheTests.swift
@@ -301,7 +301,9 @@ class LinterCacheTests: XCTestCase {
 
     // swiftlint:disable:next function_body_length
     func testDetectSwiftVersion() {
-        #if compiler(>=5.2.0)
+        #if compiler(>=5.2.1)
+            let version = "5.2.1"
+        #elseif compiler(>=5.2.0)
             let version = "5.2.0"
         #elseif compiler(>=5.1.5)
             let version = "5.1.5"

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -12,23 +12,30 @@ jobs:
         containerImage: swift:5.0
       swift51:
         containerImage: swift:5.1
+      # https://bugs.swift.org/browse/SR-12500
+      # swift52:
+      #   containerImage: swift:5.2
   container: $[ variables['containerImage'] ]
   steps:
     - script: swift test --parallel
       displayName: swift test
 
 - job: Xcode
   pool:
-    vmImage: 'macOS 10.14'
+    vmImage: 'macOS-10.15'
   strategy:
     maxParallel: 10
     matrix:
-      xcode102:
-        DEVELOPER_DIR: /Applications/Xcode_10.2.app
-      xcode103:
-        DEVELOPER_DIR: /Applications/Xcode_10.3.app
+      xcode110:
+        DEVELOPER_DIR: /Applications/Xcode_11.app
       xcode111:
         DEVELOPER_DIR: /Applications/Xcode_11.1.app
+      xcode112:
+        DEVELOPER_DIR: /Applications/Xcode_11.2.1.app
+      xcode113:
+        DEVELOPER_DIR: /Applications/Xcode_11.3.1.app
+      xcode114:
+        DEVELOPER_DIR: /Applications/Xcode_11.4.app
   steps:
     - script: git submodule update --init --recursive
       displayName: Update git submodules
@@ -49,16 +56,20 @@ jobs:
 
 - job: SwiftPM
   pool:
-    vmImage: 'macOS 10.14'
+    vmImage: 'macOS-10.15'
   strategy:
     maxParallel: 10
     matrix:
-      xcode102:
-        DEVELOPER_DIR: /Applications/Xcode_10.2.app
-      xcode103:
-        DEVELOPER_DIR: /Applications/Xcode_10.3.app
+      xcode110:
+        DEVELOPER_DIR: /Applications/Xcode_11.app
       xcode111:
         DEVELOPER_DIR: /Applications/Xcode_11.1.app
+      xcode112:
+        DEVELOPER_DIR: /Applications/Xcode_11.2.1.app
+      xcode113:
+        DEVELOPER_DIR: /Applications/Xcode_11.3.1.app
+      xcode114:
+        DEVELOPER_DIR: /Applications/Xcode_11.4.app
   steps:
     - script: |
         sw_vers
@@ -71,9 +82,9 @@ jobs:
 
 - job: CocoaPods
   pool:
-    vmImage: 'macOS 10.14'
+    vmImage: 'macOS-10.15'
   variables:
-    DEVELOPER_DIR: /Applications/Xcode_11.1.app
+    DEVELOPER_DIR: /Applications/Xcode_11.4.app
   steps:
     - script: bundle install --path vendor/bundle
       displayName: bundle install
@@ -84,18 +95,18 @@ jobs:
 
 - job: Analyze
   pool:
-    vmImage: 'macOS 10.14'
+    vmImage: 'macOS-10.15'
   variables:
-    DEVELOPER_DIR: /Applications/Xcode_11.1.app
+    DEVELOPER_DIR: /Applications/Xcode_11.4.app
   steps:
     - script: make analyze
       displayName: Run SwiftLint Analyze
 
 - job: TSan
   pool:
-    vmImage: 'macOS 10.14'
+    vmImage: 'macOS-10.15'
   variables:
-    DEVELOPER_DIR: /Applications/Xcode_11.1.app
+    DEVELOPER_DIR: /Applications/Xcode_11.4.app
   steps:
     - script: swift run --sanitize=thread swiftlint lint --lenient
       displayName: Pre-cache SwiftLint Run
@@ -106,9 +117,9 @@ jobs:
 
 - job: jazzy
   pool:
-    vmImage: 'macOS 10.14'
+    vmImage: 'macOS-10.15'
   variables:
-    DEVELOPER_DIR: /Applications/Xcode_11.3.app
+    DEVELOPER_DIR: /Applications/Xcode_11.4.app
   steps:
     - script: swift run swiftlint generate-docs
       displayName: Run swiftlint generate-docs