Merge branch 'release-candidate' into stable

material-motion · Jul 17, 2017 · 0ae88ea · 0ae88ea
2 parents f7a5a17 + d1f55d2
commit 0ae88ea
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 28 deletions.
diff --git a/.arcconfig b/.arcconfig
@@ -13,13 +13,13 @@
   "arc.feature.start.default": "origin/develop",
   "unit.xcode": {
     "build": {
-      "workspace": "Transitioning.xcworkspace",
+      "workspace": "MotionTransitioning.xcworkspace",
       "scheme": "UnitTests",
       "configuration": "Debug",
       "destination": "platform=iOS Simulator,name=iPhone 6s"
     },
     "coverage": {
-      "product": "Transitioning.framework/Transitioning"
+      "product": "MotionTransitioning.framework/MotionTransitioning"
     },
     "pre-build": "pod install"
   }

diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,6 @@ before_install:
 script:
   - set -o pipefail
   - arcanist/bin/arc unit --everything --trace
-  - xcodebuild build -workspace Transitioning.xcworkspace -scheme TransitionsCatalog -sdk "iphonesimulator10.1" -destination "name=iPhone 6s,OS=10.1" ONLY_ACTIVE_ARCH=YES | xcpretty -c;
+  - xcodebuild build -workspace MotionTransitioning.xcworkspace -scheme TransitionsCatalog -sdk "iphonesimulator10.1" -destination "name=iPhone 6s,OS=10.1" ONLY_ACTIVE_ARCH=YES | xcpretty -c;
 after_success:
   - bash <(curl -s https://codecov.io/bash)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 3.0.0 (MotionTransitioning)
+
+The library has been renamed to MotionTransitioning.
+
+---
+
+Prior releases under the library name `MaterialMotionTransitioning`.
+
 # 2.0.0 (MaterialMotionTransitioning)
 
 The library has been renamed to MaterialMotionTransitioning.

diff --git a/MaterialMotionTransitioning.podspec → MotionTransitioning.podspec b/MaterialMotionTransitioning.podspec → MotionTransitioning.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
-  s.name         = "MaterialMotionTransitioning"
+  s.name         = "MotionTransitioning"
   s.summary      = "Light-weight API for building UIViewController transitions."
-  s.version      = "2.0.0"
+  s.version      = "3.0.0"
   s.authors      = "The Material Motion Authors"
   s.license      = "Apache 2.0"
   s.homepage     = "https://github.com/material-motion/transitioning-objc"

diff --git a/Podfile b/Podfile
@@ -1,15 +1,15 @@
-workspace 'MaterialMotionTransitioning.xcworkspace'
+workspace 'MotionTransitioning.xcworkspace'
 use_frameworks!
 
 target "TransitionsCatalog" do
   pod 'CatalogByConvention'
-  pod 'MaterialMotionTransitioning', :path => './'
+  pod 'MotionTransitioning', :path => './'
 
   project 'examples/apps/Catalog/TransitionsCatalog.xcodeproj'
 end
 
 target "UnitTests" do
-  pod 'MaterialMotionTransitioning', :path => './'
+  pod 'MotionTransitioning', :path => './'
 
   project 'examples/apps/Catalog/TransitionsCatalog.xcodeproj'
 end
@@ -18,7 +18,7 @@ post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |configuration|
       configuration.build_settings['SWIFT_VERSION'] = "3.0"
-      if target.name.start_with?("MaterialMotion")
+      if target.name.start_with?("MotionTransitioning")
         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"
       end
     end

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,19 +1,19 @@
 PODS:
   - CatalogByConvention (2.1.1)
-  - MaterialMotionTransitioning (2.0.0)
+  - MotionTransitioning (3.0.0)
 
 DEPENDENCIES:
   - CatalogByConvention
-  - MaterialMotionTransitioning (from `./`)
+  - MotionTransitioning (from `./`)
 
 EXTERNAL SOURCES:
-  MaterialMotionTransitioning:
+  MotionTransitioning:
     :path: "./"
 
 SPEC CHECKSUMS:
   CatalogByConvention: c3a5319de04250a7cd4649127fcfca5fe3322a43
-  MaterialMotionTransitioning: e89c47d3a019d1cec945c4ab8653cfc417430e8f
+  MotionTransitioning: 108f968d1251c13aae3a6921d8d87e57c741fa54
 
-PODFILE CHECKSUM: a339d385d38b29a0052f32984921c8567d0c57e5
+PODFILE CHECKSUM: db2e7ac8d9d65704a2cbffa0b77e39a574cb7248
 
 COCOAPODS: 1.2.1
diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
-# Material Motion Transitioning
+# Motion Transitioning
 
 > Light-weight API for building UIViewController transitions.
 
 [![Build Status](https://travis-ci.org/material-motion/transitioning-objc.svg?branch=develop)](https://travis-ci.org/material-motion/transitioning-objc)
 [![codecov](https://codecov.io/gh/material-motion/transitioning-objc/branch/develop/graph/badge.svg)](https://codecov.io/gh/material-motion/transitioning-objc)
-[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/MaterialMotionTransitioning.svg)](https://cocoapods.org/pods/MaterialMotionTransitioning)
-[![Platform](https://img.shields.io/cocoapods/p/MaterialMotionTransitioning.svg)](http://cocoadocs.org/docsets/MaterialMotionTransitioning)
-[![Docs](https://img.shields.io/cocoapods/metrics/doc-percent/MaterialMotionTransitioning.svg)](http://cocoadocs.org/docsets/MaterialMotionTransitioning)
+[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/MotionTransitioning.svg)](https://cocoapods.org/pods/MotionTransitioning)
+[![Platform](https://img.shields.io/cocoapods/p/MotionTransitioning.svg)](http://cocoadocs.org/docsets/MotionTransitioning)
+[![Docs](https://img.shields.io/cocoapods/metrics/doc-percent/MotionTransitioning.svg)](http://cocoadocs.org/docsets/MotionTransitioning)
 
 This library standardizes the way transitions are built on iOS so that with a single line of code
 you can pick the custom transition you want to use:
@@ -73,9 +73,9 @@ final class CustomTransition: NSObject, Transition {
 >
 >     gem install cocoapods
 
-Add `MaterialMotionTransitioning` to your `Podfile`:
+Add `MotionTransitioning` to your `Podfile`:
 
-    pod 'MaterialMotionTransitioning'
+    pod 'MotionTransitioning'
 
 Then run the following command:
 
@@ -85,7 +85,7 @@ Then run the following command:
 
 Import the framework:
 
-    @import MaterialMotionTransitioning;
+    @import MotionTransitioning;
 
 You will now have access to all of the APIs.
 
@@ -97,7 +97,7 @@ commands:
     git clone https://github.com/material-motion/transitioning-objc.git
     cd transitioning-objc
     pod install
-    open MaterialMotionTransitioning.xcworkspace
+    open MotionTransitioning.xcworkspace
 
 ## Guides
 
@@ -112,7 +112,7 @@ commands:
 > animation, interaction, and presentation controller. These controllers are then expected to
 > implement the transition's motion.
 
-MaterialMotionTransitioning provides a thin layer atop these protocols with the following advantages:
+MotionTransitioning provides a thin layer atop these protocols with the following advantages:
 
 - Every view controller has its own **transition controller**. This encourages choosing the
   transition based on the context.

diff --git a/examples/CustomPresentationExample.swift b/examples/CustomPresentationExample.swift
@@ -15,7 +15,7 @@
  */
 
 import UIKit
-import MaterialMotionTransitioning
+import MotionTransitioning
 
 // This example demonstrates how to make use of presentation controllers to build a flexible modal
 // transition that supports presenting view controllers at aribtrary frames on the screen.

diff --git a/examples/FadeExample.swift b/examples/FadeExample.swift
@@ -15,7 +15,7 @@
  */
 
 import UIKit
-import MaterialMotionTransitioning
+import MotionTransitioning
 
 // This example demonstrates the minimal path to building a custom transition using the Material
 // Motion Transitioning APIs in Swift. The essential steps have been documented below.

diff --git a/examples/MenuExample.swift b/examples/MenuExample.swift
@@ -15,7 +15,7 @@
  */
 
 import UIKit
-import Transitioning
+import MotionTransitioning
 
 class MenuExampleViewController: ExampleViewController {
 

diff --git a/tests/unit/TransitionTests.swift b/tests/unit/TransitionTests.swift
@@ -15,7 +15,7 @@
  */
 
 import XCTest
-import MaterialMotionTransitioning
+import MotionTransitioning
 
 class TransitionTests: XCTestCase {
 

diff --git a/tests/unit/TransitionWithPresentationTests.swift b/tests/unit/TransitionWithPresentationTests.swift
@@ -15,7 +15,7 @@
  */
 
 import XCTest
-import MaterialMotionTransitioning
+import MotionTransitioning
 
 class TransitionWithPresentationTests: XCTestCase {