Skip to content
This repository has been archived by the owner on Aug 30, 2023. It is now read-only.

Commit

Permalink
Merge branch 'release-candidate' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Verkoeyen committed Apr 7, 2021
2 parents 5bb0d57 + 7235cc4 commit 1fe4a9d
Show file tree
Hide file tree
Showing 18 changed files with 53 additions and 178 deletions.
12 changes: 5 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
70 changes: 0 additions & 70 deletions BUILD

This file was deleted.

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions MotionTransitioning.podspec
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
workspace 'MotionTransitioning.xcworkspace'
use_frameworks!
platform :ios, '9.0'
platform :ios, '10.0'

target "TransitionsCatalog" do
pod 'CatalogByConvention'
Expand All @@ -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
Expand Down
14 changes: 7 additions & 7 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -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
54 changes: 0 additions & 54 deletions WORKSPACE

This file was deleted.

2 changes: 1 addition & 1 deletion examples/ContextualExample.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion examples/CustomPresentationExample.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import MotionTransitioning

class CustomPresentationExampleViewController: ExampleTableViewController {

override init(style: UITableViewStyle) {
override init(style: UITableView.Style) {
super.init(style: style)

transitions = []
Expand Down
3 changes: 2 additions & 1 deletion examples/PhotoAlbumExample.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/Catalog/Catalog/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
let window = UIWindow(frame: UIScreen.main.bounds)
self.window = window

Expand Down
2 changes: 1 addition & 1 deletion examples/apps/Catalog/TestHarness/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
let window = UIWindow(frame: UIScreen.main.bounds)
self.window = window
window.rootViewController = UINavigationController(rootViewController: UIViewController())
Expand Down
18 changes: 13 additions & 5 deletions examples/apps/Catalog/TransitionsCatalog.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0810;
LastUpgradeCheck = 0900;
LastUpgradeCheck = 1240;
ORGANIZATIONNAME = Google;
TargetAttributes = {
666FAA7F1D384A6B000363DA = {
Expand Down Expand Up @@ -664,6 +664,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand All @@ -673,14 +674,17 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand All @@ -705,12 +709,12 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 10;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -719,6 +723,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand All @@ -728,14 +733,17 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand All @@ -754,10 +762,10 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 10;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
Expand Down
Loading

0 comments on commit 1fe4a9d

Please sign in to comment.