Fix remaining warnings and fully pin to iOS 10 minimum OS. (#50)
Also fixed a broken test on iOS 13 and 14.
diff --git a/MotionInterchange.podspec b/MotionInterchange.podspec
index fb0769e..fa33d1c 100644
--- a/MotionInterchange.podspec
+++ b/MotionInterchange.podspec
@@ -6,7 +6,7 @@
s.license = "Apache 2.0"
s.homepage = "https://github.com/material-motion/motion-interchange-objc"
s.source = { :git => "https://github.com/material-motion/motion-interchange-objc.git", :tag => "v" + s.version.to_s }
- s.platform = :ios, "9.0"
+ s.platform = :ios, "10.0"
s.requires_arc = true
s.public_header_files = "src/*.h"
diff --git a/Podfile b/Podfile
index 7fb1e98..d7a78df 100644
--- a/Podfile
+++ b/Podfile
@@ -1,5 +1,6 @@
workspace 'MotionInterchange.xcworkspace'
use_frameworks!
+platform :ios, '10.0'
target "MotionInterchangeCatalog" do
pod 'CatalogByConvention'
diff --git a/Podfile.lock b/Podfile.lock
index b681f9f..ae95a8b 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -1,5 +1,5 @@
PODS:
- - CatalogByConvention (2.1.1)
+ - CatalogByConvention (2.5.2)
- MotionInterchange (4.0.0)
DEPENDENCIES:
@@ -15,9 +15,9 @@
:path: "./"
SPEC CHECKSUMS:
- CatalogByConvention: c3a5319de04250a7cd4649127fcfca5fe3322a43
- MotionInterchange: 61f6994d1fe915b931e8751e3f86098729580b6c
+ CatalogByConvention: ef713654160053be026fa4648dd28caf6b5ca4e1
+ MotionInterchange: cfe99ee1e149f20f86e9a8c4be17e2f0fbefda40
-PODFILE CHECKSUM: 09090d12db5aab00a13fe82da94f338ebd03f5dc
+PODFILE CHECKSUM: aea7b8b75a397821880e2ba54fc4cf979d21cd99
-COCOAPODS: 1.9.3
+COCOAPODS: 1.10.1
diff --git a/tests/unit/CAMediaTimingFunctionTests.swift b/tests/unit/CAMediaTimingFunctionTests.swift
index ae953ec..7d721f6 100644
--- a/tests/unit/CAMediaTimingFunctionTests.swift
+++ b/tests/unit/CAMediaTimingFunctionTests.swift
@@ -21,19 +21,19 @@
func testReversalAlgorithm() {
let curve = CAMediaTimingFunction(controlPoints: 0.1, 0.2, 0.3, 0.4)
let reversed = curve.mdm_reversed()
- XCTAssertEqualWithAccuracy(curve.mdm_point1.x, 1 - reversed.mdm_point2.x, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.mdm_point1.y, 1 - reversed.mdm_point2.y, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.mdm_point2.x, 1 - reversed.mdm_point1.x, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.mdm_point2.y, 1 - reversed.mdm_point1.y, accuracy: 0.001)
+ XCTAssertEqual(curve.mdm_point1.x, 1 - reversed.mdm_point2.x, accuracy: 0.001)
+ XCTAssertEqual(curve.mdm_point1.y, 1 - reversed.mdm_point2.y, accuracy: 0.001)
+ XCTAssertEqual(curve.mdm_point2.x, 1 - reversed.mdm_point1.x, accuracy: 0.001)
+ XCTAssertEqual(curve.mdm_point2.y, 1 - reversed.mdm_point1.y, accuracy: 0.001)
}
func testReversingBezierCurveTwiceGivesSameResult() {
let curve = CAMediaTimingFunction(controlPoints: 0.1, 0.2, 0.3, 0.4)
let reversed = curve.mdm_reversed()
let reversedAgain = reversed.mdm_reversed()
- XCTAssertEqualWithAccuracy(curve.mdm_point1.x, reversedAgain.mdm_point1.x, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.mdm_point1.y, reversedAgain.mdm_point1.y, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.mdm_point2.x, reversedAgain.mdm_point2.x, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.mdm_point2.y, reversedAgain.mdm_point2.y, accuracy: 0.001)
+ XCTAssertEqual(curve.mdm_point1.x, reversedAgain.mdm_point1.x, accuracy: 0.001)
+ XCTAssertEqual(curve.mdm_point1.y, reversedAgain.mdm_point1.y, accuracy: 0.001)
+ XCTAssertEqual(curve.mdm_point2.x, reversedAgain.mdm_point2.x, accuracy: 0.001)
+ XCTAssertEqual(curve.mdm_point2.y, reversedAgain.mdm_point2.y, accuracy: 0.001)
}
}
diff --git a/tests/unit/MDMLegacyAPITests.swift b/tests/unit/MDMLegacyAPITests.swift
index 0aa3d67..43f748d 100644
--- a/tests/unit/MDMLegacyAPITests.swift
+++ b/tests/unit/MDMLegacyAPITests.swift
@@ -27,18 +27,18 @@
let traits = MDMAnimationTraits(motionTiming: timing)
- XCTAssertEqualWithAccuracy(traits.duration, timing.duration, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(traits.delay, timing.delay, accuracy: 0.001)
+ XCTAssertEqual(traits.duration, timing.duration, accuracy: 0.001)
+ XCTAssertEqual(traits.delay, timing.delay, accuracy: 0.001)
XCTAssertTrue(traits.timingCurve is CAMediaTimingFunction)
if let timingCurve = traits.timingCurve as? CAMediaTimingFunction {
- XCTAssertEqualWithAccuracy(timingCurve.mdm_point1.x, timing.curve.data.0, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(timingCurve.mdm_point1.y, timing.curve.data.1, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(timingCurve.mdm_point2.x, timing.curve.data.2, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(timingCurve.mdm_point2.y, timing.curve.data.3, accuracy: 0.001)
+ XCTAssertEqual(timingCurve.mdm_point1.x, timing.curve.data.0, accuracy: 0.001)
+ XCTAssertEqual(timingCurve.mdm_point1.y, timing.curve.data.1, accuracy: 0.001)
+ XCTAssertEqual(timingCurve.mdm_point2.x, timing.curve.data.2, accuracy: 0.001)
+ XCTAssertEqual(timingCurve.mdm_point2.y, timing.curve.data.3, accuracy: 0.001)
}
XCTAssertTrue(traits.repetition is MDMRepetitionOverTime)
if let repetition = traits.repetition as? MDMRepetitionOverTime {
- XCTAssertEqualWithAccuracy(repetition.duration, timing.repetition.amount, accuracy: 0.001)
+ XCTAssertEqual(repetition.duration, timing.repetition.amount, accuracy: 0.001)
XCTAssertEqual(repetition.autoreverses, timing.repetition.autoreverses.boolValue)
}
}
diff --git a/tests/unit/MDMModalMovementTimingTests.m b/tests/unit/MDMModalMovementTimingTests.m
index 465f9de..d5c0ff6 100644
--- a/tests/unit/MDMModalMovementTimingTests.m
+++ b/tests/unit/MDMModalMovementTimingTests.m
@@ -33,7 +33,11 @@
// We just want the first position key path animation that affects this view controller.
if (!self.presentationPositionAnimation) {
- self.presentationPositionAnimation = [self.view.layer animationForKey:@"position"];
+ UIView *iterator = self.view;
+ while (iterator != nil && self.presentationPositionAnimation == nil) {
+ self.presentationPositionAnimation = [iterator.layer animationForKey:@"position"];
+ iterator = iterator.superview;
+ }
}
}
diff --git a/tests/unit/MDMMotionCurveTests.swift b/tests/unit/MDMMotionCurveTests.swift
index 0f1fb27..7f08b80 100644
--- a/tests/unit/MDMMotionCurveTests.swift
+++ b/tests/unit/MDMMotionCurveTests.swift
@@ -21,45 +21,45 @@
func testBezierCurveData() {
let curve = MotionCurveMakeBezier(p1x: 0.1, p1y: 0.2, p2x: 0.3, p2y: 0.4)
- XCTAssertEqualWithAccuracy(curve.data.0, 0.1, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.data.1, 0.2, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.data.2, 0.3, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.data.3, 0.4, accuracy: 0.001)
+ XCTAssertEqual(curve.data.0, 0.1, accuracy: 0.001)
+ XCTAssertEqual(curve.data.1, 0.2, accuracy: 0.001)
+ XCTAssertEqual(curve.data.2, 0.3, accuracy: 0.001)
+ XCTAssertEqual(curve.data.3, 0.4, accuracy: 0.001)
}
func testBezierCurveFromTimingFunction() {
let timingFunction = CAMediaTimingFunction(controlPoints: 0.1, 0.2, 0.3, 0.4)
let curve = MotionCurve(fromTimingFunction: timingFunction)
- XCTAssertEqualWithAccuracy(curve.data.0, 0.1, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.data.1, 0.2, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.data.2, 0.3, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.data.3, 0.4, accuracy: 0.001)
+ XCTAssertEqual(curve.data.0, 0.1, accuracy: 0.001)
+ XCTAssertEqual(curve.data.1, 0.2, accuracy: 0.001)
+ XCTAssertEqual(curve.data.2, 0.3, accuracy: 0.001)
+ XCTAssertEqual(curve.data.3, 0.4, accuracy: 0.001)
}
func testSpringCurveData() {
let curve = MotionCurveMakeSpring(mass: 0.1, tension: 0.2, friction: 0.3)
- XCTAssertEqualWithAccuracy(curve.data.0, 0.1, accuracy: 0.001) // mass
- XCTAssertEqualWithAccuracy(curve.data.1, 0.2, accuracy: 0.001) // tension
- XCTAssertEqualWithAccuracy(curve.data.2, 0.3, accuracy: 0.001) // friction
- XCTAssertEqualWithAccuracy(curve.data.3, 0.0, accuracy: 0.001)
+ XCTAssertEqual(curve.data.0, 0.1, accuracy: 0.001) // mass
+ XCTAssertEqual(curve.data.1, 0.2, accuracy: 0.001) // tension
+ XCTAssertEqual(curve.data.2, 0.3, accuracy: 0.001) // friction
+ XCTAssertEqual(curve.data.3, 0.0, accuracy: 0.001)
}
func testReversedBezierCurve() {
let curve = MotionCurveMakeBezier(p1x: 0.1, p1y: 0.2, p2x: 0.3, p2y: 0.4)
let reversed = MotionCurveReversedBezier(fromMotionCurve: curve)
- XCTAssertEqualWithAccuracy(curve.data.0, 1 - reversed.data.2, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.data.1, 1 - reversed.data.3, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.data.2, 1 - reversed.data.0, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.data.3, 1 - reversed.data.1, accuracy: 0.001)
+ XCTAssertEqual(curve.data.0, 1 - reversed.data.2, accuracy: 0.001)
+ XCTAssertEqual(curve.data.1, 1 - reversed.data.3, accuracy: 0.001)
+ XCTAssertEqual(curve.data.2, 1 - reversed.data.0, accuracy: 0.001)
+ XCTAssertEqual(curve.data.3, 1 - reversed.data.1, accuracy: 0.001)
}
func testReversingBezierCurveTwiceGivesSameResult() {
let curve = MotionCurveMakeBezier(p1x: 0.1, p1y: 0.2, p2x: 0.3, p2y: 0.4)
let reversed = MotionCurveReversedBezier(fromMotionCurve: curve)
let reversedAgain = MotionCurveReversedBezier(fromMotionCurve: reversed)
- XCTAssertEqualWithAccuracy(curve.data.0, reversedAgain.data.0, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.data.1, reversedAgain.data.1, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.data.2, reversedAgain.data.2, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.data.3, reversedAgain.data.3, accuracy: 0.001)
+ XCTAssertEqual(curve.data.0, reversedAgain.data.0, accuracy: 0.001)
+ XCTAssertEqual(curve.data.1, reversedAgain.data.1, accuracy: 0.001)
+ XCTAssertEqual(curve.data.2, reversedAgain.data.2, accuracy: 0.001)
+ XCTAssertEqual(curve.data.3, reversedAgain.data.3, accuracy: 0.001)
}
}
diff --git a/tests/unit/MDMRepetitionOverTimeTests.swift b/tests/unit/MDMRepetitionOverTimeTests.swift
index f571d07..f8018ea 100644
--- a/tests/unit/MDMRepetitionOverTimeTests.swift
+++ b/tests/unit/MDMRepetitionOverTimeTests.swift
@@ -21,13 +21,13 @@
func testInitializationWithDuration() {
let repetition = MDMRepetitionOverTime(duration: 5.5)
- XCTAssertEqualWithAccuracy(repetition.duration, 5.5, accuracy: 0.001)
+ XCTAssertEqual(repetition.duration, 5.5, accuracy: 0.001)
XCTAssertFalse(repetition.autoreverses)
}
func testInitializationWithDurationAndAutoreversed() {
let repetition = MDMRepetitionOverTime(duration: 5.5, autoreverses: true)
- XCTAssertEqualWithAccuracy(repetition.duration, 5.5, accuracy: 0.001)
+ XCTAssertEqual(repetition.duration, 5.5, accuracy: 0.001)
XCTAssertTrue(repetition.autoreverses)
}
}
diff --git a/tests/unit/MDMRepetitionTests.swift b/tests/unit/MDMRepetitionTests.swift
index e90f2bb..ba76575 100644
--- a/tests/unit/MDMRepetitionTests.swift
+++ b/tests/unit/MDMRepetitionTests.swift
@@ -21,13 +21,13 @@
func testInitializationWithNumberOfRepetitions() {
let repetition = MDMRepetition(numberOfRepetitions: 5.5)
- XCTAssertEqualWithAccuracy(repetition.numberOfRepetitions, 5.5, accuracy: 0.001)
+ XCTAssertEqual(repetition.numberOfRepetitions, 5.5, accuracy: 0.001)
XCTAssertFalse(repetition.autoreverses)
}
func testInitializationWithNumberOfRepetitionsAndAutoreversed() {
let repetition = MDMRepetition(numberOfRepetitions: 5.5, autoreverses: true)
- XCTAssertEqualWithAccuracy(repetition.numberOfRepetitions, 5.5, accuracy: 0.001)
+ XCTAssertEqual(repetition.numberOfRepetitions, 5.5, accuracy: 0.001)
XCTAssertTrue(repetition.autoreverses)
}
}
diff --git a/tests/unit/MDMSpringTimingCurve.swift b/tests/unit/MDMSpringTimingCurve.swift
index 7a797ab..5446af2 100644
--- a/tests/unit/MDMSpringTimingCurve.swift
+++ b/tests/unit/MDMSpringTimingCurve.swift
@@ -21,18 +21,18 @@
func testInitializerValuesWithNoInitialVelocity() {
let curve = MDMSpringTimingCurve(mass: 0.1, tension: 0.2, friction: 0.3)
- XCTAssertEqualWithAccuracy(curve.mass, 0.1, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.tension, 0.2, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.friction, 0.3, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.initialVelocity, 0.0, accuracy: 0.001)
+ XCTAssertEqual(curve.mass, 0.1, accuracy: 0.001)
+ XCTAssertEqual(curve.tension, 0.2, accuracy: 0.001)
+ XCTAssertEqual(curve.friction, 0.3, accuracy: 0.001)
+ XCTAssertEqual(curve.initialVelocity, 0.0, accuracy: 0.001)
}
func testInitializerValuesWithInitialVelocity() {
let curve = MDMSpringTimingCurve(mass: 0.1, tension: 0.2, friction: 0.3, initialVelocity: 0.4)
- XCTAssertEqualWithAccuracy(curve.mass, 0.1, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.tension, 0.2, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.friction, 0.3, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.initialVelocity, 0.4, accuracy: 0.001)
+ XCTAssertEqual(curve.mass, 0.1, accuracy: 0.001)
+ XCTAssertEqual(curve.tension, 0.2, accuracy: 0.001)
+ XCTAssertEqual(curve.friction, 0.3, accuracy: 0.001)
+ XCTAssertEqual(curve.initialVelocity, 0.4, accuracy: 0.001)
}
@available(iOS 9.0, *)
@@ -58,11 +58,11 @@
let animation = view.layer.animation(forKey: animationKey) as? CASpringAnimation {
let curve = generator.springTimingCurve()
- XCTAssertEqualWithAccuracy(curve.mass, animation.mass, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.tension, animation.stiffness, accuracy: 0.001)
- XCTAssertEqualWithAccuracy(curve.friction, animation.damping, accuracy: 0.001)
+ XCTAssertEqual(curve.mass, animation.mass, accuracy: 0.001)
+ XCTAssertEqual(curve.tension, animation.stiffness, accuracy: 0.001)
+ XCTAssertEqual(curve.friction, animation.damping, accuracy: 0.001)
if animation.responds(to: #selector(initialVelocity)) {
- XCTAssertEqualWithAccuracy(curve.initialVelocity, animation.initialVelocity, accuracy: 0.001)
+ XCTAssertEqual(curve.initialVelocity, animation.initialVelocity, accuracy: 0.001)
}
}
}
