Skip to content
This repository was archived by the owner on Aug 30, 2023. It is now read-only.

Commit f5349b4

Browse files
author
Jeff Verkoeyen
committed
Merge branch 'release-candidate' into stable
2 parents 9be98e4 + 90bef19 commit f5349b4

File tree

5 files changed

+21
-7
lines changed

5 files changed

+21
-7
lines changed

CHANGELOG.md

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# 1.1.1
2+
3+
Bug fix release due to compiler warnings.
4+
5+
## Breaking changes
6+
7+
## New deprecations
8+
9+
## New features
10+
11+
## Source changes
12+
13+
* [Fix compiler warnings due to misconfigured Podfile. (#8)](https://github.com/material-motion/motion-animator-objc/commit/90a8913b1dc76165295cf0bc667575ee211c6411) (featherless)
14+
115
# 1.1.0
216

317
This minor change resolves some Xcode 9 warnings and introduces the ability to speed up or slow down animations.

MotionAnimator.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = "MotionAnimator"
33
s.summary = "A Motion Animator creates performant, interruptible animations from motion specs."
4-
s.version = "1.1.0"
4+
s.version = "1.1.1"
55
s.authors = "The Material Motion Authors"
66
s.license = "Apache 2.0"
77
s.homepage = "https://github.com/material-motion/motion-animator-objc"

Podfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ post_install do |installer|
1616
installer.pods_project.targets.each do |target|
1717
target.build_configurations.each do |configuration|
1818
configuration.build_settings['SWIFT_VERSION'] = "3.0"
19-
if target.name.start_with?("Material")
19+
if target.name.start_with?("MotionAnimator")
2020
configuration.build_settings['WARNING_CFLAGS'] ="$(inherited) -Wall -Wcast-align -Wconversion -Werror -Wextra -Wimplicit-atomic-properties -Wmissing-prototypes -Wno-sign-conversion -Wno-unused-parameter -Woverlength-strings -Wshadow -Wstrict-selector-match -Wundeclared-selector -Wunreachable-code"
2121
end
2222
end

Podfile.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PODS:
22
- CatalogByConvention (2.1.1)
3-
- MotionAnimator (1.1.0):
3+
- MotionAnimator (1.1.1):
44
- MotionInterchange
55
- MotionInterchange (1.0.1)
66

@@ -14,9 +14,9 @@ EXTERNAL SOURCES:
1414

1515
SPEC CHECKSUMS:
1616
CatalogByConvention: c3a5319de04250a7cd4649127fcfca5fe3322a43
17-
MotionAnimator: 9d025cda7572737e5db5ca779eb28c767fe6cf45
17+
MotionAnimator: d76dcc4aa2a73293045ddcd91ebf800d096e647e
1818
MotionInterchange: 7a7c355ba2ed5d36c5cf2ceb76cacd3d3680dbf5
1919

20-
PODFILE CHECKSUM: 634239e7b183e669593b273198da9227ed207777
20+
PODFILE CHECKSUM: 32901d5f93aeff9d0bc9bb7dc89e4b9576f3ca35
2121

2222
COCOAPODS: 1.2.1

src/MDMMotionAnimator.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@ static void makeAnimationAdditive(CABasicAnimation *animation) {
205205
});
206206

207207
if ([animation.toValue isKindOfClass:[NSNumber class]]) {
208-
CGFloat currentValue = [animation.fromValue doubleValue];
209-
CGFloat delta = currentValue - [animation.toValue doubleValue];
208+
CGFloat currentValue = (CGFloat)[animation.fromValue doubleValue];
209+
CGFloat delta = currentValue - (CGFloat)[animation.toValue doubleValue];
210210
animation.fromValue = @(delta);
211211
animation.toValue = @0;
212212
animation.additive = true;

0 commit comments

Comments
 (0)