updates CocoaPods to 1.2.0 to fix linting problem

StravaKit · Feb 10, 2017 · 768e043 · 768e043
1 parent 239baa9
commit 768e043
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 25 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -60,18 +60,32 @@
       ]
     },
     {
-      "taskName": "H: Install CocoaPod Dependencies",
+      "taskName": "H: CocoaPods - Install Dependencies",
       "isBuildCommand": false,
       "args": [
         "${workspaceRoot}/scripts/tasks.sh pod-install"
       ]
     },
     {
-      "taskName": "I: Update CocoaPod Dependencies",
+      "taskName": "I: CocoaPods - Update Dependencies",
       "isBuildCommand": false,
       "args": [
         "${workspaceRoot}/scripts/tasks.sh pod-update"
       ]
+    },
+    {
+      "taskName": "J: CocoaPods - Lint Spec",
+      "isBuildCommand": false,
+      "args": [
+        "${workspaceRoot}/scripts/tasks.sh pod-spec-lint"
+      ]
+    },
+    {
+      "taskName": "K: CocoaPods - Push Trunk",
+      "isBuildCommand": false,
+      "args": [
+        "${workspaceRoot}/scripts/tasks.sh pod-trunk-push"
+      ]
     }
   ]
 }
diff --git a/Gemfile b/Gemfile
@@ -5,7 +5,7 @@ source 'https://rubygems.org'
 #gem 'cocoapods', :git => 'https://github.com/CocoaPods/CocoaPods.git', :branch => '1-1-stable'
 #gem 'cocoapods', :git => 'https://github.com/CocoaPods/CocoaPods.git', :tag => '1.1.0.rc.2'
 #gem 'cocoapods', '~> 1.0.0'
-gem 'cocoapods', '~> 1.1.0'
+gem 'cocoapods', '~> 1.2.0'
 #gem 'activesupport', '< 5'
 
 gem 'cocoapods-keys'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.3)
+    CFPropertyList (2.3.5)
     RubyInline (3.12.4)
       ZenTest (~> 4.3)
     ZenTest (4.11.1)
@@ -12,74 +12,76 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     claide (1.0.1)
-    cocoapods (1.1.1)
+    cocoapods (1.2.0)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.1, < 2.0)
-      cocoapods-core (= 1.1.1)
+      cocoapods-core (= 1.2.0)
       cocoapods-deintegrate (>= 1.0.1, < 2.0)
-      cocoapods-downloader (>= 1.1.2, < 2.0)
+      cocoapods-downloader (>= 1.1.3, < 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.1.1, < 2.0)
+      cocoapods-trunk (>= 1.1.2, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
       fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.1)
+      molinillo (~> 0.5.5)
       nap (~> 1.0)
-      xcodeproj (>= 1.3.3, < 2.0)
-    cocoapods-core (1.1.1)
+      ruby-macho (~> 0.2.5)
+      xcodeproj (>= 1.4.1, < 2.0)
+    cocoapods-core (1.2.0)
       activesupport (>= 4.0.2, < 5)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.1)
-    cocoapods-downloader (1.1.2)
-    cocoapods-keys (1.7.0)
+    cocoapods-downloader (1.1.3)
+    cocoapods-keys (2.0.0)
       dotenv
       osx_keychain
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.1.1)
+    cocoapods-trunk (1.1.2)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
     cocoapods-try (1.1.0)
     colored (1.2)
-    dotenv (2.1.1)
+    dotenv (2.2.0)
     escape (0.0.4)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
-    gh_inspector (1.0.2)
-    i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.9.1)
-    molinillo (0.5.3)
-    nanaimo (0.1.1)
+    gh_inspector (1.0.3)
+    i18n (0.8.0)
+    json (1.8.6)
+    minitest (5.10.1)
+    molinillo (0.5.6)
+    nanaimo (0.2.3)
     nap (1.1.0)
     netrc (0.7.8)
     osx_keychain (1.0.1)
       RubyInline (~> 3)
     rouge (1.11.1)
+    ruby-macho (0.2.6)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    xcodeproj (1.4.0)
+    xcodeproj (1.4.2)
       CFPropertyList (~> 2.3.3)
       activesupport (>= 3)
       claide (>= 1.0.1, < 2.0)
       colored (~> 1.2)
-      nanaimo (~> 0.1.0)
+      nanaimo (~> 0.2.3)
     xcpretty (0.2.4)
       rouge (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.1.0)
+  cocoapods (~> 1.2.0)
   cocoapods-keys
   xcodeproj
   xcpretty

diff --git a/scripts/tasks.sh b/scripts/tasks.sh
@@ -82,6 +82,16 @@ run_pod_update() {
     bundle exec pod update
 }
 
+run_pod_spec_lint() {
+    echo "Linting Podspec..."
+    bundle exec pod spec lint
+}
+
+run_pod_trunk_push() {
+    echo "Linting Podspec..."
+    bundle exec pod trunk push
+}
+
 run_setup() {
     echo "Setting up..."
     run_bundle_install
@@ -125,7 +135,13 @@ case "${Command}" in
     pod-update)
         run_pod_update
         ;;
+    pod-spec-lint)
+        run_pod_spec_lint
+        ;;
+    pod-trunk-push)
+        run_pod_trunk_push
+        ;;
     *)
-        echo "Usage: `basename $0` { build | clean | jazzy | setup | all | bundle-install | pod-install | pod-update }"
+        echo "Usage: `basename $0` { build | clean | jazzy | setup | all | bundle-install | pod-install | pod-update | pod-spec-lint | pod-trunk-push }"
         ;;
 esac