From b4a3012bed37e4bfb594cb81a65cc06c174feb32 Mon Sep 17 00:00:00 2001 From: Jeff Verkoeyen Date: Fri, 5 Aug 2016 10:45:56 -0700 Subject: [PATCH] Update Podfile dependencies. --- Podfile.lock | 6 +++--- examples/apps/Catalog/Catalog/AppDelegate.swift | 2 +- src/CoreAnimationMotionFamily.swift | 2 +- tests/unit/CoreAnimationTests.swift | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index ec6a751..0733c6c 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,7 +1,7 @@ PODS: - MaterialMotionCoreAnimationFamily (1.0.0): - MaterialMotionRuntime - - MaterialMotionRuntime (1.0.0) + - MaterialMotionRuntime (2.0.1) DEPENDENCIES: - MaterialMotionCoreAnimationFamily (from `./`) @@ -16,12 +16,12 @@ EXTERNAL SOURCES: CHECKOUT OPTIONS: MaterialMotionRuntime: - :commit: c02df1600b820b14a4f1faf9a5941c14a05adf4f + :commit: 2a43053b22493659cec64c2a49d5d52212ab484f :git: git@github.com:material-motion/material-motion-runtime-objc.git SPEC CHECKSUMS: MaterialMotionCoreAnimationFamily: 363b6b0343e46950478ab5487a38445cf966de57 - MaterialMotionRuntime: c1baf57914298b91634d2089d09341e6cd9f65a1 + MaterialMotionRuntime: 142f75ce2cf2682458aa9631541b8644b653ef34 PODFILE CHECKSUM: 8826d7b38972cc6eee2699702b8c1c5cc4ad1c21 diff --git a/examples/apps/Catalog/Catalog/AppDelegate.swift b/examples/apps/Catalog/Catalog/AppDelegate.swift index 5f36bd3..930199a 100644 --- a/examples/apps/Catalog/Catalog/AppDelegate.swift +++ b/examples/apps/Catalog/Catalog/AppDelegate.swift @@ -22,7 +22,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool { - let window = UIWindow(frame: UIScreen.main().bounds) + let window = UIWindow(frame: UIScreen.main.bounds) self.window = window window.rootViewController = UINavigationController(rootViewController: UIViewController()) window.makeKeyAndVisible() diff --git a/src/CoreAnimationMotionFamily.swift b/src/CoreAnimationMotionFamily.swift index 6a08b76..d5b2c13 100644 --- a/src/CoreAnimationMotionFamily.swift +++ b/src/CoreAnimationMotionFamily.swift @@ -56,7 +56,7 @@ extension CAAnimation: Plan { CATransaction.commit() } - func setDelegatedPerformanceWillStart(_ willStart: DelegatedPerformanceTokenReturnBlock, didEnd: DelegatedPerformanceTokenArgBlock) { + func setDelegatedPerformance(willStart: DelegatedPerformanceTokenReturnBlock, didEnd: DelegatedPerformanceTokenArgBlock) { self.willStart = willStart self.didEnd = didEnd } diff --git a/tests/unit/CoreAnimationTests.swift b/tests/unit/CoreAnimationTests.swift index 6e69950..618be59 100644 --- a/tests/unit/CoreAnimationTests.swift +++ b/tests/unit/CoreAnimationTests.swift @@ -32,7 +32,7 @@ class CoreAnimationTests: XCTestCase { transaction.add(plan: animation, to: view) let scheduler = Scheduler() - scheduler.commit(transaction) + scheduler.commit(transaction: transaction) let delegate = TestableSchedulerDelegate() delegate.didIdleExpectation = expectation(description: "Did idle") @@ -55,7 +55,7 @@ class CoreAnimationTests: XCTestCase { transaction.add(plan: animation, to: view.layer) let scheduler = Scheduler() - scheduler.commit(transaction) + scheduler.commit(transaction: transaction) let delegate = TestableSchedulerDelegate() delegate.didIdleExpectation = expectation(description: "Did idle")