From 558a73912aa50d4b35f0c7676a81e944f8a94b02 Mon Sep 17 00:00:00 2001 From: Jeff Verkoeyen Date: Fri, 14 Apr 2017 16:02:08 -0400 Subject: [PATCH 1/4] Automatic changelog preparation for release. --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f7d64c..7e9a4fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# #develop# + + TODO: Enumerate changes. + + # 1.2.0 This minor release introduces a new operator, `startWith`, which is meant to replace the `initialValue` operator. From efc790a13783f54ff583296a2a7245597c2dbee2 Mon Sep 17 00:00:00 2001 From: Jeff Verkoeyen Date: Fri, 14 Apr 2017 15:34:11 -0400 Subject: [PATCH 2/4] Use a reasonable fallback when adding visualization views to the runtime container view. Summary: We were assuming that target views would be part of the view hierarchy by the time runtime.add was invoked, but this isn't always the case. When there is no parent we'll fall back to a best-guess of the frame being the container view's bounds. Closes https://github.com/material-motion/material-motion-swift/issues/101 Reviewers: O2 Material Motion, O4 Material Apple platform reviewers, #material_motion, markwei Reviewed By: O2 Material Motion, O4 Material Apple platform reviewers, #material_motion, markwei Subscribers: markwei Tags: #material_motion Differential Revision: http://codereview.cc/D3046 --- src/reactivetypes/ReactiveCALayer.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/reactivetypes/ReactiveCALayer.swift b/src/reactivetypes/ReactiveCALayer.swift index 1b83d8b..674ab22 100644 --- a/src/reactivetypes/ReactiveCALayer.swift +++ b/src/reactivetypes/ReactiveCALayer.swift @@ -279,7 +279,11 @@ public func createCoreAnimationProperty(_ name: String, initialValue: T, exte lastView.removeFromSuperview() } view.isUserInteractionEnabled = false - view.frame = layer.superlayer!.convert(layer.superlayer!.bounds, to: containerView.layer) + if let superlayer = layer.superlayer { + view.frame = superlayer.convert(superlayer.bounds, to: containerView.layer) + } else { + view.frame = containerView.bounds + } containerView.addSubview(view) lastView = view } From a520b2ba0fee0de790df918d9738504476f22225 Mon Sep 17 00:00:00 2001 From: Jeff Verkoeyen Date: Fri, 14 Apr 2017 16:04:45 -0400 Subject: [PATCH 3/4] Update CHANGELOG.md. --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e9a4fc..86f1ca4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,10 @@ -# #develop# +# 1.2.1 - TODO: Enumerate changes. +This is a patch release resolving a crashing bug when `runtime.shouldVisualizeMotion` was enabled and an `ArcMove` interaction was added to a view without a parent. +## Source changes + +* [Use a reasonable fallback when adding visualization views to the runtime container view.](https://github.com/material-motion/reactive-motion-swift/commit/efc790a13783f54ff583296a2a7245597c2dbee2) (Jeff Verkoeyen) # 1.2.0 From 03ec0f7ff7546b082288ad66efa55087f2293bf9 Mon Sep 17 00:00:00 2001 From: Jeff Verkoeyen Date: Fri, 14 Apr 2017 16:05:01 -0400 Subject: [PATCH 4/4] Bump the version to v1.2.1. --- .jazzy.yaml | 4 ++-- MaterialMotion.podspec | 2 +- Podfile.lock | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.jazzy.yaml b/.jazzy.yaml index 75ce916..1875356 100644 --- a/.jazzy.yaml +++ b/.jazzy.yaml @@ -1,5 +1,5 @@ module: MaterialMotion -module_version: 1.2.0 +module_version: 1.2.1 sdk: iphonesimulator xcodebuild_arguments: - -workspace @@ -7,4 +7,4 @@ xcodebuild_arguments: - -scheme - MaterialMotion github_url: https://github.com/material-motion/material-motion-swift -github_file_prefix: https://github.com/material-motion/material-motion-swift/tree/v1.2.0 +github_file_prefix: https://github.com/material-motion/material-motion-swift/tree/v1.2.1 diff --git a/MaterialMotion.podspec b/MaterialMotion.podspec index 430ebc3..7ad7f45 100644 --- a/MaterialMotion.podspec +++ b/MaterialMotion.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "MaterialMotion" s.summary = "Reactive motion driven by Core Animation." - s.version = "1.2.0" + s.version = "1.2.1" s.authors = "The Material Motion Authors" s.license = "Apache 2.0" s.homepage = "https://github.com/material-motion/material-motion-swift" diff --git a/Podfile.lock b/Podfile.lock index 25acbd5..ea71256 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -3,7 +3,7 @@ PODS: - IndefiniteObservable (3.1.0): - IndefiniteObservable/lib (= 3.1.0) - IndefiniteObservable/lib (3.1.0) - - MaterialMotion (1.2.0): + - MaterialMotion (1.2.1): - IndefiniteObservable (~> 3.0) DEPENDENCIES: @@ -17,7 +17,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: CatalogByConvention: be55c2263132e4f9f59299ac8a528ee8715b3275 IndefiniteObservable: 2789d61f487d8d37fa2b9c3153cc44d4447ff744 - MaterialMotion: 4a4f155a35fce5e1dad7cc838719ef1c9c590dc6 + MaterialMotion: 599cd0743c60cdb62d7bae2b25bebbc77f6cd9b5 PODFILE CHECKSUM: f503265a0d60526a0d28c96dd4bdcfb40fb562fc