Merge branch 'release-candidate' into stable

material-motion · Sep 21, 2017 · 86f068b · 86f068b
2 parents f5349b4 + b7b1745
commit 86f068b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 1.1.2
+
+Added support for Xcode 7 builds.
+
+## Source changes
+
+* [Resolve Xcode 7 build error. (#11)](https://github.com/material-motion/motion-animator-objc/commit/3e45cbebb8fadca6a75919550b360af944d6af41) (featherless)
+
 # 1.1.1
 
 Bug fix release due to compiler warnings.

diff --git a/MotionAnimator.podspec b/MotionAnimator.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "MotionAnimator"
   s.summary      = "A Motion Animator creates performant, interruptible animations from motion specs."
-  s.version      = "1.1.1"
+  s.version      = "1.1.2"
   s.authors      = "The Material Motion Authors"
   s.license      = "Apache 2.0"
   s.homepage     = "https://github.com/material-motion/motion-animator-objc"

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - CatalogByConvention (2.1.1)
-  - MotionAnimator (1.1.1):
+  - MotionAnimator (1.1.2):
     - MotionInterchange
   - MotionInterchange (1.0.1)
 
@@ -14,7 +14,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   CatalogByConvention: c3a5319de04250a7cd4649127fcfca5fe3322a43
-  MotionAnimator: d76dcc4aa2a73293045ddcd91ebf800d096e647e
+  MotionAnimator: 5a1893b58fcf7a4664d81d69c9a09a0078c67e06
   MotionInterchange: 7a7c355ba2ed5d36c5cf2ceb76cacd3d3680dbf5
 
 PODFILE CHECKSUM: 32901d5f93aeff9d0bc9bb7dc89e4b9576f3ca35

diff --git a/src/MDMAnimatableKeyPaths.h b/src/MDMAnimatableKeyPaths.h
@@ -14,13 +14,23 @@
  limitations under the License.
  */
 
+#import <Availability.h>
 #import <Foundation/Foundation.h>
 
+// This macro is introduced in Xcode 9.
+#ifndef CF_TYPED_ENUM // What follows is backwards compat for Xcode 8 and below.
+#if __has_attribute(swift_wrapper)
+#define CF_TYPED_ENUM __attribute__((swift_wrapper(enum)))
+#else
+#define CF_TYPED_ENUM
+#endif
+#endif
+
 /**
  A representation of an animatable key path. Likely not exhaustive.
  */
 NS_SWIFT_NAME(AnimatableKeyPath)
-typedef NSString * const MDMAnimatableKeyPath __attribute__((swift_wrapper(enum)));
+typedef NSString * const MDMAnimatableKeyPath CF_TYPED_ENUM;
 
 FOUNDATION_EXPORT MDMAnimatableKeyPath MDMKeyPathCornerRadius NS_SWIFT_NAME(cornerRadius);
 FOUNDATION_EXPORT MDMAnimatableKeyPath MDMKeyPathHeight NS_SWIFT_NAME(height);