Merge branch 'release-candidate' into develop

material-motion · Jun 14, 2017 · 7ee1fab · 7ee1fab
2 parents 3b653bd + 53949fa
commit 7ee1fab
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+# 1.1.1
+
+This is a patch fix release to address build issues within Google's build environment.
+
+## Source changes
+
+* [Add missing UIKit.h header imports.](https://github.com/material-motion/transitioning-objc/commit/3b653bdd1758a5c47d277af36369e977b3774095) (Jeff Verkoeyen)
+
+## Non-source changes
+
+* [Update Podfile.lock.](https://github.com/material-motion/transitioning-objc/commit/8185ae402e6952e2727af8b7ff0cb4c712d05623) (Jeff Verkoeyen)
+* [Add sliding menu as an example (#21)](https://github.com/material-motion/transitioning-objc/commit/4654e4c9c4c4ff49ac007f4b16eaa2458d86f98c) (Eric Tang)
+
 # 1.1.0
 
 This minor release introduces two new features to the Transition protocol family.

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - CatalogByConvention (2.1.1)
-  - Transitioning (1.1.0)
+  - Transitioning (1.1.1)
 
 DEPENDENCIES:
   - CatalogByConvention
@@ -12,7 +12,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   CatalogByConvention: c3a5319de04250a7cd4649127fcfca5fe3322a43
-  Transitioning: e5702ef6924d62d19c2ad5f6de9d11fa2c6b5362
+  Transitioning: ea1a8225812799c7ff07630af17008ab5e306bf3
 
 PODFILE CHECKSUM: 1949e62e9d70d554783c0bb931d6b52780775cfb
 

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