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

Commit

Permalink
Merge branch 'release-candidate' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
featherless committed Mar 12, 2019
2 parents d300ae8 + a70830b commit 0581bc3
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 29 deletions.
4 changes: 2 additions & 2 deletions .jazzy.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module: MotionAnimator
module_version: 3.0.0
module_version: 4.0.0
sdk: iphonesimulator
umbrella_header: src/MotionAnimator.h
objc: true
github_url: https://github.com/material-motion/motion-animator-objc
github_file_prefix: https://github.com/material-motion/motion-animator-objc/tree/v3.0.0
github_file_prefix: https://github.com/material-motion/motion-animator-objc/tree/v4.0.0
2 changes: 1 addition & 1 deletion .kokoro
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ set -e
set -x

BAZEL_VERSION="0.20.0"
IOS_MINIMUM_OS="8.0"
IOS_MINIMUM_OS="9.0"
IOS_CPUS="i386,x86_64"

get_xcode_version_from_path() {
Expand Down
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ matrix:
env: SDK="iphonesimulator11.2" DESTINATION="name=iPhone 6s,OS=10.3.1"
- osx_image: xcode9.2
env: SDK="iphonesimulator11.2" DESTINATION="name=iPhone 6s,OS=9.3"
- osx_image: xcode9.2
env: SDK="iphonesimulator11.2" DESTINATION="name=iPhone 6,OS=8.4"
- osx_image: xcode8.3
env: SDK="iphonesimulator10.3" DESTINATION="name=iPhone 6,OS=8.1"
before_install:
- gem install cocoapods --no-rdoc --no-ri --no-document --quiet
- pod install --repo-update
Expand Down
2 changes: 1 addition & 1 deletion BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ ios_ui_test(
":UnitTestsSwiftLib"
],
test_host = "@build_bazel_rules_apple//apple/testing/default_host/ios",
minimum_os_version = "8.0",
minimum_os_version = "9.0",
timeout = "short",
visibility = ["//visibility:private"],
)
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
# 4.0.0

This major release drops official support for iOS 8 and fixes a static analyzer warning.

## Source changes

* [Resolve a static analyzer warning. (#124)](https://github.com/material-motion/motion-animator-objc/commit/0dce7f8c521e321cb904e9fbe3dc5880e623d6d8) (featherless)

## Non-source changes

* [Ran pod install with latest cocoapods. (#123)](https://github.com/material-motion/motion-animator-objc/commit/953f7505cc85d66dcd88c4c306765d22ea73c230) (featherless)
* [Drop support for iOS 8 (#122)](https://github.com/material-motion/motion-animator-objc/commit/ecb75418b8d86cc34041a675c89abc12ad4e509a) (featherless)

# 3.0.0

This major release upgrades the bazel dependencies and workspace. This change is breaking for anyone
Expand Down
6 changes: 3 additions & 3 deletions MotionAnimator.podspec
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Pod::Spec.new do |s|
s.name = "MotionAnimator"
s.summary = "A Motion Animator creates performant, interruptible animations from motion specs."
s.version = "3.0.0"
s.version = "4.0.0"
s.authors = "The Material Motion Authors"
s.license = "Apache 2.0"
s.homepage = "https://github.com/material-motion/motion-animator-objc"
s.source = { :git => "https://github.com/material-motion/motion-animator-objc.git", :tag => "v" + s.version.to_s }
s.platform = :ios, "8.0"
s.platform = :ios, "9.0"
s.requires_arc = true

s.public_header_files = "src/*.h"
s.source_files = "src/*.{h,m,mm}", "src/private/*.{h,m,mm}"

s.dependency "MotionInterchange", "~> 2.0"
s.dependency "MotionInterchange", "~> 3.0"
end
12 changes: 6 additions & 6 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PODS:
- CatalogByConvention (2.5.1)
- MotionAnimator (2.8.1):
- MotionInterchange (~> 2.0)
- MotionInterchange (2.0.0)
- MotionAnimator (4.0.0):
- MotionInterchange (~> 3.0)
- MotionInterchange (3.0.0)

DEPENDENCIES:
- CatalogByConvention
Expand All @@ -19,9 +19,9 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
CatalogByConvention: 2b58a9b64e5b1049abb5d3f8e764a551bbe843a7
MotionAnimator: ab78e3a6eb59f1061c2c00dd09dc923f254f4a61
MotionInterchange: 5b7325142e4af884278bab7adcd264976a8c0593
MotionAnimator: 3a22c094f2a9c21c98cee9e69b6407d1e1fff654
MotionInterchange: 13adae439b377e31d1674cc165539d50e1d1566a

PODFILE CHECKSUM: 3537bf01c11174928ac008c20fec4738722e96f3

COCOAPODS: 1.5.3
COCOAPODS: 1.6.0
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
![Motion Animator Banner](img/motion-animator-banner.gif)

> An animator for iOS 8+ that combines the best aspects of modern UIView and CALayer animation APIs.
> An animator for iOS 9+ that combines the best aspects of modern UIView and CALayer animation APIs.
[![Build Status](https://travis-ci.org/material-motion/motion-animator-objc.svg?branch=develop)](https://travis-ci.org/material-motion/motion-animator-objc)
[![codecov](https://codecov.io/gh/material-motion/motion-animator-objc/branch/develop/graph/badge.svg)](https://codecov.io/gh/material-motion/motion-animator-objc)
Expand All @@ -16,7 +16,7 @@
<tr><td>🎉</td><td>Consistent model layer value expectations.</td></tr>
</table>

The following properties can be implicitly animated using the MotionAnimator on iOS 8 and up:
The following properties can be implicitly animated using the MotionAnimator on iOS 9 and up:

<table>
<tr><td>CALayer <tt>anchorPoint</tt></td></tr>
Expand Down Expand Up @@ -71,7 +71,7 @@ UIView.animate(withDuration: 1.0, animations: {
})

MotionAnimator.animate(withDuration: 1.0, animations: {
view.layer.cornerRadius = 10 // Works on iOS 8 and up
view.layer.cornerRadius = 10 // Works on iOS 9 and up
})
```

Expand Down Expand Up @@ -443,7 +443,7 @@ UIView.animate(withDuration: 0.8, animations: {
view.layer.borderWidth = 10
}, completion: nil)

// This works all the way back to iOS 8.
// This works back to iOS 9.
MotionAnimator.animate(withDuration: 0.8, animations: {
view.layer.borderWidth = 10
}, completion: nil)
Expand Down
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ git_repository(
git_repository(
name = "motion_interchange_objc",
remote = "https://github.com/material-motion/motion-interchange-objc.git",
commit = "v2.0.0",
commit = "v3.0.0",
)

http_file(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@
files = (
);
inputPaths = (
"${SRCROOT}/../../../Pods/Target Support Files/Pods-UnitTests/Pods-UnitTests-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-UnitTests/Pods-UnitTests-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/MotionAnimator/MotionAnimator.framework",
"${BUILT_PRODUCTS_DIR}/MotionInterchange/MotionInterchange.framework",
);
Expand All @@ -419,7 +419,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/../../../Pods/Target Support Files/Pods-UnitTests/Pods-UnitTests-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-UnitTests/Pods-UnitTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
5A3F2ED10BF3C472BA1601C5 /* [CP] Check Pods Manifest.lock */ = {
Expand All @@ -446,7 +446,7 @@
files = (
);
inputPaths = (
"${SRCROOT}/../../../Pods/Target Support Files/Pods-MotionAnimatorCatalog/Pods-MotionAnimatorCatalog-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-MotionAnimatorCatalog/Pods-MotionAnimatorCatalog-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/CatalogByConvention/CatalogByConvention.framework",
"${BUILT_PRODUCTS_DIR}/MotionAnimator/MotionAnimator.framework",
"${BUILT_PRODUCTS_DIR}/MotionInterchange/MotionInterchange.framework",
Expand All @@ -459,7 +459,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/../../../Pods/Target Support Files/Pods-MotionAnimatorCatalog/Pods-MotionAnimatorCatalog-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MotionAnimatorCatalog/Pods-MotionAnimatorCatalog-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
C56294D2A9A4F3CE12368EA2 /* [CP] Check Pods Manifest.lock */ = {
Expand Down Expand Up @@ -600,7 +600,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8;
IPHONEOS_DEPLOYMENT_TARGET = 9;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -640,7 +640,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8;
IPHONEOS_DEPLOYMENT_TARGET = 9;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
2 changes: 1 addition & 1 deletion src/private/MDMAnimationRegistrar.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
// executed.
- (void)addAnimation:(nonnull CABasicAnimation *)animation
toLayer:(nonnull CALayer *)layer
forKey:(nonnull NSString *)key
forKey:(nullable NSString *)key
completion:(void(^ __nullable)(BOOL))completion;

// For every active animation, reads the associated layer's presentation layer key path and writes
Expand Down

0 comments on commit 0581bc3

Please sign in to comment.