Merge branch 'release-candidate' into stable

Author: Jeff Verkoeyen

.travis.yml

@@ -7,14 +7,12 @@ env:
   - LANGUAGE=en_US.UTF-8
 matrix:
   include:
-    - osx_image: xcode9.2
-      env: COVERAGE=code_coverage SDK="iphonesimulator11.2" DESTINATION="name=iPhone 6s,OS=11.2"
-    - osx_image: xcode9.2
-      env: SDK="iphonesimulator11.2" DESTINATION="name=iPhone 6s,OS=10.3.1"
-    - osx_image: xcode9.2
-      env: SDK="iphonesimulator11.2" DESTINATION="name=iPhone 6s,OS=9.3"
+    - osx_image: xcode12.2
+      env: COVERAGE=code_coverage SDK="iphonesimulator14.2" DESTINATION="name=iPhone 6s,OS=11.4"
+    - osx_image: xcode12.2
+      env: SDK="iphonesimulator14.2" DESTINATION="name=iPhone 6s,OS=10.3.1"
 before_install:
-  - gem install cocoapods --no-rdoc --no-ri --no-document --quiet
+  - gem install cocoapods --no-document --quiet
   - pod install --repo-update
 script:
   - set -o pipefail

BUILD

@@ -1,3 +1,7 @@
+# 8.0.0
+
+This major release drops official support for iOS 9 and bazel.
+
 # 7.0.1
 
 This patch release fixes a bug on iOS 13 where the presented view controller would not be added to

CHANGELOG.md

@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
   s.name         = "MotionTransitioning"
   s.summary      = "Light-weight API for building UIViewController transitions."
-  s.version      = "7.0.1"
+  s.version      = "8.0.0"
   s.authors      = "The Material Motion Authors"
   s.license      = "Apache 2.0"
   s.homepage     = "https://github.com/material-motion/transitioning-objc"
   s.source       = { :git => "https://github.com/material-motion/transitioning-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"

MotionTransitioning.podspec

@@ -1,6 +1,6 @@
 workspace 'MotionTransitioning.xcworkspace'
 use_frameworks!
-platform :ios, '9.0'
+platform :ios, '10.0'
 
 target "TransitionsCatalog" do
   pod 'CatalogByConvention'
@@ -18,7 +18,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?("MotionTransitioning")
         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"
       end

Podfile

@@ -1,23 +1,23 @@
 PODS:
-  - CatalogByConvention (2.1.1)
-  - MotionTransitioning (7.0.0)
+  - CatalogByConvention (2.5.2)
+  - MotionTransitioning (8.0.0)
 
 DEPENDENCIES:
   - CatalogByConvention
   - MotionTransitioning (from `./`)
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  trunk:
     - CatalogByConvention
 
 EXTERNAL SOURCES:
   MotionTransitioning:
     :path: "./"
 
 SPEC CHECKSUMS:
-  CatalogByConvention: c3a5319de04250a7cd4649127fcfca5fe3322a43
-  MotionTransitioning: afdc2fb08fc6e8744dab4f160b3764c9bde59338
+  CatalogByConvention: ef713654160053be026fa4648dd28caf6b5ca4e1
+  MotionTransitioning: c54913ff269a0d93291bb113612c2da325f45f74
 
-PODFILE CHECKSUM: c1fb58e87919bf8979e1ee2b4db99797e975d789
+PODFILE CHECKSUM: d209f6834e4d16c2a6eca09a6ddcde7e50331cda
 
-COCOAPODS: 1.6.0
+COCOAPODS: 1.10.1

Podfile.lock

@@ -110,7 +110,7 @@ private class ContextualTransition: NSObject, Transition {
                                                    isAppearing: context.direction == .backward)
 
     let expand = CABasicAnimation(keyPath: "transform.scale.xy")
-    expand.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut)
+    expand.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)
     expand.fromValue = 1
     expand.toValue = 2
     addAnimationToLayer(expand, snapshotContextView.layer)

WORKSPACE

@@ -22,7 +22,7 @@ import MotionTransitioning
 
 class CustomPresentationExampleViewController: ExampleTableViewController {
 
-  override init(style: UITableViewStyle) {
+  override init(style: UITableView.Style) {
     super.init(style: style)
 
     transitions = []

examples/ContextualExample.swift

@@ -75,6 +75,7 @@ public class PhotoAlbumExampleViewController: UICollectionViewController, PhotoA
     viewController.currentPhoto = album.photos[indexPath.row]
     viewController.mdm_transitionController.transition = PhotoAlbumTransition(backDelegate: self,
                                                                           foreDelegate: viewController)
+    viewController.modalPresentationStyle = .custom
     present(viewController, animated: true)
   }
 
@@ -161,7 +162,7 @@ class PhotoAlbumViewController: UIViewController, UICollectionViewDataSource, UI
 
     navigationController?.setNavigationBarHidden(true, animated: animated)
 
-    let photoIndex = album.photos.index { $0.image == currentPhoto.image }!
+    let photoIndex = album.photos.firstIndex { $0.image == currentPhoto.image }!
     let indexPath = IndexPath(item: photoIndex, section: 0)
     collectionView.scrollToItem(at: indexPath, at: .centeredHorizontally, animated: false)
   }