SwiftGen · AliSoftware · May 17, 2020 · Mar 1, 2019 · Mar 1, 2019 · Mar 1, 2019
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,7 +6,7 @@ defaults:
       CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
       BUNDLE_PATH: vendor/bundle
     macos:
-      xcode: "11.2.1"
+      xcode: "11.3.1"
     shell: /bin/bash --login -eo pipefail
   - &prepare-storage
     run:
@@ -143,29 +143,31 @@ jobs:
       - *restore-gems
       - *install-gems
       - *store-gems
-      - run:
-          name: Download podspec repo
-          command: curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf
+      - restore_cache:
+          keys:
+            - cocoapods-{{ checksum "Podfile.lock" }}
+            - cocoapods-
       - run:
           name: Lint podspec
           command: bundle exec rake pod:lint
+      -  save_cache:
+          key: cocoapods-{{ checksum "Podfile.lock" }}
+          paths:
+            - ~/.cocoapods
       - *store-artifacts
 
 
 workflows:
   version: 2
   lint-buildandtest-compileoutput-checkdeploy:
     jobs:
+      - check-deploy
       - lint
       - spm-build-and-test
       - xcode-build-and-test
       - compile-output:
           requires:
-            - lint
-            - spm-build-and-test
-            - xcode-build-and-test
-      - check-deploy:
-          requires:
+            - check-deploy
             - lint
             - spm-build-and-test
             - xcode-build-and-test
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.5.7
+2.6.5
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -91,6 +91,9 @@
 * Some CI fixes related to software versions.  
   [Patrick Nollet](https://github.com/PatrickNLT)
   [#645](https://github.com/SwiftGen/SwiftGen/pull/645)
+* Updated to CocoaPods 1.9.0.  
+  [David Jennes](https://github.com/djbe)
+  [#619](https://github.com/SwiftGen/SwiftGen/pull/619)
 
 ## 6.1.0
 

diff --git a/Gemfile b/Gemfile
@@ -4,19 +4,19 @@ source 'https://rubygems.org'
 
 # The bare minimum for building, e.g. in Homebrew
 group :build do
-	gem 'rake', '~> 12.3'
+	gem 'rake', '~> 13.0'
 	gem 'xcpretty'
 end
 
 # In addition to :build, for contributing
 group :development do
-	gem 'cocoapods', '~> 1.6.0'
-	gem 'rubocop', '~> 0.65'
+	gem 'cocoapods', '~> 1.9.0'
+	gem 'rubocop', '~> 0.80'
 	gem 'danger'
 end
 
 # For releasing to GitHub
 group :release do
-	gem 'octokit', '~> 4.13'
+	gem 'octokit', '~> 4.16'
 	gem 'plist', '~> 3.5'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,124 +1,142 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.0)
-    activesupport (4.2.11)
+    CFPropertyList (3.0.2)
+    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)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    algoliasearch (1.27.1)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
     ast (2.4.0)
     atomos (0.1.3)
-    claide (1.0.2)
+    claide (1.0.3)
     claide-plugins (0.9.2)
       cork
       nap
       open4 (~> 1.3)
-    cocoapods (1.6.1)
+    cocoapods (1.9.0)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.6.1)
-      cocoapods-deintegrate (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.9.0)
+      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.1, < 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.2.0, < 3.0)
+      fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.8.1, < 2.0)
-    cocoapods-core (1.6.1)
+      xcodeproj (>= 1.14.0, < 2.0)
+    cocoapods-core (1.9.0)
       activesupport (>= 4.0.2, < 6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.3)
-    cocoapods-downloader (1.2.2)
+      netrc (~> 0.11)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.4)
+    cocoapods-downloader (1.3.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.4.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.6)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (5.16.1)
+    danger (6.2.2)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
       cork (~> 0.1)
       faraday (~> 0.9)
-      faraday-http-cache (~> 1.0)
-      git (~> 1.5)
-      kramdown (~> 1.5)
+      faraday-http-cache (~> 2.0)
+      git (~> 1.6)
+      kramdown (~> 2.0)
+      kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
       octokit (~> 4.7)
       terminal-table (~> 1)
     escape (0.0.4)
-    faraday (0.15.4)
+    ethon (0.12.0)
+      ffi (>= 1.3.0)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
-    faraday-http-cache (1.3.1)
+    faraday-http-cache (2.0.0)
       faraday (~> 0.8)
-    fourflusher (2.2.0)
+    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)
-    jaro_winkler (1.5.2)
-    kramdown (1.17.0)
-    minitest (5.11.3)
+    jaro_winkler (1.5.4)
+    json (2.3.0)
+    kramdown (2.1.0)
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    minitest (5.14.0)
     molinillo (0.6.6)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     nanaimo (0.2.6)
     nap (1.1.0)
     netrc (0.11.0)
     no_proxy_fix (0.1.2)
-    octokit (4.13.0)
+    octokit (4.16.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    parallel (1.14.0)
-    parser (2.6.0.0)
+    parallel (1.19.1)
+    parser (2.7.0.3)
       ast (~> 2.4.0)
     plist (3.5.0)
-    powerpack (0.1.2)
-    psych (3.1.0)
-    public_suffix (3.0.3)
+    public_suffix (4.0.3)
     rainbow (3.0.0)
-    rake (12.3.2)
+    rake (13.0.1)
+    rchardet (1.8.0)
+    rexml (3.2.4)
     rouge (2.0.7)
-    rubocop (0.65.0)
+    rubocop (0.80.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
-      psych (>= 3.1.0)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
     ruby-macho (1.4.0)
-    ruby-progressbar (1.10.0)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
+    ruby-progressbar (1.10.1)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    typhoeus (1.3.1)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
-    unicode-display_width (1.4.1)
-    xcodeproj (1.8.1)
+    unicode-display_width (1.6.1)
+    xcodeproj (1.15.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -131,13 +149,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.6.0)
+  cocoapods (~> 1.9.0)
   danger
-  octokit (~> 4.13)
+  octokit (~> 4.16)
   plist (~> 3.5)
-  rake (~> 12.3)
-  rubocop (~> 0.65)
+  rake (~> 13.0)
+  rubocop (~> 0.80)
   xcpretty
 
 BUNDLED WITH
-   1.16.5
+   1.17.2
diff --git a/Podfile b/Podfile
@@ -1,7 +1,11 @@
+raise 'Please use bundle exec to run the pod command' unless defined?(Bundler)
+
+install! 'cocoapods',
+  :generate_multiple_pod_projects => true,
+  :incremental_installation => true
 platform :osx, '10.9'
 use_frameworks!
-
-raise 'Please use bundle exec to run the pod command' unless defined?(Bundler)
+workspace 'SwiftGen.xcworkspace'
 
 def common_pods
   podspec :path => 'SwiftGenKit.podspec'

diff --git a/Podfile.lock b/Podfile.lock
@@ -18,7 +18,7 @@ DEPENDENCIES:
   - Yams (~> 2.0.0)
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  trunk:
     - Commander
     - Kanna
     - PathKit
@@ -36,6 +36,6 @@ SPEC CHECKSUMS:
   SwiftLint: 7a0227733d786395817373b2d0ca799fd0093ff3
   Yams: cb96472112d99e4b368f8dae9ab62e8a3eb8a3f9
 
-PODFILE CHECKSUM: 408250a09fbf699c1ae50882f4bb07a353f741ca
+PODFILE CHECKSUM: dda6161bd55c9558c13cbd421772b10fb2d56c34
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.9.0