Merge branch 'yefengming/升级依赖库GMCache' into 'master'

升级依赖库GMCache



See merge request !15

Example/GMPhobos.xcodeproj/project.pbxproj

@@ -40,7 +40,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		259B47496C313B9EC720BD76 /* GMPhobos.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = GMPhobos.podspec; path = ../GMPhobos.podspec; sourceTree = "<group>"; };
+		259B47496C313B9EC720BD76 /* GMPhobos.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = GMPhobos.podspec; path = ../GMPhobos.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		307F0A9AE09C3400AA3E80C3 /* Pods_GMPhobos_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GMPhobos_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3E2C3B0828BB1AA652517366 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
 		5973B392CD963C413ADE924A /* Pods-GMPhobos_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GMPhobos_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-GMPhobos_Example/Pods-GMPhobos_Example.release.xcconfig"; sourceTree = "<group>"; };
@@ -221,7 +221,6 @@
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
 				FEDD47C43B929695EFF32BE0 /* [CP] Embed Pods Frameworks */,
-				13381FCFD88365AF5C21FA4D /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -240,8 +239,6 @@
 				6003F5AA195388D20070C39A /* Sources */,
 				6003F5AB195388D20070C39A /* Frameworks */,
 				6003F5AC195388D20070C39A /* Resources */,
-				E6E17D5D4D2DFEACE6F397E5 /* [CP] Embed Pods Frameworks */,
-				2D8FF62EAEAD5B4F831EA709 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -314,36 +311,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		13381FCFD88365AF5C21FA4D /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GMPhobos_Example/Pods-GMPhobos_Example-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		2D8FF62EAEAD5B4F831EA709 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GMPhobos_Tests/Pods-GMPhobos_Tests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		5F02FD34F57153E44D4AC212 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -380,21 +347,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		E6E17D5D4D2DFEACE6F397E5 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GMPhobos_Tests/Pods-GMPhobos_Tests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		FEDD47C43B929695EFF32BE0 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

Example/Podfile.lock

 PODS:
-  - GMCache (0.2.1):
+  - GMCache (0.2.3):
     - TMCache (= 2.1.0)
   - GMKit (0.8.4):
     - GMKit/Category (= 0.8.4)
@@ -35,8 +35,8 @@ PODS:
   - GMKit/Protocol (0.8.4):
     - Masonry (= 1.1.0)
     - SDWebImage (= 3.7.6)
-  - GMPhobos (0.5.5):
-    - GMCache (= 0.2.1)
+  - GMPhobos (0.5.6):
+    - GMCache (= 0.2.3)
     - GMKit
   - Masonry (1.1.0)
   - SDWebImage (3.7.6):
@@ -47,18 +47,27 @@ PODS:
 DEPENDENCIES:
   - GMPhobos (from `../`)
 
+SPEC REPOS:
+  "git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git":
+    - GMCache
+    - GMKit
+  https://github.com/cocoapods/specs.git:
+    - Masonry
+    - SDWebImage
+    - TMCache
+
 EXTERNAL SOURCES:
   GMPhobos:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
-  GMCache: 776334eaa82af7b807c3420e383920d5353e4534
+  GMCache: 09a3029c96fe130e3a21faef70b3d9d2ce92d639
   GMKit: a30da06b84e5c4a357d427c70d1b5ec672a1f6a1
-  GMPhobos: 074fa6b0373abaef4c541c4cfd3a805a31bdd706
+  GMPhobos: cbb6997625f8eb6f0fcf7146c754f2a5564db070
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   SDWebImage: c325cf02c30337336b95beff20a13df489ec0ec9
   TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
 
 PODFILE CHECKSUM: ea0fac2144ac80baf8f21576cde49526c19991ad
 
-COCOAPODS: 1.4.0
+COCOAPODS: 1.5.3

GMPhobos.podspec

@@ -24,7 +24,7 @@ Pod::Spec.new do |s|
 
   s.platform     = :ios, '8.0'
   s.source_files = 'GMPhobos/Classes/*.{h,m}'
-  s.dependency 'GMCache', '0.2.1'
+  s.dependency 'GMCache', '0.2.3'
   s.dependency 'GMKit'
   s.library   = 'z'