CocoaPods 1.7.0 beta

.circleci/config.yml

@@ -114,26 +114,26 @@ 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-checkdeploy:
     jobs:
+      - check-deploy
       - lint
       - spm-linux-build-and-test
       - spm-mac-build-and-test
       - xcode-build-and-test
-      - check-deploy:
-          requires:
-            - lint
-            - spm-linux-build-and-test
-            - spm-mac-build-and-test
-            - xcode-build-and-test

CHANGELOG.md

@@ -21,6 +21,9 @@ _None_
 * Update to SwiftLint 0.31.0 and enable some extra SwiftLint rules.  
   [David Jennes](https://github.com/djbe)
   [#116](https://github.com/SwiftGen/StencilSwiftKit/pull/116)
+* Updated to CocoaPods 1.7.0 (Beta 1).  
+  [David Jennes](https://github.com/djbe)
+  [#118](https://github.com/SwiftGen/StencilSwiftKit/pull/118)
 
 ## 2.7.2
 

Gemfile

@@ -10,7 +10,7 @@ end
 
 # In addition to :build, for contributing
 group :development do
-	gem 'cocoapods', '~> 1.6.0'
+	gem 'cocoapods', '~> 1.7.0.beta.1'
 	gem 'rubocop', '~> 0.65'
 end
 

Gemfile.lock

@@ -12,11 +12,11 @@ GEM
     ast (2.4.0)
     atomos (0.1.3)
     claide (1.0.2)
-    cocoapods (1.6.1)
+    cocoapods (1.7.0.beta.1)
       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.7.0.beta.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)
@@ -31,7 +31,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (~> 1.4)
       xcodeproj (>= 1.8.1, < 2.0)
-    cocoapods-core (1.6.1)
+    cocoapods-core (1.7.0.beta.1)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
@@ -104,7 +104,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.6.0)
+  cocoapods (~> 1.7.0.beta.1)
   octokit (~> 4.13)
   rake (~> 12.3)
   rubocop (~> 0.65)

Podfile

@@ -1,7 +1,12 @@
+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'
+source 'https://cdn.jsdelivr.net/cocoa/'
 use_frameworks!
-
-raise 'Please use bundle exec to run the pod command' unless defined?(Bundler)
+workspace 'StencilSwiftKit.xcworkspace'
 
 target 'Tests' do
   pod 'StencilSwiftKit', path: '.'

Podfile.lock

@@ -23,9 +23,9 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   PathKit: 273f59a38e3218eb95abd9f6a61730a8bcfd2f06
   Stencil: b5128a0a43ece9225db5cbd94d6569fe6fba609b
-  StencilSwiftKit: 9ebd42556b6c7396440f286b6c9aca1549c963ff
+  StencilSwiftKit: f37c5a91261894ffe8a0f10e3159d528856d7d70
   SwiftLint: 7a0227733d786395817373b2d0ca799fd0093ff3
 
-PODFILE CHECKSUM: ea156eb15e31a283c83a103d9155c8b32b3598c1
+PODFILE CHECKSUM: 18c6846c7fb0e041a27880c14aaaa350cbfa3169
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.7.0.beta.1