[platform] Update dependencies (#122)

* [platform] Update dependencies * Update to next major version of SwiftCLI * Update tools version for devtools * Revert "Update to next major version of SwiftCLI" This reverts commit 4229dca. * Update gems * Update circle requirements * Add swiftpm to gitignore * Start using mint to manage tools * Correct make dir * Update snapshot-testing * Use swift test directly for debugging * Use swift build/run vs make * Add verbose for debugging * Run lint on mac * Use git/make * Update resolved; add hack to ensure test target builds
namolnad · Feb 15, 2021 · a7a2b36 · a7a2b36
1 parent 97e9959
commit a7a2b36
Show file tree

Hide file tree

Showing 12 changed files with 126 additions and 179 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,15 +4,15 @@ executors:
 
   mac:
     macos:
-      xcode: "10.2.0"
+      xcode: "12.3.0"
 
   go:
     docker:
       - image: circleci/golang:1.8
 
   linux:
     docker:
-      - image: norionomura/swift:423
+      - image: norionomura/swift:532
 
 commands:
 
@@ -96,43 +96,30 @@ jobs:
           name: Publish release to GitHub
 
   swiftlint:
-    executor: linux
+    executor: mac
     parameters:
       lint-cache-dir:
         default: lint/cache
         type: string
       lint-results-dir:
         default: build/reports/lint
         type: string
-      lint-bin:
-        default: .build/debug/swiftlint
-        type: string
     steps:
       - checkout
       - restore_cache:
           keys:
             - v{{ .Environment.CACHE_VERSION }}-lint-cache-{{ arch }}-{{ .Branch }}
             - v{{ .Environment.CACHE_VERSION }}-lint-cache-{{ arch }}
           name: Restore lint cache
-      - restore_cache:
-          keys:
-            - v{{ .Environment.CACHE_VERSION }}-build-cache-{{ arch }}-{{ checksum "Package.resolved" }}
-          name: Restore bin cache
       - run: mkdir -p << parameters.lint-cache-dir >> << parameters.lint-results-dir >>
       - run:
           command: |
-            executable=$(echo '<< parameters.lint-bin >>')
-            if ! [ $(command -v $executable) ]; then
-              executable='swift run --package-path .devtools swiftlint'
-            fi
-
-            eval $executable lint --strict --reporter junit --cache-path << parameters.lint-cache-dir >> | tee << parameters.lint-results-dir >>/results.xml
+            git clone https://github.com/yonaskolb/Mint.git
+            make -C Mint
+      - run:
+          command: |
+            mint run swiftlint swiftlint --strict --reporter junit --cache-path << parameters.lint-cache-dir >> | tee << parameters.lint-results-dir >>/results.xml
           name: Lint
-      - save_cache:
-          key: v{{ .Environment.CACHE_VERSION }}-build-cache-{{ arch }}-{{ checksum "Package.resolved" }}
-          paths:
-            - << parameters.lint-bin >>
-          name: Save bin cache
       - save_cache:
           key: v{{ .Environment.CACHE_VERSION }}-lint-cache-{{ arch }}-{{ .Branch }}
           paths:
@@ -183,7 +170,7 @@ jobs:
       - run: mkdir -p << parameters.test-results-dir >>
       - run:
           name: Run tests
-          command: make test
+          command: FINCH_TESTS=1 swift test || FINCH_TESTS=1 swift test || FINCH_TESTS=1 swift test
       - store_test_results:
           path: << parameters.test-results-dir >>
 

diff --git a/.devtools/Package.resolved b/.devtools/Package.resolved
diff --git a/.devtools/Package.swift b/.devtools/Package.swift
diff --git a/.devtools/Tools.swift b/.devtools/Tools.swift
diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,7 @@ test_output/*
 .build/
 Finch.xcodeproj/
 *.pkg
+.swiftpm
 
 # Build number file will be generated on build/release; Don't capture in VCS
 Sources/Finch/App/BuildNumber.swift
diff --git a/Brewfile b/Brewfile
@@ -0,0 +1 @@
+brew 'mint'
diff --git a/Brewfile.lock.json b/Brewfile.lock.json
@@ -0,0 +1,39 @@
+{
+  "entries": {
+    "brew": {
+      "mint": {
+        "version": "0.16.0",
+        "bottle": {
+          "cellar": ":any_skip_relocation",
+          "prefix": "/usr/local",
+          "files": {
+            "arm64_big_sur": {
+              "url": "https://homebrew.bintray.com/bottles/mint-0.16.0.arm64_big_sur.bottle.tar.gz",
+              "sha256": "eaf4c91e17438d0968ff29a6429c55f93c0aa02614f2c3f7a1a4b106375dd085"
+            },
+            "big_sur": {
+              "url": "https://homebrew.bintray.com/bottles/mint-0.16.0.big_sur.bottle.tar.gz",
+              "sha256": "599c2482d15b729dc72ffa23d38599d551a42b70b81079b9a573cd91bc78d8d0"
+            },
+            "catalina": {
+              "url": "https://homebrew.bintray.com/bottles/mint-0.16.0.catalina.bottle.tar.gz",
+              "sha256": "376d67667e9003d503368e39d89a2592dd91daec615310bb2fad3d9ee971d8a8"
+            }
+          }
+        }
+      }
+    }
+  },
+  "system": {
+    "macos": {
+      "big_sur": {
+        "HOMEBREW_VERSION": "2.7.7",
+        "HOMEBREW_PREFIX": "/usr/local",
+        "Homebrew/homebrew-core": "07b6a53b00d094c92f72bff72e94dff812bd36d9",
+        "CLT": "1103.0.32.62",
+        "Xcode": "12.3",
+        "macOS": "11.2.1"
+      }
+    }
+  }
+}
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,102 +1,113 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.0)
-    activesupport (4.2.11.1)
-      i18n (~> 0.7)
+    CFPropertyList (3.0.3)
+    activesupport (5.2.4.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
     atomos (0.1.3)
-    claide (1.0.2)
-    cocoapods (1.5.3)
-      activesupport (>= 4.0.2, < 5)
+    claide (1.0.3)
+    cocoapods (1.10.1)
+      addressable (~> 2.6)
       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.10.1)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.4.0, < 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)
-    cocoapods-core (1.5.3)
-      activesupport (>= 4.0.2, < 6)
+      ruby-macho (~> 1.4)
+      xcodeproj (>= 1.19.0, < 2.0)
+    cocoapods-core (1.10.1)
+      activesupport (> 5.0, < 6)
+      addressable (~> 2.6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
+      netrc (~> 0.11)
+      public_suffix
+      typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.4)
-    cocoapods-downloader (1.2.2)
+    cocoapods-downloader (1.4.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
-    cocoapods-stats (1.1.0)
-    cocoapods-trunk (1.3.1)
+    cocoapods-trunk (1.5.0)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
-    cocoapods-try (1.1.0)
+    cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.8)
     escape (0.0.4)
-    ffi (1.10.0)
-    fourflusher (2.0.1)
+    ethon (0.12.0)
+      ffi (>= 1.3.0)
+    ffi (1.14.2)
+    fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    i18n (0.9.5)
+    httpclient (2.8.3)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    jazzy (0.9.5)
-      cocoapods (~> 1.5.3)
-      mustache (~> 1.1.0)
+    jazzy (0.13.6)
+      cocoapods (~> 1.5)
+      mustache (~> 1.1)
       open4
-      redcarpet (~> 3.4.0)
+      redcarpet (~> 3.4)
       rouge (>= 2.0.6, < 4.0)
-      sass (~> 3.6.0)
-      sqlite3 (~> 1.3.13)
+      sassc (~> 2.1)
+      sqlite3 (~> 1.3)
       xcinvoke (~> 0.3.0)
+    json (2.5.1)
     liferaft (0.0.6)
-    minitest (5.11.3)
+    minitest (5.14.3)
     molinillo (0.6.6)
-    mustache (1.1.0)
-    nanaimo (0.2.6)
+    mustache (1.1.1)
+    nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
     open4 (1.3.4)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
-      ffi (~> 1.0)
-    redcarpet (3.4.0)
+    public_suffix (4.0.6)
+    redcarpet (3.5.1)
     rouge (2.0.7)
     ruby-macho (1.4.0)
-    sass (3.6.0)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sqlite3 (1.3.13)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sqlite3 (1.4.2)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.8.2)
+    xcodeproj (1.19.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.6)
+      nanaimo (~> 0.3.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
 
 PLATFORMS
   ruby
   x86_64-darwin-17
+  x86_64-darwin-19
 
 DEPENDENCIES
   jazzy