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

Commit 0ae88ea

Browse files
author
Jeff Verkoeyen
committed
Merge branch 'release-candidate' into stable
2 parents f7a5a17 + d1f55d2 commit 0ae88ea

12 files changed

+36
-28
lines changed

.arcconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
"arc.feature.start.default": "origin/develop",
1414
"unit.xcode": {
1515
"build": {
16-
"workspace": "Transitioning.xcworkspace",
16+
"workspace": "MotionTransitioning.xcworkspace",
1717
"scheme": "UnitTests",
1818
"configuration": "Debug",
1919
"destination": "platform=iOS Simulator,name=iPhone 6s"
2020
},
2121
"coverage": {
22-
"product": "Transitioning.framework/Transitioning"
22+
"product": "MotionTransitioning.framework/MotionTransitioning"
2323
},
2424
"pre-build": "pod install"
2525
}

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ before_install:
1010
script:
1111
- set -o pipefail
1212
- arcanist/bin/arc unit --everything --trace
13-
- xcodebuild build -workspace Transitioning.xcworkspace -scheme TransitionsCatalog -sdk "iphonesimulator10.1" -destination "name=iPhone 6s,OS=10.1" ONLY_ACTIVE_ARCH=YES | xcpretty -c;
13+
- xcodebuild build -workspace MotionTransitioning.xcworkspace -scheme TransitionsCatalog -sdk "iphonesimulator10.1" -destination "name=iPhone 6s,OS=10.1" ONLY_ACTIVE_ARCH=YES | xcpretty -c;
1414
after_success:
1515
- bash <(curl -s https://codecov.io/bash)

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# 3.0.0 (MotionTransitioning)
2+
3+
The library has been renamed to MotionTransitioning.
4+
5+
---
6+
7+
Prior releases under the library name `MaterialMotionTransitioning`.
8+
19
# 2.0.0 (MaterialMotionTransitioning)
210

311
The library has been renamed to MaterialMotionTransitioning.

MaterialMotionTransitioning.podspec renamed to MotionTransitioning.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
2-
s.name = "MaterialMotionTransitioning"
2+
s.name = "MotionTransitioning"
33
s.summary = "Light-weight API for building UIViewController transitions."
4-
s.version = "2.0.0"
4+
s.version = "3.0.0"
55
s.authors = "The Material Motion Authors"
66
s.license = "Apache 2.0"
77
s.homepage = "https://github.com/material-motion/transitioning-objc"

Podfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
workspace 'MaterialMotionTransitioning.xcworkspace'
1+
workspace 'MotionTransitioning.xcworkspace'
22
use_frameworks!
33

44
target "TransitionsCatalog" do
55
pod 'CatalogByConvention'
6-
pod 'MaterialMotionTransitioning', :path => './'
6+
pod 'MotionTransitioning', :path => './'
77

88
project 'examples/apps/Catalog/TransitionsCatalog.xcodeproj'
99
end
1010

1111
target "UnitTests" do
12-
pod 'MaterialMotionTransitioning', :path => './'
12+
pod 'MotionTransitioning', :path => './'
1313

1414
project 'examples/apps/Catalog/TransitionsCatalog.xcodeproj'
1515
end
@@ -18,7 +18,7 @@ post_install do |installer|
1818
installer.pods_project.targets.each do |target|
1919
target.build_configurations.each do |configuration|
2020
configuration.build_settings['SWIFT_VERSION'] = "3.0"
21-
if target.name.start_with?("MaterialMotion")
21+
if target.name.start_with?("MotionTransitioning")
2222
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"
2323
end
2424
end

Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
PODS:
22
- CatalogByConvention (2.1.1)
3-
- MaterialMotionTransitioning (2.0.0)
3+
- MotionTransitioning (3.0.0)
44

55
DEPENDENCIES:
66
- CatalogByConvention
7-
- MaterialMotionTransitioning (from `./`)
7+
- MotionTransitioning (from `./`)
88

99
EXTERNAL SOURCES:
10-
MaterialMotionTransitioning:
10+
MotionTransitioning:
1111
:path: "./"
1212

1313
SPEC CHECKSUMS:
1414
CatalogByConvention: c3a5319de04250a7cd4649127fcfca5fe3322a43
15-
MaterialMotionTransitioning: e89c47d3a019d1cec945c4ab8653cfc417430e8f
15+
MotionTransitioning: 108f968d1251c13aae3a6921d8d87e57c741fa54
1616

17-
PODFILE CHECKSUM: a339d385d38b29a0052f32984921c8567d0c57e5
17+
PODFILE CHECKSUM: db2e7ac8d9d65704a2cbffa0b77e39a574cb7248
1818

1919
COCOAPODS: 1.2.1

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Material Motion Transitioning
1+
# Motion Transitioning
22

33
> Light-weight API for building UIViewController transitions.
44
55
[![Build Status](https://travis-ci.org/material-motion/transitioning-objc.svg?branch=develop)](https://travis-ci.org/material-motion/transitioning-objc)
66
[![codecov](https://codecov.io/gh/material-motion/transitioning-objc/branch/develop/graph/badge.svg)](https://codecov.io/gh/material-motion/transitioning-objc)
7-
[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/MaterialMotionTransitioning.svg)](https://cocoapods.org/pods/MaterialMotionTransitioning)
8-
[![Platform](https://img.shields.io/cocoapods/p/MaterialMotionTransitioning.svg)](http://cocoadocs.org/docsets/MaterialMotionTransitioning)
9-
[![Docs](https://img.shields.io/cocoapods/metrics/doc-percent/MaterialMotionTransitioning.svg)](http://cocoadocs.org/docsets/MaterialMotionTransitioning)
7+
[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/MotionTransitioning.svg)](https://cocoapods.org/pods/MotionTransitioning)
8+
[![Platform](https://img.shields.io/cocoapods/p/MotionTransitioning.svg)](http://cocoadocs.org/docsets/MotionTransitioning)
9+
[![Docs](https://img.shields.io/cocoapods/metrics/doc-percent/MotionTransitioning.svg)](http://cocoadocs.org/docsets/MotionTransitioning)
1010

1111
This library standardizes the way transitions are built on iOS so that with a single line of code
1212
you can pick the custom transition you want to use:
@@ -73,9 +73,9 @@ final class CustomTransition: NSObject, Transition {
7373
>
7474
> gem install cocoapods
7575
76-
Add `MaterialMotionTransitioning` to your `Podfile`:
76+
Add `MotionTransitioning` to your `Podfile`:
7777
78-
pod 'MaterialMotionTransitioning'
78+
pod 'MotionTransitioning'
7979
8080
Then run the following command:
8181
@@ -85,7 +85,7 @@ Then run the following command:
8585
8686
Import the framework:
8787
88-
@import MaterialMotionTransitioning;
88+
@import MotionTransitioning;
8989
9090
You will now have access to all of the APIs.
9191
@@ -97,7 +97,7 @@ commands:
9797
git clone https://github.com/material-motion/transitioning-objc.git
9898
cd transitioning-objc
9999
pod install
100-
open MaterialMotionTransitioning.xcworkspace
100+
open MotionTransitioning.xcworkspace
101101
102102
## Guides
103103
@@ -112,7 +112,7 @@ commands:
112112
> animation, interaction, and presentation controller. These controllers are then expected to
113113
> implement the transition's motion.
114114
115-
MaterialMotionTransitioning provides a thin layer atop these protocols with the following advantages:
115+
MotionTransitioning provides a thin layer atop these protocols with the following advantages:
116116
117117
- Every view controller has its own **transition controller**. This encourages choosing the
118118
transition based on the context.

examples/CustomPresentationExample.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
import UIKit
18-
import MaterialMotionTransitioning
18+
import MotionTransitioning
1919

2020
// This example demonstrates how to make use of presentation controllers to build a flexible modal
2121
// transition that supports presenting view controllers at aribtrary frames on the screen.

examples/FadeExample.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
import UIKit
18-
import MaterialMotionTransitioning
18+
import MotionTransitioning
1919

2020
// This example demonstrates the minimal path to building a custom transition using the Material
2121
// Motion Transitioning APIs in Swift. The essential steps have been documented below.

examples/MenuExample.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
import UIKit
18-
import Transitioning
18+
import MotionTransitioning
1919

2020
class MenuExampleViewController: ExampleViewController {
2121

0 commit comments

Comments
 (0)