master: updating for CocoaPods

3458de57 · Daniel Dahan · 1fabe897 · 1fabe897 · 3458de57 · 3458de57
Commit 3458de57 authored Jul 20, 2017 by Daniel Dahan
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 42 deletions

Frameworks/Motion/Sources/Motion.h
+0 -34

Material.xcodeproj/project.pbxproj
+0 -4

Sources/iOS/Material+MotionAnimation.swift
+4 -4

No files found.
--- a/Frameworks/Motion/Sources/Motion.h
+++ b/Frameworks/Motion/Sources/Motion.h
-/*
- * The MIT License (MIT)
- *
- * Copyright (C) 2017, Daniel Dahan and CosmicMind, Inc. <http://cosmicmind.com>.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#import <Foundation/Foundation.h>
-//! Project version number for Motion.
-FOUNDATION_EXPORT double MotionVersionNumber;
-//! Project version string for Motion.
-FOUNDATION_EXPORT const unsigned char MotionVersionString[];
-// In this header, you should import all the public headers of your framework using statements like #import <Motion/PublicHeader.h>
--- a/Material.xcodeproj/project.pbxproj
+++ b/Material.xcodeproj/project.pbxproj
@@ -219,7 +219,6 @@
 		96F3452B1F1960A300EE27C9 /* Motion+UIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F345031F1960A300EE27C9 /* Motion+UIView.swift */; };
 		96F3452C1F1960A300EE27C9 /* Motion+UIViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F345041F1960A300EE27C9 /* Motion+UIViewController.swift */; };
 		96F3452D1F1960A300EE27C9 /* MotionAnimationFillMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F345051F1960A300EE27C9 /* MotionAnimationFillMode.swift */; };
-		96F345301F1960A300EE27C9 /* Motion.h in Headers */ = {isa = PBXBuildFile; fileRef = 96F345081F1960A300EE27C9 /* Motion.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		96F345311F1960A300EE27C9 /* Motion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F345091F1960A300EE27C9 /* Motion.swift */; };
 		96F345321F1960A300EE27C9 /* MotionAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F3450A1F1960A300EE27C9 /* MotionAnimation.swift */; };
 		96F345331F1960A300EE27C9 /* MotionAnimationState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96F3450B1F1960A300EE27C9 /* MotionAnimationState.swift */; };
@@ -350,7 +349,6 @@
 		96F345051F1960A300EE27C9 /* MotionAnimationFillMode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimationFillMode.swift; sourceTree = "<group>"; };
 		96F345061F1960A300EE27C9 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		96F345071F1960A300EE27C9 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
-		96F345081F1960A300EE27C9 /* Motion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Motion.h; sourceTree = "<group>"; };
 		96F345091F1960A300EE27C9 /* Motion.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Motion.swift; sourceTree = "<group>"; };
 		96F3450A1F1960A300EE27C9 /* MotionAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimation.swift; sourceTree = "<group>"; };
 		96F3450B1F1960A300EE27C9 /* MotionAnimationState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionAnimationState.swift; sourceTree = "<group>"; };
@@ -812,7 +810,6 @@
 			children = (
 				96F345061F1960A300EE27C9 /* Info.plist */,
 				96F345071F1960A300EE27C9 /* LICENSE */,
-				96F345081F1960A300EE27C9 /* Motion.h */,
 				96F345091F1960A300EE27C9 /* Motion.swift */,
 				96F3450A1F1960A300EE27C9 /* MotionAnimation.swift */,
 				96F3450B1F1960A300EE27C9 /* MotionAnimationState.swift */,
@@ -961,7 +958,6 @@
 				9685D5AF1F0F04CB00AFEB79 /* CardCollectionViewCell.swift in Headers */,
 				9685D5B01F0F04CB00AFEB79 /* CardCollectionViewController.swift in Headers */,
 				9685D5B11F0F04CB00AFEB79 /* Material+MotionAnimation.swift in Headers */,
-				96F345301F1960A300EE27C9 /* Motion.h in Headers */,
 				96E09D231F2105DA0000B121 /* Motion.swift in Headers */,
 				96E09D241F2105DA0000B121 /* MotionAnimation.swift in Headers */,
 				96E09D251F2105DA0000B121 /* MotionAnimationState.swift in Headers */,

--- a/Sources/iOS/Material+MotionAnimation.swift
+++ b/Sources/iOS/Material+MotionAnimation.swift
@@ -30,13 +30,13 @@
 import UIKit
-extension MotionAnimation {
+public extension MotionAnimation {
    /**
     Animates the view's current shadow offset to the given one.
     - Parameter offset: A CGSize.
     - Returns: A MotionAnimation.
     */
-    public static func shadow(offset: Offset) -> MotionAnimation {
+    static func shadow(offset: Offset) -> MotionAnimation {
        return .shadow(offset: offset.asSize)
    }
@@ -44,7 +44,7 @@ extension MotionAnimation {
     Animates the views shadow offset, opacity, and radius using a DepthPreset.
     - Parameter _ preset: A DepthPreset.
     */
-    public static func depth(_ preset: DepthPreset) -> MotionAnimation {
+    static func depth(_ preset: DepthPreset) -> MotionAnimation {
        return .depth(DepthPresetToValue(preset: preset).rawValue)
    }
@@ -52,7 +52,7 @@ extension MotionAnimation {
     Animates the views shadow offset, opacity, and radius using a given Depth.
     - Parameter _ preset: A Depth.
     */
-    public static func depth(_ depth: Depth) -> MotionAnimation {
+    static func depth(_ depth: Depth) -> MotionAnimation {
        return .depth(depth.rawValue)
    }
 }