Skip to content

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 Nov 2, 2016
2 parents 140d6f8 + 7e6aefc commit b5c647e
Show file tree
Hide file tree
Showing 38 changed files with 1,835 additions and 68 deletions.
1 change: 0 additions & 1 deletion .arc-hooks/post-diff/arc-hook-github-issues
Submodule arc-hook-github-issues deleted from fd6cb8
18 changes: 9 additions & 9 deletions .arcconfig
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
"load": [
".arc-hooks/post-diff/arc-hook-github-issues",
"third_party/arc-hook-conphig",
"third_party/arc-jazzy-linter",
"third_party/arc-proselint",
"third_party/arc-xcode-test-engine",
"third_party/clang-format-linter"
"material-arc-tools/third_party/arc-hook-conphig",
"material-arc-tools/third_party/arc-hook-github-issues",
"material-arc-tools/third_party/arc-jazzy-linter",
"material-arc-tools/third_party/arc-proselint",
"material-arc-tools/third_party/arc-xcode-test-engine",
"material-arc-tools/third_party/clang-format-linter"
],
"arcanist_configuration": "HookConphig",
"phabricator.uri": "http://codereview.cc/",
"arc.land.onto.default": "develop",
"arc.feature.start.default": "origin/develop",
"unit.xcode": {
"build": {
"workspace": "MaterialMotionMaterialMotionGesturesFamily.xcworkspace",
"workspace": "MaterialMotionDirectManipulationFamily.xcworkspace",
"scheme": "UnitTests",
"configuration": "Debug",
"destination": "platform=iOS Simulator,name=iPhone 6S"
"destination": "platform=iOS Simulator,name=iPhone 6s"
},
"coverage": {
"product": "MaterialMotionMaterialMotionGesturesFamily.framework/MaterialMotionMaterialMotionGesturesFamily"
"product": "MaterialMotionDirectManipulationFamily.framework/MaterialMotionDirectManipulationFamily"
},
"pre-build": "pod install"
}
Expand Down
5 changes: 4 additions & 1 deletion .arcunit
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
"engines": {
"xcode": {
"type": "xcode-test-engine",
"include": "(\\.(m|h|mm|swift)$)",
"include": [
"(\\.(m|h|mm|swift)$)",
"(Podfile)"
],
"exclude": "(/Pods/)"
}
}
Expand Down
3 changes: 3 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
coverage:
ignore:
- "examples/"
9 changes: 0 additions & 9 deletions .gitmodules

This file was deleted.

13 changes: 8 additions & 5 deletions .jazzy.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
module: MaterialMotionMaterialMotionGesturesFamily
module: MaterialMotionDirectManipulationFamily
module_version: 1.0.0
umbrella_header: src/MaterialMotionMaterialMotionGesturesFamily.h
objc: true
sdk: iphonesimulator
github_url: https://github.com/material-motion/material-motion-family-gestures-swift
github_file_prefix: https://github.com/material-motion/material-motion-family-gestures-swift/tree/v1.0.0
xcodebuild_arguments:
- -workspace
- MaterialMotionDirectManipulationFamily.xcworkspace
- -scheme
- MaterialMotionDirectManipulationFamily
github_url: https://github.com/material-motion/material-motion-family-direct-manipulation-swift
github_file_prefix: https://github.com/material-motion/material-motion-family-direct-manipulation-swift/tree/v1.0.0
1 change: 1 addition & 0 deletions .swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.0
27 changes: 9 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,17 @@
language: objective-c
osx_image: xcode7.3
osx_image: xcode8
sudo: false
notifications:
email: false
env:
global:
- LC_CTYPE=en_US.UTF-8
- LANG=en_US.UTF-8
matrix:
- DESTINATION="OS=9.3,name=iPhone 6s Plus"
- DESTINATION="OS=9.2,name=iPhone 6 Plus"
- DESTINATION="OS=9.1,name=iPhone 6s"
- DESTINATION="OS=9.0,name=iPhone 6 Plus"
- DESTINATION="OS=8.4,name=iPhone 6"
- DESTINATION="OS=8.3,name=iPhone 5S"
- DESTINATION="OS=8.2,name=iPhone 5"
- DESTINATION="OS=8.1,name=iPhone 4s"
before_install:
- gem install cocoapods --no-rdoc --no-ri --no-document --quiet
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
- pod install
- git clone https://github.com/phacility/arcanist.git
- git clone https://github.com/phacility/libphutil.git
- git clone --recursive https://github.com/material-foundation/material-arc-tools.git
- pod install --repo-update
script:
- set -o pipefail
- xcodebuild -workspace MaterialMotionMaterialMotionGesturesFamily.xcworkspace -scheme Catalog -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
- xcodebuild -workspace MaterialMotionMaterialMotionGesturesFamily.xcworkspace -scheme UnitTests -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c;
- arcanist/bin/arc unit --everything --trace
- xcodebuild build -workspace MaterialMotionDirectManipulationFamily.xcworkspace -scheme Catalog -sdk "iphonesimulator10.0" -destination "name=iPhone 6s,OS=10.0" ONLY_ACTIVE_ARCH=YES | xcpretty -c;
after_success:
- bash <(curl -s https://codecov.io/bash)
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This is the list of UIGestureRecognizer Material Motion Family authors for copyright purposes.
# This is the list of Direct Manipulation Material Motion Family in Swift authors for copyright purposes.
#
# This does not necessarily list everyone who has contributed code, since in
# some cases, their employer may be the copyright holder. To see the full list
Expand Down
136 changes: 136 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
# 1.0.0

Includes `DirectlyManipulable`, `Draggable`, `Pinchable`, `Rotatable`, and `ChangeAnchorPoint`
plans.

## Source changes

* [Address warnings detected from pod lib lint.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/feaa39efa59a972ecb42b4ea6351c936a2d6a755) (Jeff Verkoeyen)
* [Upgrade to Runtime v5.0.0 APIs.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/c61cc395aa80ef209703a5774e59ce9b208f8015) (Jeff Verkoeyen)
* [Fix typo in Rotatable docs.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/c2fd59c62274ce538e2ad55cde6f6e4a9c52de79) (Jeff Verkoeyen)
* [Remove plan exposure from DirectlyManipulable.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/cd7e9ce7864fdd3d62d4ed27cf3696c8fcee626b) (Jeff Verkoeyen)
* [Add DirectlyManipulable documentation.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/18cc7ef63999d38f08f8dfa3c98e01b724556569) (Jeff Verkoeyen)
* [Add Rotatable documentation.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/4148f3fdf89a3d5745b68593c0a68068e9a80c28) (Jeff Verkoeyen)
* [Add Pinchable documentation.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/19a12148c3c226fbe7aa819fd395fd2b11d88c98) (Jeff Verkoeyen)
* [Add Draggable documentation.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/3ebcb24a4b786025c5f271e1b2647d992b930c92) (Jeff Verkoeyen)
* [Add ChangeAnchorPoint documentation.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/4df5ce7eec0e1ae422302bd248a16536cf4c1b33) (Jeff Verkoeyen)
* [Explode all source into separate files and private/ sub-folder.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/fc1d1681a1f6d29eb7471a1082e9b6e13d6225ed) (Jeff Verkoeyen)
* [Enable isUserInteractionEnabled when adding direct manipulation plans to views.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/ccb39d3d57b9a7f25a4296c4d2cbc4e115ba5bb8) (Jeff Verkoeyen)
* [gesture unit tests](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/ce18107f293064f1d15f85b29bd5e9704b8ac84a) (Rich Cameron (rcameron))
* [Add objc names](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/b414f2ab21258d4bc573f6bc2198320de3f4e8ff) (Rich Cameron (rcameron))
* [Ran yo mm-github, update podspec, and fix build breaks.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/5e19762ae69e46ad81bf682c1dea7add0fa9cbcc) (Jeff Verkoeyen)
* [use anchor point during direct manipulation](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/67e898506d513b0a226c6fce17c298bc57554f54) (Rich Cameron (rcameron))
* [Add Pinchable, Rotatable and DirectlyManipulable plans](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/3167a04fa8b9ccbccc2d28469ccb8c0864bcf7c8) (Rich Cameron (rcameron))
* [Implement draggable plan and rename library to direct manipulation](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/5813d0d79fe9a5b5ff212ddac1f353cb8d354cec) (Rich Cameron (rcameron))
* [Xcode 8 GM build fixes.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/abc45e3ee5fca66ee6af6f3df31678e63c3d2394) (Jeff Verkoeyen)
* [Xcode 8 beta 6 build error fixes.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/69db5133979ff5b88a303afcd95b72e1a0f20849) (Jeff Verkoeyen)
* [UIGestureRecognizer wrapper](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/fa17504193674682daad92b4aa6bc06a1e4513ec) (Rich Cameron (rcameron))
* [Remove unnecessary umbrella header.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/0732b329485f8afdd684defa6ebde46875cb92a7) (Jeff Verkoeyen)

## API changes

Auto-generated by running:

apidiff origin/stable release-candidate swift MaterialMotionDirectManipulationFamily.xcworkspace MaterialMotionDirectManipulationFamily

## DirectlyManipulable

*new* method: `init()` in `DirectlyManipulable`

*new* method: `performerClass()` in `DirectlyManipulable`

*new* class: `DirectlyManipulable`

*new* method: `copy(with:)` in `DirectlyManipulable`

*new* var: `panGestureRecognizer` in `DirectlyManipulable`

*new* var: `pinchGestureRecognizer` in `DirectlyManipulable`

*new* var: `rotationGestureRecognizer` in `DirectlyManipulable`

*new* method: `init(panGestureRecognizer:pinchGestureRecognizer:rotationGestureRecognizer:)` in `DirectlyManipulable`

## ChangeAnchorPoint

*new* class: `ChangeAnchorPoint`

*new* method: `copy(with:)` in `ChangeAnchorPoint`

*new* method: `init(withAnchorPoint:)` in `ChangeAnchorPoint`

*new* method: `performerClass()` in `ChangeAnchorPoint`

## makeAnchorPointAdjustment(using:on:)

*new* function: `makeAnchorPointAdjustment(using:on:)`

## anchorPoint

*new* var: `anchorPoint`

## Pinchable

*new* method: `performerClass()` in `Pinchable`

*new* class: `Pinchable`

*new* method: `copy(with:)` in `Pinchable`

*new* method: `init()` in `Pinchable`

*new* var: `pinchGestureRecognizer` in `Pinchable`

*new* var: `shouldAdjustAnchorPointOnGestureStart` in `Pinchable`

*new* method: `init(withGestureRecognizer:)` in `Pinchable`

## Draggable

*new* method: `init()` in `Draggable`

*new* class: `Draggable`

*new* var: `panGestureRecognizer` in `Draggable`

*new* var: `shouldAdjustAnchorPointOnGestureStart` in `Draggable`

*new* method: `copy(with:)` in `Draggable`

*new* method: `performerClass()` in `Draggable`

*new* method: `init(withGestureRecognizer:)` in `Draggable`

## Rotatable

*new* method: `init(withGestureRecognizer:)` in `Rotatable`

*new* method: `copy(with:)` in `Rotatable`

*new* var: `rotationGestureRecognizer` in `Rotatable`

*new* var: `shouldAdjustAnchorPointOnGestureStart` in `Rotatable`

*new* class: `Rotatable`

*new* method: `init()` in `Rotatable`

*new* method: `performerClass()` in `Rotatable`

## Non-source changes

* [Automatic changelog preparation for release.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/c5696a2ce2a94c6fcc64266d5935764a39a0e858) (Jeff Verkoeyen)
* [Add initial README.md content.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/ae9b29ed6205982124d666219d023b5f525eefa0) (Jeff Verkoeyen)
* [Add CatalogByConvention.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/b4418fa130eba7691f958a1742df764a8e9a57dd) (Jeff Verkoeyen)
* [Update Podfile.lock with latest CocoaPods version.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/fdbd8a220ac4e3f86e85baba0f26e70dfc0e2bc9) (Jeff Verkoeyen)
* [Regenerate Podfile.lock.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/a726b12b420e496490a49e06e53f03e8d085a70d) (Jeff Verkoeyen)
* [Re-ran yo mm-github.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/02b31b620b89c5fcd932d9f4d0af17f952b94b5b) (Jeff Verkoeyen)
* [Add codecov.yml configuration ignoring examples source.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/4b76343887c7f7d62c79b1f979522c0a78b83dc4) (Jeff Verkoeyen)
* [Generate project and update source to Xcode 8 beta 4.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/3a54751ec8e8b1526698e4c4f32deb289c63ed0b) (Jeff Verkoeyen)
* [Ran yo mm-github.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/bf1ea4c26b6805873bc1e4dd8dc0e197fd12c1f0) (Jeff Verkoeyen)
* [Automated large-scaled change: removed all submodules.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/f8acc7e79708e003308023600664bc25f488dee3) (Jeff Verkoeyen)
* [[automated lsc] Add --trace to arc unit invocation for travis builds.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/6655d0cb9b9896c6b19368b9d4a51d4f6cef8aae) (Jeff Verkoeyen)
* [Resolve xcodebuild hang caused by uppercase S in "iPhone 6S".](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/80fadc4e9c8d4481d2a529399c070e5fb55a8b58) (Jeff Verkoeyen)
* [Add Podfile to .arcunit whitelist.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/7092f0b813a58ee6eb886e81fed19541c63111f2) (Jeff Verkoeyen)
* [Ran yo mm-github again to add missing submodules.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/898913205a0738290f4f36dcce4ae3a4cfcf6c2b) (Jeff Verkoeyen)
* [Re-ran yo mm-github with proper component name.](https://github.com/material-motion/material-motion-family-direct-manipulation-swift/commit/78fcc2470468b5ea3d53725f4b13102b18ac2438) (Jeff Verkoeyen)
15 changes: 15 additions & 0 deletions MaterialMotionDirectManipulationFamily.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Pod::Spec.new do |s|
s.name = "MaterialMotionDirectManipulationFamily"
s.summary = "Direct Manipulation Material Motion Family in Swift"
s.version = "1.0.0"
s.authors = "The Material Motion Authors"
s.license = "Apache 2.0"
s.homepage = "https://github.com/material-motion/material-motion-family-direct-manipulation-swift"
s.source = { :git => "https://github.com/material-motion/material-motion-family-direct-manipulation-swift.git", :tag => "v" + s.version.to_s }
s.platform = :ios, "8.0"
s.requires_arc = true

s.source_files = "src/*.{swift}", "src/private/*.{swift}"

s.dependency "MaterialMotionRuntime", "~> 5.0"
end
13 changes: 0 additions & 13 deletions MaterialMotionMaterialMotionGesturesFamily.podspec

This file was deleted.

12 changes: 9 additions & 3 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
abstract_target 'MaterialMotionMaterialMotionGesturesFamily' do
pod 'MaterialMotionMaterialMotionGesturesFamily', :path => './'
abstract_target 'MaterialMotionDirectManipulationFamily' do
pod 'MaterialMotionRuntime'
pod 'CatalogByConvention'

workspace 'MaterialMotionMaterialMotionGesturesFamily.xcworkspace'
pod 'MaterialMotionDirectManipulationFamily', :path => './'

workspace 'MaterialMotionDirectManipulationFamily.xcworkspace'
use_frameworks!

target "Catalog" do
Expand All @@ -16,6 +19,9 @@ abstract_target 'MaterialMotionMaterialMotionGesturesFamily' do
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?("Material")
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
end
end
Expand Down
23 changes: 23 additions & 0 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
PODS:
- CatalogByConvention (2.0.0)
- MaterialMotionDirectManipulationFamily (1.0.0):
- MaterialMotionRuntime (~> 5.0)
- MaterialMotionRuntime (5.0.0)

DEPENDENCIES:
- CatalogByConvention
- MaterialMotionDirectManipulationFamily (from `./`)
- MaterialMotionRuntime

EXTERNAL SOURCES:
MaterialMotionDirectManipulationFamily:
:path: "./"

SPEC CHECKSUMS:
CatalogByConvention: be55c2263132e4f9f59299ac8a528ee8715b3275
MaterialMotionDirectManipulationFamily: 6f8aa7ed6d51befd5eb6caa21817d6c17943961d
MaterialMotionRuntime: 620695e40aaf12f728342cef0b784b1d3eaa1125

PODFILE CHECKSUM: 9103685dd4a7cb2c3f2ddbb3dc20de80f8e57c86

COCOAPODS: 1.1.1
Loading

0 comments on commit b5c647e

Please sign in to comment.