Update to PMK6

mxcl · mxcl · commit 4b92fa03b145 · 2018-02-12T17:34:08.000-05:00
Fix compilation of UIViewPropertyAnimator extension. It needs iOS 10.

Delete PMKAlertController; this was an ill-advised addition. Instead we recommend not using promises or using the standard Promise initializer specializing the promise for each individual circumstance.
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "mxcl/PromiseKit" ~> 5.0
+github "mxcl/PromiseKit" ~> 6.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "mxcl/PromiseKit" "5.0.3"
+github "mxcl/PromiseKit" "6.0.0"
diff --git a/PMKUIKit.xcodeproj/project.pbxproj b/PMKUIKit.xcodeproj/project.pbxproj
@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		6304D6FE1D5F986A00CE6C99 /* PMKUIKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 6304D6FD1D5F986A00CE6C99 /* PMKUIKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		630B2E161D5D0B3200DC10E9 /* TestUIImagePickerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 630B2DF71D5D0AD400DC10E9 /* TestUIImagePickerController.swift */; };
+		632B573520324C4C00FCD5E1 /* UIViewPropertyAnimator+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 632B573420324C4C00FCD5E1 /* UIViewPropertyAnimator+Promise.swift */; };
 		6332142B1D83CD17009F67CE /* TestUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6332142A1D83CD17009F67CE /* TestUIView.swift */; };
 		637E2C841D5C2E0B0043E370 /* UIView+AnyPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = 637E2C771D5C2E0B0043E370 /* UIView+AnyPromise.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		637E2C851D5C2E0B0043E370 /* UIView+AnyPromise.m in Sources */ = {isa = PBXBuildFile; fileRef = 637E2C781D5C2E0B0043E370 /* UIView+AnyPromise.m */; };
@@ -77,6 +78,7 @@
 		630B2DF51D5D0AD400DC10E9 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "UITests/Default-568h@2x.png"; sourceTree = "<group>"; };
 		630B2DF71D5D0AD400DC10E9 /* TestUIImagePickerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TestUIImagePickerController.swift; path = UITests/TestUIImagePickerController.swift; sourceTree = "<group>"; };
 		630B2E131D5D0AF500DC10E9 /* PMKUIUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PMKUIUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		632B573420324C4C00FCD5E1 /* UIViewPropertyAnimator+Promise.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewPropertyAnimator+Promise.swift"; sourceTree = "<group>"; };
 		6332142A1D83CD17009F67CE /* TestUIView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TestUIView.swift; path = Tests/TestUIView.swift; sourceTree = SOURCE_ROOT; };
 		637E2C771D5C2E0B0043E370 /* UIView+AnyPromise.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIView+AnyPromise.h"; path = "Sources/UIView+AnyPromise.h"; sourceTree = SOURCE_ROOT; };
 		637E2C781D5C2E0B0043E370 /* UIView+AnyPromise.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIView+AnyPromise.m"; path = "Sources/UIView+AnyPromise.m"; sourceTree = SOURCE_ROOT; };
@@ -173,6 +175,7 @@
 				637E2C7A1D5C2E0B0043E370 /* UIViewController+AnyPromise.h */,
 				637E2C7B1D5C2E0B0043E370 /* UIViewController+AnyPromise.m */,
 				63A6867E1D88E93300D1C66B /* UIImagePickerController+Promise.swift */,
+				632B573420324C4C00FCD5E1 /* UIViewPropertyAnimator+Promise.swift */,
 			);
 			path = Sources;
 			sourceTree = SOURCE_ROOT;
@@ -390,6 +393,7 @@
 				63A686811D88E93300D1C66B /* UIImagePickerController+Promise.swift in Sources */,
 				637E2C861D5C2E0B0043E370 /* UIView+Promise.swift in Sources */,
 				637E2C851D5C2E0B0043E370 /* UIView+AnyPromise.m in Sources */,
+				632B573520324C4C00FCD5E1 /* UIViewPropertyAnimator+Promise.swift in Sources */,
 				637E2C881D5C2E0B0043E370 /* UIViewController+AnyPromise.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/Sources/PMKAlertController.swift b/Sources/PMKAlertController.swift
diff --git a/Sources/UIView+Promise.swift b/Sources/UIView+Promise.swift
@@ -41,22 +41,22 @@ public extension UIView {
      whether or not the animations actually finished.
     */
     static func animate(_: PMKNamespacer, duration: TimeInterval, delay: TimeInterval = 0, options: UIViewAnimationOptions = [], animations: @escaping () -> Void) -> Guarantee<Bool> {
-        return Guarantee(.pending) { animate(withDuration: duration, delay: delay, options: options, animations: animations, completion: $0) }
+        return Guarantee { animate(withDuration: duration, delay: delay, options: options, animations: animations, completion: $0) }
     }
 
     static func animate(_: PMKNamespacer, duration: TimeInterval, delay: TimeInterval, usingSpringWithDamping damping: CGFloat, initialSpringVelocity: CGFloat, options: UIViewAnimationOptions = [], animations: @escaping () -> Void) -> Guarantee<Bool> {
-        return Guarantee(.pending) { animate(withDuration: duration, delay: delay, usingSpringWithDamping: damping, initialSpringVelocity: initialSpringVelocity, options: options, animations: animations, completion: $0) }
+        return Guarantee { animate(withDuration: duration, delay: delay, usingSpringWithDamping: damping, initialSpringVelocity: initialSpringVelocity, options: options, animations: animations, completion: $0) }
     }
     
     static func transition(_: PMKNamespacer, with view: UIView, duration: TimeInterval, options: UIViewAnimationOptions = [], animations: (() -> Void)?) -> Guarantee<Bool> {
-        return Guarantee(.pending) { transition(with: view, duration: duration, options: options, animations: animations, completion: $0) }
+        return Guarantee { transition(with: view, duration: duration, options: options, animations: animations, completion: $0) }
     }
                
     static func transition(_: PMKNamespacer, from: UIView, to: UIView, duration: TimeInterval, options: UIViewAnimationOptions = []) -> Guarantee<Bool> {
-        return Guarantee(.pending) { transition(from: from, to: to, duration: duration, options: options, completion: $0) }
+        return Guarantee { transition(from: from, to: to, duration: duration, options: options, completion: $0) }
     }
 
     static func perform(_: PMKNamespacer, animation: UISystemAnimation, on views: [UIView], options: UIViewAnimationOptions = [], animations: (() -> Void)?) -> Guarantee<Bool> {
-        return Guarantee(.pending) { perform(animation, on: views, options: options, animations: animations, completion: $0) }
+        return Guarantee { perform(animation, on: views, options: options, animations: animations, completion: $0) }
     }
 }
diff --git a/Sources/UIViewPropertyAnimator+Promise.swift b/Sources/UIViewPropertyAnimator+Promise.swift
@@ -1,9 +1,12 @@
+#if !PMKCocoaPods
 import PromiseKit
+#endif
 import UIKit
 
+@available(iOS 10, tvOS 10, *)
 public extension UIViewPropertyAnimator {
     func startAnimation(_: PMKNamespacer) -> Guarantee<UIViewAnimatingPosition> {
-        return Guarantee(.pending) {
+        return Guarantee {
             addCompletion($0)
             startAnimation()
         }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "mxcl/PromiseKit" ~> 5.0`
	`1`	`+github "mxcl/PromiseKit" ~> 6.0`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "mxcl/PromiseKit" "5.0.3"`
	`1`	`+github "mxcl/PromiseKit" "6.0.0"`
Original file line number	Diff line number	Diff line change
`@@ -41,22 +41,22 @@ public extension UIView {`
`41`	`41`	`whether or not the animations actually finished.`
`42`	`42`	`*/`
`43`	`43`	`static func animate(_: PMKNamespacer, duration: TimeInterval, delay: TimeInterval = 0, options: UIViewAnimationOptions = [], animations: @escaping () -> Void) -> Guarantee<Bool> {`
`44`		`- return Guarantee(.pending) { animate(withDuration: duration, delay: delay, options: options, animations: animations, completion: $0) }`
	`44`	`+ return Guarantee { animate(withDuration: duration, delay: delay, options: options, animations: animations, completion: $0) }`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`static func animate(_: PMKNamespacer, duration: TimeInterval, delay: TimeInterval, usingSpringWithDamping damping: CGFloat, initialSpringVelocity: CGFloat, options: UIViewAnimationOptions = [], animations: @escaping () -> Void) -> Guarantee<Bool> {`
`48`		`- return Guarantee(.pending) { animate(withDuration: duration, delay: delay, usingSpringWithDamping: damping, initialSpringVelocity: initialSpringVelocity, options: options, animations: animations, completion: $0) }`
	`48`	`+ return Guarantee { animate(withDuration: duration, delay: delay, usingSpringWithDamping: damping, initialSpringVelocity: initialSpringVelocity, options: options, animations: animations, completion: $0) }`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`static func transition(_: PMKNamespacer, with view: UIView, duration: TimeInterval, options: UIViewAnimationOptions = [], animations: (() -> Void)?) -> Guarantee<Bool> {`
`52`		`- return Guarantee(.pending) { transition(with: view, duration: duration, options: options, animations: animations, completion: $0) }`
	`52`	`+ return Guarantee { transition(with: view, duration: duration, options: options, animations: animations, completion: $0) }`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`static func transition(_: PMKNamespacer, from: UIView, to: UIView, duration: TimeInterval, options: UIViewAnimationOptions = []) -> Guarantee<Bool> {`
`56`		`- return Guarantee(.pending) { transition(from: from, to: to, duration: duration, options: options, completion: $0) }`
	`56`	`+ return Guarantee { transition(from: from, to: to, duration: duration, options: options, completion: $0) }`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`static func perform(_: PMKNamespacer, animation: UISystemAnimation, on views: [UIView], options: UIViewAnimationOptions = [], animations: (() -> Void)?) -> Guarantee<Bool> {`
`60`		`- return Guarantee(.pending) { perform(animation, on: views, options: options, animations: animations, completion: $0) }`
	`60`	`+ return Guarantee { perform(animation, on: views, options: options, animations: animations, completion: $0) }`
`61`	`61`	`}`
`62`	`62`	`}`