Merge branch 'master' of https://github.com/hyperoslo/ImagePicker

haozhiyu1990 · May 22, 2016 · 0987497 · 0987497
2 parents d0d2c50 + 429352c
commit 0987497
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 21 deletions.
diff --git a/Demo/ImagePickerDemo/ImagePickerDemo.xcodeproj/project.pbxproj b/Demo/ImagePickerDemo/ImagePickerDemo.xcodeproj/project.pbxproj
@@ -124,12 +124,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 29D699F81B70ABFC0021FA73 /* Build configuration list for PBXNativeTarget "ImagePickerDemo" */;
 			buildPhases = (
-				CFC24DB54992EE46F3A63C6F /* Check Pods Manifest.lock */,
+				CFC24DB54992EE46F3A63C6F /* 📦 Check Pods Manifest.lock */,
 				29D699D51B70ABFC0021FA73 /* Sources */,
 				29D699D61B70ABFC0021FA73 /* Frameworks */,
 				29D699D71B70ABFC0021FA73 /* Resources */,
-				A0BD0958A43D0416D3FF9365 /* Embed Pods Frameworks */,
-				6821C4AC157C46704C0307CA /* Copy Pods Resources */,
+				A0BD0958A43D0416D3FF9365 /* 📦 Embed Pods Frameworks */,
+				6821C4AC157C46704C0307CA /* 📦 Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -188,44 +188,44 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		6821C4AC157C46704C0307CA /* Copy Pods Resources */ = {
+		6821C4AC157C46704C0307CA /* 📦 Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Copy Pods Resources";
+			name = "📦 Copy Pods Resources";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ImagePickerDemo/Pods-ImagePickerDemo-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		A0BD0958A43D0416D3FF9365 /* Embed Pods Frameworks */ = {
+		A0BD0958A43D0416D3FF9365 /* 📦 Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Embed Pods Frameworks";
+			name = "📦 Embed Pods Frameworks";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ImagePickerDemo/Pods-ImagePickerDemo-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		CFC24DB54992EE46F3A63C6F /* Check Pods Manifest.lock */ = {
+		CFC24DB54992EE46F3A63C6F /* 📦 Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Check Pods Manifest.lock";
+			name = "📦 Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/Demo/ImagePickerDemo/Podfile b/Demo/ImagePickerDemo/Podfile
@@ -5,5 +5,4 @@ inhibit_all_warnings!
 
 target "ImagePickerDemo" do
   pod 'ImagePicker', path: '../../'
-  pod 'MainThreadGuard', :git => 'https://github.com/onmyway133/MainThreadGuard'
 end
diff --git a/Demo/ImagePickerDemo/Podfile.lock b/Demo/ImagePickerDemo/Podfile.lock
@@ -1,24 +1,16 @@
 PODS:
   - ImagePicker (1.3)
-  - MainThreadGuard (0.1.0)
 
 DEPENDENCIES:
   - ImagePicker (from `../../`)
-  - MainThreadGuard (from `https://github.com/onmyway133/MainThreadGuard`)
 
 EXTERNAL SOURCES:
   ImagePicker:
     :path: "../../"
-  MainThreadGuard:
-    :git: https://github.com/onmyway133/MainThreadGuard
-
-CHECKOUT OPTIONS:
-  MainThreadGuard:
-    :commit: 6a22bcfb2d7fd7dbf097c37cb7756be9d07dadd1
-    :git: https://github.com/onmyway133/MainThreadGuard
 
 SPEC CHECKSUMS:
   ImagePicker: 667e68fdef7b08dcbb5879e410b37f331f82fc3e
-  MainThreadGuard: 401a64b400d749b41a9c1fe93086af05c3f33333
 
-COCOAPODS: 0.39.0
+PODFILE CHECKSUM: ebbcd890a98cb01cb66183bea63d5e8e97f82923
+
+COCOAPODS: 1.0.0