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
Jeff Verkoeyen committed Apr 6, 2021
2 parents 7710eca + 0463c45 commit 296f529
Show file tree
Hide file tree
Showing 24 changed files with 172 additions and 291 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.DS_Store
bazel-*
.kokoro-ios-runner

Expand Down
2 changes: 1 addition & 1 deletion .jazzy.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module: MotionAnimator
module_version: 4.0.1
module_version: 5.0.0
sdk: iphonesimulator
umbrella_header: src/MotionAnimator.h
objc: true
Expand Down
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0
5
12 changes: 5 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@ env:
- LANGUAGE=en_US.UTF-8
matrix:
include:
- osx_image: xcode9.2
env: COVERAGE=code_coverage SDK="iphonesimulator11.2" DESTINATION="name=iPhone 6s,OS=11.2"
- osx_image: xcode9.2
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: xcode12.2
env: COVERAGE=code_coverage SDK="iphonesimulator14.2" DESTINATION="name=iPhone 6s,OS=11.4"
- osx_image: xcode12.2
env: SDK="iphonesimulator14.2" DESTINATION="name=iPhone 6s,OS=10.3.1"
before_install:
- gem install cocoapods --no-rdoc --no-ri --no-document --quiet
- gem install cocoapods --no-document --quiet
- pod install --repo-update
script:
- set -o pipefail
Expand Down
83 changes: 0 additions & 83 deletions BUILD

This file was deleted.

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 5.0.0

This major release drops Bazel support and support for iOS 9.

# 4.0.1

This patch release fixes a bug on iOS 14 affecting flickers when using animations that have no delay.
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 = "4.0.1"
s.version = "5.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, "9.0"
s.platform = :ios, "10.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", "~> 3.0"
s.dependency "MotionInterchange", "~> 4.0"
end
3 changes: 2 additions & 1 deletion Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
workspace 'MotionAnimator.xcworkspace'
use_frameworks!
platform :ios, '10.0'

target "MotionAnimatorCatalog" do
pod 'CatalogByConvention'
Expand All @@ -15,7 +16,7 @@ end
post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |configuration|
configuration.build_settings['SWIFT_VERSION'] = "3.0"
configuration.build_settings['SWIFT_VERSION'] = "5.0"
if target.name.start_with?("Motion")
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"
end
Expand Down
18 changes: 9 additions & 9 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PODS:
- CatalogByConvention (2.5.1)
- MotionAnimator (4.0.1):
- MotionInterchange (~> 3.0)
- MotionInterchange (3.0.0)
- CatalogByConvention (2.5.2)
- MotionAnimator (5.0.0):
- MotionInterchange (~> 4.0)
- MotionInterchange (4.0.1)

DEPENDENCIES:
- CatalogByConvention
Expand All @@ -18,10 +18,10 @@ EXTERNAL SOURCES:
:path: "./"

SPEC CHECKSUMS:
CatalogByConvention: 2b58a9b64e5b1049abb5d3f8e764a551bbe843a7
MotionAnimator: 5f99d7c9592928c0f28a66283eda9c3b657dc480
MotionInterchange: 13adae439b377e31d1674cc165539d50e1d1566a
CatalogByConvention: ef713654160053be026fa4648dd28caf6b5ca4e1
MotionAnimator: af4b2f0c5e55c58e2f55208c1cafed410c75afb6
MotionInterchange: d58704efd5dcd62c6535bc1081df832533a8e9b9

PODFILE CHECKSUM: 3537bf01c11174928ac008c20fec4738722e96f3
PODFILE CHECKSUM: ea67d7318ea5fbb64e106792b6249914962adb16

COCOAPODS: 1.9.3
COCOAPODS: 1.10.1
60 changes: 0 additions & 60 deletions WORKSPACE

This file was deleted.

4 changes: 2 additions & 2 deletions examples/TapToBounceTraitsExample.swift
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class TapToBounceTraitsExampleViewController: UIViewController {
tension: 100,
friction: 10))

func didFocus(_ sender: UIButton) {
@objc func didFocus(_ sender: UIButton) {
let animator = MotionAnimator()
animator.animate(with: traits) {
sender.transform = CGAffineTransform(scaleX: 1.5, y: 1.5)
Expand All @@ -62,7 +62,7 @@ class TapToBounceTraitsExampleViewController: UIViewController {
}
}

func didUnfocus(_ sender: UIButton) {
@objc func didUnfocus(_ sender: UIButton) {
let animator = MotionAnimator()
animator.animate(with: traits) {
sender.transform = .identity
Expand Down
4 changes: 2 additions & 2 deletions examples/TapToBounceUIKitExample.swift
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class TapToBounceUIKitExampleViewController: UIViewController {
for: [.touchUpInside, .touchUpOutside, .touchDragExit])
}

func didFocus(_ sender: UIButton) {
@objc func didFocus(_ sender: UIButton) {
MotionAnimator.animate(withDuration: 0.8,
delay: 0,
usingSpringWithDamping: 0.5,
Expand All @@ -61,7 +61,7 @@ class TapToBounceUIKitExampleViewController: UIViewController {
}, completion: nil)
}

func didUnfocus(_ sender: UIButton) {
@objc func didUnfocus(_ sender: UIButton) {
MotionAnimator.animate(withDuration: 0.8,
delay: 0,
usingSpringWithDamping: 0.5,
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/Catalog/Catalog/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
let window = UIWindow(frame: UIScreen.main.bounds)
self.window = window

Expand Down
Loading

0 comments on commit 296f529

Please sign in to comment.