Merge branch 'release/2.4.1' into develop

ViewDeck · Dec 2, 2015 · 30417aa · 30417aa
2 parents dfd5af1 + 05f8c20
commit 30417aa
Show file tree

Hide file tree

Showing 12 changed files with 292 additions and 189 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - ViewDeck (2.3.1)
+  - ViewDeck (2.4.1)
 
 DEPENDENCIES:
   - ViewDeck (from `../`)
@@ -9,6 +9,6 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  ViewDeck: deab9bd325bf7108063b80facfa5bcd6b9007811
+  ViewDeck: e4c744cb5383cbae40cf286c6e7246df33962020
 
-COCOAPODS: 0.38.2
+COCOAPODS: 0.39.0
diff --git a/Example/Pods/Local Podspecs/ViewDeck.podspec.json b/Example/Pods/Local Podspecs/ViewDeck.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/ViewDeck.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/ViewDeck.xcscheme
diff --git a/Example/Pods/Target Support Files/Pods-ViewDeckExample/Pods-ViewDeckExample-frameworks.sh b/Example/Pods/Target Support Files/Pods-ViewDeckExample/Pods-ViewDeckExample-frameworks.sh
diff --git a/Example/Pods/Target Support Files/Pods-ViewDeckExample/Pods-ViewDeckExample-resources.sh b/Example/Pods/Target Support Files/Pods-ViewDeckExample/Pods-ViewDeckExample-resources.sh
diff --git a/Example/Pods/Target Support Files/ViewDeck/ViewDeck-Private.xcconfig b/Example/Pods/Target Support Files/ViewDeck/ViewDeck-Private.xcconfig
diff --git a/Example/Pods/Target Support Files/ViewDeck/ViewDeck.xcconfig b/Example/Pods/Target Support Files/ViewDeck/ViewDeck.xcconfig
diff --git a/Example/ViewDeckExample.xcodeproj/project.pbxproj b/Example/ViewDeckExample.xcodeproj/project.pbxproj
@@ -179,6 +179,7 @@
 				E240A9A4148AB3770077282A /* Frameworks */,
 				E240A9A5148AB3770077282A /* Resources */,
 				ADB09EC62F5FE01FB6540340 /* Copy Pods Resources */,
+				14779D12D059593AFC718EC8 /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -250,6 +251,21 @@
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
+		14779D12D059593AFC718EC8 /* Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ViewDeckExample/Pods-ViewDeckExample-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		ADB09EC62F5FE01FB6540340 /* Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.4.0
+2.4.1
diff --git a/ViewDeck.podspec b/ViewDeck.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name      = 'ViewDeck'
-  s.version   = '2.4.0'
+  s.version   = '2.4.1'
   s.platform  = :ios
   s.summary   = 'An implementation of the sliding functionality found in the ' \
                 'Path 2.0 or Facebook iOS apps.'