[travis] Use CocoaPods ~> 1.7.0; update submodules

mxcl · Jun 11, 2019 · 1c296a8 · 1c296a8
1 parent fe1e9c5
commit 1c296a8
Show file tree

Hide file tree

Showing 22 changed files with 23 additions and 23 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -60,7 +60,7 @@ jobs:
       env: SWIFT=3.1
       cache: cocoapods
       before_install: mv .github/PromiseKit.podspec .
-      install: gem install cocoapods --pre -v 1.7.0.beta.3
+      install: gem install cocoapods -v '~> 1.7.0'
       script: pod lib lint --subspec=PromiseKit/CorePromise --fail-fast --swift-version=$SWIFT
     - <<: *pod
       osx_image: xcode9.2
@@ -166,7 +166,7 @@ jobs:
 
     - name: '`pod trunk push`'
       stage: deploy
-      install: gem install cocoapods --pre -v 1.7.0.beta.3
+      install: gem install cocoapods -v '~> 1.7.0'
       before_script: |
         mv .github/PromiseKit.podspec .
         sed -i '' "s/s.version = '0.0.1'/s.version = '$TRAVIS_TAG'/g" PromiseKit.podspec

diff --git a/Extensions/AVFoundation b/Extensions/AVFoundation
diff --git a/Extensions/Accounts b/Extensions/Accounts
diff --git a/Extensions/AddressBook b/Extensions/AddressBook
diff --git a/Extensions/Alamofire b/Extensions/Alamofire
diff --git a/Extensions/AssetsLibrary b/Extensions/AssetsLibrary
diff --git a/Extensions/Bolts b/Extensions/Bolts
diff --git a/Extensions/CloudKit b/Extensions/CloudKit
diff --git a/Extensions/CoreLocation b/Extensions/CoreLocation
diff --git a/Extensions/EventKit b/Extensions/EventKit
diff --git a/Extensions/Foundation b/Extensions/Foundation
diff --git a/Extensions/HealthKit b/Extensions/HealthKit
diff --git a/Extensions/HomeKit b/Extensions/HomeKit
diff --git a/Extensions/MapKit b/Extensions/MapKit
diff --git a/Extensions/MessagesUI b/Extensions/MessagesUI
diff --git a/Extensions/Photos b/Extensions/Photos
diff --git a/Extensions/QuartzCore b/Extensions/QuartzCore
diff --git a/Extensions/Social b/Extensions/Social
diff --git a/Extensions/StoreKit b/Extensions/StoreKit
diff --git a/Extensions/SystemConfiguration b/Extensions/SystemConfiguration
diff --git a/Extensions/UIKit b/Extensions/UIKit
diff --git a/Extensions/WatchConnectivity b/Extensions/WatchConnectivity
+35 −23		.travis.yml
+1 −1		Cartfile
+1 −1		Cartfile.resolved
+11 −8		PMKAVFoundation.xcodeproj/project.pbxproj
+1 −1		PMKAVFoundation.xcodeproj/xcshareddata/xcschemes/PMKAVFoundation.xcscheme
+36 −22		.travis.yml
+1 −1		Cartfile
+1 −1		Cartfile.resolved
+11 −10		PMKAccounts.xcodeproj/project.pbxproj
+1 −1		PMKAccounts.xcodeproj/xcshareddata/xcschemes/PMKAccounts.xcscheme
+77 −23		.travis.yml
+1 −1		Cartfile
+1 −1		Cartfile.resolved
+9 −7		PMKAssetsLibrary.xcodeproj/project.pbxproj
+1 −1		PMKAssetsLibrary.xcodeproj/xcshareddata/xcschemes/PMKAssetsLibrary.xcscheme
+0 −1		Tests/TestUIImagePickerController.swift
+87 −21		.travis.yml
+1 −1		Cartfile
+1 −1		Cartfile.resolved
+9 −8		PMKBolts.xcodeproj/project.pbxproj
+1 −1		PMKBolts.xcodeproj/xcshareddata/xcschemes/PMKBolts.xcscheme
+31 −42		.travis.yml
+1 −1		Cartfile
+9 −4		PMKCloudKit.xcodeproj/project.pbxproj
+1 −1		PMKCloudKit.xcodeproj/xcshareddata/xcschemes/PMKCloudKit.xcscheme
+8 −10		.travis.yml
+1 −1		Cartfile
+5 −3		PMKCoreLocation.xcodeproj/project.pbxproj
+1 −1		PMKCoreLocation.xcodeproj/xcshareddata/xcschemes/PMKCoreLocation.xcscheme
+5 −1		Sources/CLLocationManager+Promise.swift
+33 −23		.travis.yml
+1 −1		Cartfile
+1 −1		Cartfile.resolved
+11 −8		PMKHealthKit.xcodeproj/project.pbxproj
+1 −1		PMKHealthKit.xcodeproj/xcshareddata/xcschemes/PMKHealthKit.xcscheme
+63 −37		.travis.yml
+1 −1		Cartfile
+1 −1		Cartfile.resolved
+11 −8		PMKHomeKit.xcodeproj/project.pbxproj
+1 −1		PMKHomeKit.xcodeproj/xcshareddata/xcschemes/PMKHomeKit.xcscheme
+76 −30		.travis.yml
+1 −1		Cartfile
+1 −1		Cartfile.resolved
+11 −8		PMKMessagesUI.xcodeproj/project.pbxproj
+1 −1		PMKMessagesUI.xcodeproj/xcshareddata/xcschemes/PMKMessagesUI.xcscheme
+4 −0		Sources/MFMessageComposeViewController+Promise.swift
+69 −35		.travis.yml
+1 −1		Cartfile
+1 −1		Cartfile.resolved
+11 −8		PMKPhotos.xcodeproj/project.pbxproj
+1 −1		PMKPhotos.xcodeproj/xcshareddata/xcschemes/PMKPhotos.xcscheme