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

Commit 296f529

Browse files
author
Jeff Verkoeyen
committed
Merge branch 'release-candidate' into stable
2 parents 7710eca + 0463c45 commit 296f529

24 files changed

+172
-291
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.DS_Store
12
bazel-*
23
.kokoro-ios-runner
34

.jazzy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module: MotionAnimator
2-
module_version: 4.0.1
2+
module_version: 5.0.0
33
sdk: iphonesimulator
44
umbrella_header: src/MotionAnimator.h
55
objc: true

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0
1+
5

.travis.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@ env:
77
- LANGUAGE=en_US.UTF-8
88
matrix:
99
include:
10-
- osx_image: xcode9.2
11-
env: COVERAGE=code_coverage SDK="iphonesimulator11.2" DESTINATION="name=iPhone 6s,OS=11.2"
12-
- osx_image: xcode9.2
13-
env: SDK="iphonesimulator11.2" DESTINATION="name=iPhone 6s,OS=10.3.1"
14-
- osx_image: xcode9.2
15-
env: SDK="iphonesimulator11.2" DESTINATION="name=iPhone 6s,OS=9.3"
10+
- osx_image: xcode12.2
11+
env: COVERAGE=code_coverage SDK="iphonesimulator14.2" DESTINATION="name=iPhone 6s,OS=11.4"
12+
- osx_image: xcode12.2
13+
env: SDK="iphonesimulator14.2" DESTINATION="name=iPhone 6s,OS=10.3.1"
1614
before_install:
17-
- gem install cocoapods --no-rdoc --no-ri --no-document --quiet
15+
- gem install cocoapods --no-document --quiet
1816
- pod install --repo-update
1917
script:
2018
- set -o pipefail

BUILD

Lines changed: 0 additions & 83 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 5.0.0
2+
3+
This major release drops Bazel support and support for iOS 9.
4+
15
# 4.0.1
26

37
This patch release fixes a bug on iOS 14 affecting flickers when using animations that have no delay.

MotionAnimator.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
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 = "4.0.1"
4+
s.version = "5.0.0"
55
s.authors = "The Material Motion Authors"
66
s.license = "Apache 2.0"
77
s.homepage = "https://github.com/material-motion/motion-animator-objc"
88
s.source = { :git => "https://github.com/material-motion/motion-animator-objc.git", :tag => "v" + s.version.to_s }
9-
s.platform = :ios, "9.0"
9+
s.platform = :ios, "10.0"
1010
s.requires_arc = true
1111

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

15-
s.dependency "MotionInterchange", "~> 3.0"
15+
s.dependency "MotionInterchange", "~> 4.0"
1616
end

Podfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
workspace 'MotionAnimator.xcworkspace'
22
use_frameworks!
3+
platform :ios, '10.0'
34

45
target "MotionAnimatorCatalog" do
56
pod 'CatalogByConvention'
@@ -15,7 +16,7 @@ end
1516
post_install do |installer|
1617
installer.pods_project.targets.each do |target|
1718
target.build_configurations.each do |configuration|
18-
configuration.build_settings['SWIFT_VERSION'] = "3.0"
19+
configuration.build_settings['SWIFT_VERSION'] = "5.0"
1920
if target.name.start_with?("Motion")
2021
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 -Wno-error=deprecated -Wno-error=deprecated-implementations"
2122
end

Podfile.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
PODS:
2-
- CatalogByConvention (2.5.1)
3-
- MotionAnimator (4.0.1):
4-
- MotionInterchange (~> 3.0)
5-
- MotionInterchange (3.0.0)
2+
- CatalogByConvention (2.5.2)
3+
- MotionAnimator (5.0.0):
4+
- MotionInterchange (~> 4.0)
5+
- MotionInterchange (4.0.1)
66

77
DEPENDENCIES:
88
- CatalogByConvention
@@ -18,10 +18,10 @@ EXTERNAL SOURCES:
1818
:path: "./"
1919

2020
SPEC CHECKSUMS:
21-
CatalogByConvention: 2b58a9b64e5b1049abb5d3f8e764a551bbe843a7
22-
MotionAnimator: 5f99d7c9592928c0f28a66283eda9c3b657dc480
23-
MotionInterchange: 13adae439b377e31d1674cc165539d50e1d1566a
21+
CatalogByConvention: ef713654160053be026fa4648dd28caf6b5ca4e1
22+
MotionAnimator: af4b2f0c5e55c58e2f55208c1cafed410c75afb6
23+
MotionInterchange: d58704efd5dcd62c6535bc1081df832533a8e9b9
2424

25-
PODFILE CHECKSUM: 3537bf01c11174928ac008c20fec4738722e96f3
25+
PODFILE CHECKSUM: ea67d7318ea5fbb64e106792b6249914962adb16
2626

27-
COCOAPODS: 1.9.3
27+
COCOAPODS: 1.10.1

WORKSPACE

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)