Upgrade Pod dependencies and Swift version to 5.0 (#131)

Also fixed some iOS 13 and 14 behavioral changes.

Author: featherless

.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 bazel-*
 .kokoro-ios-runner
 

MotionAnimator.podspec

@@ -12,5 +12,5 @@ Pod::Spec.new do |s|
   s.public_header_files = "src/*.h"
   s.source_files = "src/*.{h,m,mm}", "src/private/*.{h,m,mm}"
 
-  s.dependency "MotionInterchange", "~> 3.0"
+  s.dependency "MotionInterchange", "~> 4.0"
 end

Podfile

@@ -1,5 +1,6 @@
 workspace 'MotionAnimator.xcworkspace'
 use_frameworks!
+platform :ios, '10.0'
 
 target "MotionAnimatorCatalog" do
   pod 'CatalogByConvention'
@@ -15,7 +16,7 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |configuration|
-      configuration.build_settings['SWIFT_VERSION'] = "3.0"
+      configuration.build_settings['SWIFT_VERSION'] = "5.0"
       if target.name.start_with?("Motion")
         configuration.build_settings['WARNING_CFLAGS'] ="$(inherited) -Wall -Wcast-align -Wconversion -Werror -Wextra -Wimplicit-atomic-properties -Wmissing-prototypes -Wno-sign-conversion -Wno-unused-parameter -Woverlength-strings -Wshadow -Wstrict-selector-match -Wundeclared-selector -Wunreachable-code -Wno-error=deprecated -Wno-error=deprecated-implementations"
       end

Podfile.lock

@@ -1,8 +1,8 @@
 PODS:
-  - CatalogByConvention (2.5.1)
+  - CatalogByConvention (2.5.2)
   - MotionAnimator (4.0.1):
-    - MotionInterchange (~> 3.0)
-  - MotionInterchange (3.0.0)
+    - MotionInterchange (~> 4.0)
+  - MotionInterchange (4.0.1)
 
 DEPENDENCIES:
   - CatalogByConvention
@@ -18,10 +18,10 @@ EXTERNAL SOURCES:
     :path: "./"
 
 SPEC CHECKSUMS:
-  CatalogByConvention: 2b58a9b64e5b1049abb5d3f8e764a551bbe843a7
-  MotionAnimator: 0ca495182cae31240fd6fd42de861b312c022987
-  MotionInterchange: 13adae439b377e31d1674cc165539d50e1d1566a
+  CatalogByConvention: ef713654160053be026fa4648dd28caf6b5ca4e1
+  MotionAnimator: 3bba97637c12c798c7ea5e28508a912641498dc5
+  MotionInterchange: d58704efd5dcd62c6535bc1081df832533a8e9b9
 
-PODFILE CHECKSUM: 3537bf01c11174928ac008c20fec4738722e96f3
+PODFILE CHECKSUM: ea67d7318ea5fbb64e106792b6249914962adb16
 
-COCOAPODS: 1.9.3
+COCOAPODS: 1.10.1

tests/unit/MotionAnimatorBehavioralTests.swift

@@ -59,7 +59,9 @@ class AnimatorBehavioralTests: XCTestCase {
     .shadowRadius: 5,
     .strokeStart: 0.2,
     .strokeEnd: 0.5,
-    .transform: CGAffineTransform(scaleX: 1.5, y: 1.5),
+    // Note: prior to iOS 14 this used to work as a CGAffineTransform. iOS 14 now only accepts
+    // CATransform3D instances when using KVO.
+    .transform: CATransform3DMakeScale(1.5, 1.5, 1.5),
     .width: 25,
     .x: 12,
     .y: 23,

tests/unit/QuartzCoreBehavioralTests.swift

@@ -84,7 +84,9 @@ class QuartzCoreBehavioralTests: XCTestCase {
       .shadowRadius: 5,
       .strokeStart: 0.2,
       .strokeEnd: 0.5,
-      .transform: CGAffineTransform(scaleX: 1.5, y: 1.5),
+      // Note: prior to iOS 14 this used to work as a CGAffineTransform. iOS 14 now only accepts
+      // CATransform3D instances when using KVO.
+      .transform: CATransform3DMakeScale(1.5, 1.5, 1.5),
       .width: 25,
       .x: 12,
       .y: 23,

tests/unit/UIKitBehavioralTests.swift

@@ -74,7 +74,9 @@ class UIKitBehavioralTests: XCTestCase {
       .position: CGPoint(x: 50, y: 20),
       .rotation: 42,
       .scale: 2.5,
-      .transform: CGAffineTransform(scaleX: 1.5, y: 1.5),
+      // Note: prior to iOS 14 this used to work as a CGAffineTransform. iOS 14 now only accepts
+      // CATransform3D instances when using KVO.
+      .transform: CATransform3DMakeScale(1.5, 1.5, 1.5),
       .width: 25,
       .x: 12,
       .y: 23,
@@ -158,12 +160,20 @@ class UIKitBehavioralTests: XCTestCase {
     ]
 
     let properties: [AnimatableKeyPath: Any]
-    if #available(iOS 11.0, *) {
+    if #available(iOS 13, *) {
+      // Shadow opacity became implicitly animatable in iOS 13.
+      var baselineWithModernSupport = baselineProperties
+      baselineWithModernSupport.removeValue(forKey: .shadowOpacity)
+      baselineWithModernSupport.removeValue(forKey: .anchorPoint)
+      baselineWithModernSupport.removeValue(forKey: .cornerRadius)
+      properties = baselineWithModernSupport
+
+    } else if #available(iOS 11.0, *) {
       // Corner radius became implicitly animatable in iOS 11.
-      var baselineWithOutCornerRadius = baselineProperties
-      baselineWithOutCornerRadius.removeValue(forKey: .anchorPoint)
-      baselineWithOutCornerRadius.removeValue(forKey: .cornerRadius)
-      properties = baselineWithOutCornerRadius
+      var baselineWithModernSupport = baselineProperties
+      baselineWithModernSupport.removeValue(forKey: .anchorPoint)
+      baselineWithModernSupport.removeValue(forKey: .cornerRadius)
+      properties = baselineWithModernSupport
 
     } else {
       properties = baselineProperties

tests/unit/UIKitEquivalencyTests.swift

@@ -67,7 +67,9 @@ class UIKitEquivalencyTests: XCTestCase {
       .shadowRadius: 5,
       .strokeStart: 0.2,
       .strokeEnd: 0.5,
-      .transform: CGAffineTransform(scaleX: 1.5, y: 1.5),
+      // Note: prior to iOS 14 this used to work as a CGAffineTransform. iOS 14 now only accepts
+      // CATransform3D instances when using KVO.
+      .transform: CATransform3DMakeScale(1.5, 1.5, 1.5),
       .x: 12,
       .y: 23,
       .z: 3,