Merge branch 'release-candidate' into stable

material-motion · Aug 31, 2017 · 85208cd · 85208cd
2 parents 0c34f24 + 7a3a80f
commit 85208cd
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 3.2.1
+
+This patch release resolves Xcode 9 compiler warnings.
+
+## Source changes
+
+* [Explicitly include void for block parameters. (#41)](https://github.com/material-motion/transitioning-objc/commit/eabe53db2a113e548c876247e2c2ff3e04afc58f) (ianegordon)
+
 # 3.2.0
 
 This minor release introduces new features for presentation, view snapshotting, and defered transition work. There is also a new photo album example demonstrating how to build a contextual transition in which the context may change.

diff --git a/MotionTransitioning.podspec b/MotionTransitioning.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "MotionTransitioning"
   s.summary      = "Light-weight API for building UIViewController transitions."
-  s.version      = "3.2.0"
+  s.version      = "3.2.1"
   s.authors      = "The Material Motion Authors"
   s.license      = "Apache 2.0"
   s.homepage     = "https://github.com/material-motion/transitioning-objc"

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - CatalogByConvention (2.1.1)
-  - MotionTransitioning (3.2.0)
+  - MotionTransitioning (3.2.1)
 
 DEPENDENCIES:
   - CatalogByConvention
@@ -12,7 +12,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   CatalogByConvention: c3a5319de04250a7cd4649127fcfca5fe3322a43
-  MotionTransitioning: 93ff3fcc6a597786a01ace3232109e5075c57526
+  MotionTransitioning: 01e7fcd6e2974985057109e0a4c98ea546cd5947
 
 PODFILE CHECKSUM: db2e7ac8d9d65704a2cbffa0b77e39a574cb7248
 

diff --git a/src/MDMTransitionContext.h b/src/MDMTransitionContext.h
@@ -91,6 +91,6 @@ NS_SWIFT_NAME(TransitionContext)
 
  Upon completion, each block of work will be executed in the order it was provided to the context.
  */
-- (void)deferToCompletion:(void (^ _Nonnull)())work;
+- (void)deferToCompletion:(void (^ _Nonnull)(void))work;
 
 @end
diff --git a/src/private/MDMViewControllerTransitionContext.m b/src/private/MDMViewControllerTransitionContext.m
@@ -96,7 +96,7 @@ - (void)transitionDidEnd {
   [_delegate transitionDidCompleteWithContext:self];
 }
 
-- (void)deferToCompletion:(void (^)())work {
+- (void)deferToCompletion:(void (^)(void))work {
   [_completionBlocks addObject:[work copy]];
 }