Commit e932e0dd authored by 翟国钧's avatar 翟国钧

bugfix:business_id 为空

parents 1cb95fc8 ce37bb8b
......@@ -208,12 +208,12 @@
isa = PBXNativeTarget;
buildConfigurationList = 6003F5BF195388D20070C39A /* Build configuration list for PBXNativeTarget "GMPhobos_Example" */;
buildPhases = (
9C816B48AC518C7C51C2DAE6 /* 📦 Check Pods Manifest.lock */,
9C816B48AC518C7C51C2DAE6 /* [CP] Check Pods Manifest.lock */,
6003F586195388D20070C39A /* Sources */,
6003F587195388D20070C39A /* Frameworks */,
6003F588195388D20070C39A /* Resources */,
FEDD47C43B929695EFF32BE0 /* 📦 Embed Pods Frameworks */,
B1BE839C8D7CB38052ED84D1 /* 📦 Copy Pods Resources */,
FEDD47C43B929695EFF32BE0 /* [CP] Embed Pods Frameworks */,
B1BE839C8D7CB38052ED84D1 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
......@@ -228,12 +228,12 @@
isa = PBXNativeTarget;
buildConfigurationList = 6003F5C2195388D20070C39A /* Build configuration list for PBXNativeTarget "GMPhobos_Tests" */;
buildPhases = (
5F02FD34F57153E44D4AC212 /* 📦 Check Pods Manifest.lock */,
5F02FD34F57153E44D4AC212 /* [CP] Check Pods Manifest.lock */,
6003F5AA195388D20070C39A /* Sources */,
6003F5AB195388D20070C39A /* Frameworks */,
6003F5AC195388D20070C39A /* Resources */,
6A6A2941869562845661D8FF /* 📦 Embed Pods Frameworks */,
680392E325EDB9514EAD7BF6 /* 📦 Copy Pods Resources */,
6A6A2941869562845661D8FF /* [CP] Embed Pods Frameworks */,
680392E325EDB9514EAD7BF6 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
......@@ -304,14 +304,14 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
5F02FD34F57153E44D4AC212 /* 📦 Check Pods Manifest.lock */ = {
5F02FD34F57153E44D4AC212 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Check Pods Manifest.lock";
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -319,14 +319,14 @@
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;
};
680392E325EDB9514EAD7BF6 /* 📦 Copy Pods Resources */ = {
680392E325EDB9514EAD7BF6 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Copy Pods Resources";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -334,14 +334,14 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GMPhobos_Tests/Pods-GMPhobos_Tests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
6A6A2941869562845661D8FF /* 📦 Embed Pods Frameworks */ = {
6A6A2941869562845661D8FF /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Embed Pods Frameworks";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -349,14 +349,14 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GMPhobos_Tests/Pods-GMPhobos_Tests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
9C816B48AC518C7C51C2DAE6 /* 📦 Check Pods Manifest.lock */ = {
9C816B48AC518C7C51C2DAE6 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Check Pods Manifest.lock";
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -364,14 +364,14 @@
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;
};
B1BE839C8D7CB38052ED84D1 /* 📦 Copy Pods Resources */ = {
B1BE839C8D7CB38052ED84D1 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Copy Pods Resources";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -379,14 +379,14 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GMPhobos_Example/Pods-GMPhobos_Example-resources.sh\"\n";
showEnvVarsInLog = 0;
};
FEDD47C43B929695EFF32BE0 /* 📦 Embed Pods Frameworks */ = {
FEDD47C43B929695EFF32BE0 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Embed Pods Frameworks";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -480,7 +480,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
......@@ -513,7 +513,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
......@@ -567,7 +567,6 @@
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_IDENTITY = "iPhone Developer";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(DEVELOPER_FRAMEWORKS_DIR)",
);
......@@ -578,6 +577,7 @@
"$(inherited)",
);
INFOPLIST_FILE = "Tests/Tests-Info.plist";
LIBRARY_SEARCH_PATHS = "";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "c7e6dc21-c52f-40e4-a435-5e942f0af080";
......@@ -600,6 +600,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Tests/Tests-Prefix.pch";
INFOPLIST_FILE = "Tests/Tests-Info.plist";
LIBRARY_SEARCH_PATHS = "";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "c7e6dc21-c52f-40e4-a435-5e942f0af080";
......
PODS:
- GMCache (0.1.0):
- TMCache (~> 2.1.0)
- GMPhobos (0.2.4):
- GMPhobos (0.2.8):
- GMCache (~> 0.1.0)
- TMCache (2.1.0)
......@@ -14,9 +14,9 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
GMCache: a7b06a2d8a5a1c7cf023055c631ba9a0cd7c39fc
GMPhobos: 7a5b2620969116656d83de6d3d6c46bc749addd2
GMPhobos: fbadbb4fb6912b6e50fb7dd83802cac83dcaf899
TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
PODFILE CHECKSUM: ab2b5ff1dcd8a35fd02cced6c06c7f9477b82d69
COCOAPODS: 1.0.0
COCOAPODS: 1.0.1
{
"name": "GMPhobos",
"version": "0.2.4",
"version": "0.2.8",
"summary": "GM statistic data sdk",
"description": "GM event track sdk.",
"homepage": "http://git.gengmei.cc/gengmeiios/GMPhobos",
......@@ -10,7 +10,7 @@
},
"source": {
"git": "http://git.gengmei.cc/gengmeiios/GMPhobos.git",
"tag": "0.2.4"
"tag": "0.2.8"
},
"platforms": {
"ios": "8.0"
......
PODS:
- GMCache (0.1.0):
- TMCache (~> 2.1.0)
- GMPhobos (0.2.4):
- GMPhobos (0.2.8):
- GMCache (~> 0.1.0)
- TMCache (2.1.0)
......@@ -14,9 +14,9 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
GMCache: a7b06a2d8a5a1c7cf023055c631ba9a0cd7c39fc
GMPhobos: 7a5b2620969116656d83de6d3d6c46bc749addd2
GMPhobos: fbadbb4fb6912b6e50fb7dd83802cac83dcaf899
TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
PODFILE CHECKSUM: ab2b5ff1dcd8a35fd02cced6c06c7f9477b82d69
COCOAPODS: 1.0.0
COCOAPODS: 1.0.1
......@@ -8,37 +8,39 @@
/* Begin PBXBuildFile section */
007F13D9A08EBC4A30156207E73D1307 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B37A7387C010FBD4AF7EBD0AE9AF1D87 /* Foundation.framework */; };
04C0DA2024BE8A12B6374211F76DC63C /* Phobos.h in Headers */ = {isa = PBXBuildFile; fileRef = 9888D3221ABA7DE821AE9E2BEFE1A709 /* Phobos.h */; settings = {ATTRIBUTES = (Public, ); }; };
0CFBC5A4DB385139E416037045A82AB8 /* PhobosUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B5A1F1F5D1F73C8B0651406D5D62F57 /* PhobosUtil.m */; };
0E16F6F1263805586E06E2C89AD72878 /* TMCache-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 648D48538F1FDA79A1D98339B62CEF79 /* TMCache-dummy.m */; };
14E9E0A391C71BC9348730B06C0FCCD6 /* TMCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 98E348647A8DCCE51A6D5B27B262BA38 /* TMCache.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
15DDD58D214C20E9338DFC6C4ED858D3 /* GMCache-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = BED9D0CECA9C1D40570A1C65F7913799 /* GMCache-dummy.m */; };
18041A726EA5E2EB435C1BF6BF5FA556 /* Pods-GMPhobos_Example-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F21CC24420A852E1CFB5E3E8FAC03A1 /* Pods-GMPhobos_Example-dummy.m */; };
18831D96875A8EA064FB428F0BD6A7AC /* TMDiskCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC0DD62ADE399DE66473E1E769CD914 /* TMDiskCache.h */; settings = {ATTRIBUTES = (Public, ); }; };
18A33E672B4F3BBB89D617516BE49C30 /* GMPhobos-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = BE9CC8AC0694640A6257609F3B82CF83 /* GMPhobos-dummy.m */; };
24B8F6394D3255EA964085BA480B01BF /* TMCache.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F14156478362BBC9585128384AA0BE9 /* TMCache.framework */; };
258F60A71DA87CADE4A0E45834FF5DC0 /* WMCacheService.m in Sources */ = {isa = PBXBuildFile; fileRef = 889D99A9752A8229212F9C58C44DC099 /* WMCacheService.m */; };
27F684D14A75E0A30DCF068E0549D462 /* GMCache-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = E73F00F6C923DD698A9A3078634E6AE4 /* GMCache-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
2893F1C8E50728408D7C903B9D3F0063 /* Pods-GMPhobos_Example-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 39D964FD1C49A18C25EFB0981D02027B /* Pods-GMPhobos_Example-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
2D5BBE27D269F5ABCA1283F86BE63ADF /* PhobosUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = A947F471C56F4024674B8ADD771C83A6 /* PhobosUtil.m */; };
2E86531BC0E9C1D5580F05D9973D46E2 /* TMCache-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = C2CB26F71F89BA62B291BA877CEB1676 /* TMCache-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
31EB1D083240428D24AA641FA1007E60 /* GMPhobos-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = BE9CC8AC0694640A6257609F3B82CF83 /* GMPhobos-dummy.m */; };
34FE0393B4B9B294DF353FAE16B67B1F /* Phobos.h in Headers */ = {isa = PBXBuildFile; fileRef = 65A0A63C624ED660ABD4AC9258D255B5 /* Phobos.h */; settings = {ATTRIBUTES = (Public, ); }; };
45670AB914D1B871A398901B7C347E8A /* WMDocumentCache.h in Headers */ = {isa = PBXBuildFile; fileRef = E4948819EF8B738A78A0384A88F7772B /* WMDocumentCache.h */; settings = {ATTRIBUTES = (Project, ); }; };
486FEF1A2D3DC22FEB58945BA7A294C8 /* UIViewController+Phobos.m in Sources */ = {isa = PBXBuildFile; fileRef = AD00B73BAB34EBFC507A19EA1C21DE9D /* UIViewController+Phobos.m */; };
4FE13A113C7172DAC2E971613FDE757C /* Pods-GMPhobos_Tests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 1039452EE78F366E55BD28493A04FA33 /* Pods-GMPhobos_Tests-dummy.m */; };
50FDC49223E074EC07E7A06BC841978A /* TMMemoryCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1457E1883F1E2F3A041971E9FD326421 /* TMMemoryCache.h */; settings = {ATTRIBUTES = (Public, ); }; };
55DE9409A8A60B7EBC4EEC27CC8463EE /* PhobosConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D78DEF6D6F50A6E4A33E5E3AE20CD9C /* PhobosConfig.h */; settings = {ATTRIBUTES = (Public, ); }; };
5882855394E8892865F0D614BA905956 /* TMCacheBackgroundTaskManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A9BCE7331C623F8593B861FA4184E73B /* TMCacheBackgroundTaskManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
5ECBD1690AEA46BD92E44E096B40DF67 /* PhobosUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 9E930C1FFA83D23B9174F365EAE121B9 /* PhobosUtil.h */; settings = {ATTRIBUTES = (Public, ); }; };
62A0EA32AF5C33DAB0A6FD855AF352B3 /* Pods-GMPhobos_Tests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = A6A7EC974D37ED4E1AFD8B4FA0F5C8C9 /* Pods-GMPhobos_Tests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
68E5460D211224A50309A7D62D9DF2C5 /* TMDiskCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 919F15DA9E8330EAC7ADDAAA9AB353CA /* TMDiskCache.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
6EBEFB94CFD088BD32DA04266CC9F034 /* TMCache.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F14156478362BBC9585128384AA0BE9 /* TMCache.framework */; };
750C6610B5662ED24C3F56E6E66C1E23 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B37A7387C010FBD4AF7EBD0AE9AF1D87 /* Foundation.framework */; };
821BC60666B0AA5B8100522EB4DAC831 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B37A7387C010FBD4AF7EBD0AE9AF1D87 /* Foundation.framework */; };
9546803EF4B3E38DDBF0FB3058683805 /* GMPhobos-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FF4CA45B837E5F78BF43D996185823D /* GMPhobos-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
904D0482AD691AF342DF650B398869EC /* GMCache.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02360CC1277B16BFCF17411848E11A1F /* GMCache.framework */; };
A32F8FFE68BD686B5AF496AEC05B15B4 /* PhobosUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 11D303D911BC3041A77623F2445F3CFF /* PhobosUtil.h */; settings = {ATTRIBUTES = (Public, ); }; };
A43EFCD985E3B7A9554478382343E99F /* WMDocumentCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C7B51101963B4ECC14E4EE022BEAADA /* WMDocumentCache.m */; };
A64C166A95F7ACBFA95A88B07E4F6F41 /* PhobosConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E82A318F148F2EE13E41A780878CF20 /* PhobosConfig.h */; settings = {ATTRIBUTES = (Public, ); }; };
AF5AA415E4E4B7751BA5EB48B8E153A1 /* TMCache.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F14156478362BBC9585128384AA0BE9 /* TMCache.framework */; };
B109E7C534024F876FB065EB4BDD7345 /* GMCache.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02360CC1277B16BFCF17411848E11A1F /* GMCache.framework */; };
B58E754D7A1F1ADBA24AA805716C3EAB /* UIViewController+Phobos.h in Headers */ = {isa = PBXBuildFile; fileRef = 27440EFAD3362169444F61771C45997B /* UIViewController+Phobos.h */; settings = {ATTRIBUTES = (Public, ); }; };
B97B89A4104E366B331C500A6F9EADCC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B37A7387C010FBD4AF7EBD0AE9AF1D87 /* Foundation.framework */; };
BA04973FBC686D4450F6502C1E345FFC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B37A7387C010FBD4AF7EBD0AE9AF1D87 /* Foundation.framework */; };
D7F7F3896DCEEEB6DA58024C75991005 /* Phobos.m in Sources */ = {isa = PBXBuildFile; fileRef = F4E51CEF442885C143295307FFAFCC10 /* Phobos.m */; };
DC61F16C477B3F9AF4D0F328B3539326 /* GMPhobos-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FF4CA45B837E5F78BF43D996185823D /* GMPhobos-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
E02394A98848AE1A378051837922063F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B37A7387C010FBD4AF7EBD0AE9AF1D87 /* Foundation.framework */; };
F2865E72BBBB9AB236859D9F8AB5E784 /* TMCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 341795E8B39A4C6E7167076FD0877D2C /* TMCache.h */; settings = {ATTRIBUTES = (Public, ); }; };
F3FE5704FE326DC3FD2FF21F3D481E19 /* Phobos.m in Sources */ = {isa = PBXBuildFile; fileRef = 07F418D58C3A222718CDE51B9590C3B5 /* Phobos.m */; };
F553F7A2925B21418E0B0D0DFD1799D4 /* TMMemoryCache.m in Sources */ = {isa = PBXBuildFile; fileRef = E624CF42E36C4BDB5067CFE689CCFC08 /* TMMemoryCache.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; };
F7A85D8A1BDB3B0D057A966828386C03 /* WMCacheService.h in Headers */ = {isa = PBXBuildFile; fileRef = C28474C835F5C12B9AEBB46E741A86EB /* WMCacheService.h */; settings = {ATTRIBUTES = (Public, ); }; };
/* End PBXBuildFile section */
......@@ -51,25 +53,25 @@
remoteGlobalIDString = 3CEC93D360D00FDE7FB0084DC2464EAD;
remoteInfo = GMCache;
};
706284A68D335E339DECA5DAFC1A610F /* PBXContainerItemProxy */ = {
CDAFA1456D8159320D31CA8BF6CAB002 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
proxyType = 1;
remoteGlobalIDString = 3CEC93D360D00FDE7FB0084DC2464EAD;
remoteInfo = GMCache;
remoteGlobalIDString = 28923DD1C76A98F6675D115FD930DB64;
remoteInfo = TMCache;
};
C8EB68B31D18EEF4F354B620DBD9E0C0 /* PBXContainerItemProxy */ = {
D1766CD5DF3D1D6FAA8F2164F4FCA133 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
proxyType = 1;
remoteGlobalIDString = 28923DD1C76A98F6675D115FD930DB64;
remoteInfo = TMCache;
remoteGlobalIDString = 3CEC93D360D00FDE7FB0084DC2464EAD;
remoteInfo = GMCache;
};
E6E3168FF07B32830937E8291E6A91AA /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */;
proxyType = 1;
remoteGlobalIDString = 4D5EFB6B449BFCB2F03FD297009163FD;
remoteGlobalIDString = 9C1B3C6DCB1E0D374523918F264059A2;
remoteInfo = GMPhobos;
};
E7E41D55AF399EE3B6C3EB34062F94AC /* PBXContainerItemProxy */ = {
......@@ -91,14 +93,17 @@
/* Begin PBXFileReference section */
02360CC1277B16BFCF17411848E11A1F /* GMCache.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GMCache.framework; sourceTree = BUILT_PRODUCTS_DIR; };
0699811DA9133B4424EC7AF551E0D332 /* GMPhobos-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "GMPhobos-prefix.pch"; sourceTree = "<group>"; };
0E82A318F148F2EE13E41A780878CF20 /* PhobosConfig.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = PhobosConfig.h; sourceTree = "<group>"; };
07F418D58C3A222718CDE51B9590C3B5 /* Phobos.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = Phobos.m; sourceTree = "<group>"; };
0B5A1F1F5D1F73C8B0651406D5D62F57 /* PhobosUtil.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = PhobosUtil.m; sourceTree = "<group>"; };
1039452EE78F366E55BD28493A04FA33 /* Pods-GMPhobos_Tests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-GMPhobos_Tests-dummy.m"; sourceTree = "<group>"; };
11D303D911BC3041A77623F2445F3CFF /* PhobosUtil.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = PhobosUtil.h; sourceTree = "<group>"; };
1457E1883F1E2F3A041971E9FD326421 /* TMMemoryCache.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TMMemoryCache.h; path = TMCache/TMMemoryCache.h; sourceTree = "<group>"; };
16EF59421C5EC52A4FE200BCA9424CFD /* Pods-GMPhobos_Tests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-GMPhobos_Tests-acknowledgements.markdown"; sourceTree = "<group>"; };
177E7E1114C15B3B8C608BE70EB91424 /* GMPhobos.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GMPhobos.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1FF4CA45B837E5F78BF43D996185823D /* GMPhobos-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "GMPhobos-umbrella.h"; sourceTree = "<group>"; };
223B9C07FB3E339E268B4403316BCB71 /* Pods-GMPhobos_Example-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-GMPhobos_Example-resources.sh"; sourceTree = "<group>"; };
2529C33613D13F19BB7781325E80F8B5 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
27440EFAD3362169444F61771C45997B /* UIViewController+Phobos.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "UIViewController+Phobos.h"; sourceTree = "<group>"; };
276FE21527CE0F7665BB0943F316302A /* TMCache.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = TMCache.modulemap; sourceTree = "<group>"; };
288AA61C0CCF9ADA5F1A1719E188283D /* Pods-GMPhobos_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-GMPhobos_Tests.release.xcconfig"; sourceTree = "<group>"; };
2E0AE1CF5AD8BEF0B5A9F1A9DAA0A276 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
......@@ -115,6 +120,8 @@
5E3AE80D20AB728F5556665D5083A6F8 /* TMCache.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = TMCache.xcconfig; sourceTree = "<group>"; };
61E6168592FEB1F7E033E769CD6219E1 /* Pods-GMPhobos_Tests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-GMPhobos_Tests-frameworks.sh"; sourceTree = "<group>"; };
648D48538F1FDA79A1D98339B62CEF79 /* TMCache-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "TMCache-dummy.m"; sourceTree = "<group>"; };
65A0A63C624ED660ABD4AC9258D255B5 /* Phobos.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Phobos.h; sourceTree = "<group>"; };
6D78DEF6D6F50A6E4A33E5E3AE20CD9C /* PhobosConfig.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = PhobosConfig.h; sourceTree = "<group>"; };
79ABAE8A82ACFE461B00C0867775A29E /* Pods-GMPhobos_Example-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-GMPhobos_Example-acknowledgements.plist"; sourceTree = "<group>"; };
7C7B51101963B4ECC14E4EE022BEAADA /* WMDocumentCache.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = WMDocumentCache.m; path = GMCache/Classes/WMDocumentCache.m; sourceTree = "<group>"; };
889D99A9752A8229212F9C58C44DC099 /* WMCacheService.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = WMCacheService.m; path = GMCache/Classes/WMCacheService.m; sourceTree = "<group>"; };
......@@ -122,14 +129,12 @@
8F21CC24420A852E1CFB5E3E8FAC03A1 /* Pods-GMPhobos_Example-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-GMPhobos_Example-dummy.m"; sourceTree = "<group>"; };
919F15DA9E8330EAC7ADDAAA9AB353CA /* TMDiskCache.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = TMDiskCache.m; path = TMCache/TMDiskCache.m; sourceTree = "<group>"; };
93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
9888D3221ABA7DE821AE9E2BEFE1A709 /* Phobos.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = Phobos.h; sourceTree = "<group>"; };
98E348647A8DCCE51A6D5B27B262BA38 /* TMCache.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = TMCache.m; path = TMCache/TMCache.m; sourceTree = "<group>"; };
9A5E011464A0875C4ABBEBAFE19D6A5A /* Pods_GMPhobos_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GMPhobos_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9B4A38A63BA332BA886AD102B72BD1F3 /* Pods-GMPhobos_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-GMPhobos_Example.debug.xcconfig"; sourceTree = "<group>"; };
9E930C1FFA83D23B9174F365EAE121B9 /* PhobosUtil.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = PhobosUtil.h; sourceTree = "<group>"; };
A6A7EC974D37ED4E1AFD8B4FA0F5C8C9 /* Pods-GMPhobos_Tests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-GMPhobos_Tests-umbrella.h"; sourceTree = "<group>"; };
A947F471C56F4024674B8ADD771C83A6 /* PhobosUtil.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = PhobosUtil.m; sourceTree = "<group>"; };
A9BCE7331C623F8593B861FA4184E73B /* TMCacheBackgroundTaskManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TMCacheBackgroundTaskManager.h; path = TMCache/TMCacheBackgroundTaskManager.h; sourceTree = "<group>"; };
AD00B73BAB34EBFC507A19EA1C21DE9D /* UIViewController+Phobos.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+Phobos.m"; sourceTree = "<group>"; };
AD1C6256FCA6BEFBC24DC592A8F912F8 /* Pods-GMPhobos_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-GMPhobos_Tests.debug.xcconfig"; sourceTree = "<group>"; };
B37A7387C010FBD4AF7EBD0AE9AF1D87 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
B473EFB5E4A250D71C970F4E8EFE6547 /* GMCache.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = GMCache.modulemap; sourceTree = "<group>"; };
......@@ -147,7 +152,6 @@
E624CF42E36C4BDB5067CFE689CCFC08 /* TMMemoryCache.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = TMMemoryCache.m; path = TMCache/TMMemoryCache.m; sourceTree = "<group>"; };
E73F00F6C923DD698A9A3078634E6AE4 /* GMCache-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "GMCache-umbrella.h"; sourceTree = "<group>"; };
EC3D8A13D26D8A10EB9716CD423556A0 /* Pods-GMPhobos_Tests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-GMPhobos_Tests-resources.sh"; sourceTree = "<group>"; };
F4E51CEF442885C143295307FFAFCC10 /* Phobos.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = Phobos.m; sourceTree = "<group>"; };
F577567CFA744A8F447A2B72A65AEA8D /* GMPhobos.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = GMPhobos.modulemap; sourceTree = "<group>"; };
F5B74599F80A46BDAA45AB54B3E88AF1 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
FD52101833980CF5820D2F56C8484C5B /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
......@@ -180,13 +184,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
97B00CA8A70D205E71A455866EAC2E98 /* Frameworks */ = {
54349479B5602308A330D7A3CD8C66B7 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
BA04973FBC686D4450F6502C1E345FFC /* Foundation.framework in Frameworks */,
B109E7C534024F876FB065EB4BDD7345 /* GMCache.framework in Frameworks */,
AF5AA415E4E4B7751BA5EB48B8E153A1 /* TMCache.framework in Frameworks */,
750C6610B5662ED24C3F56E6E66C1E23 /* Foundation.framework in Frameworks */,
904D0482AD691AF342DF650B398869EC /* GMCache.framework in Frameworks */,
24B8F6394D3255EA964085BA480B01BF /* TMCache.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -211,6 +215,14 @@
name = Frameworks;
sourceTree = "<group>";
};
01CC1A236211C0114AD4D0E53536EBFC /* Pod */ = {
isa = PBXGroup;
children = (
2654EE5A77DC1DD528AB5B04F006E1B2 /* Classes */,
);
path = Pod;
sourceTree = "<group>";
};
038DC0073529673F7466DA59DA307178 /* Support Files */ = {
isa = PBXGroup;
children = (
......@@ -258,14 +270,6 @@
path = TMCache;
sourceTree = "<group>";
};
142DCB552050D113C4C7C421EBEC0742 /* Pod */ = {
isa = PBXGroup;
children = (
E532AE589D51DDBCCCF1402E987591C0 /* Classes */,
);
path = Pod;
sourceTree = "<group>";
};
15D48F0AA355D3E79BD4580E11BF01C1 /* Support Files */ = {
isa = PBXGroup;
children = (
......@@ -289,10 +293,24 @@
name = "Targets Support Files";
sourceTree = "<group>";
};
2654EE5A77DC1DD528AB5B04F006E1B2 /* Classes */ = {
isa = PBXGroup;
children = (
65A0A63C624ED660ABD4AC9258D255B5 /* Phobos.h */,
07F418D58C3A222718CDE51B9590C3B5 /* Phobos.m */,
6D78DEF6D6F50A6E4A33E5E3AE20CD9C /* PhobosConfig.h */,
11D303D911BC3041A77623F2445F3CFF /* PhobosUtil.h */,
0B5A1F1F5D1F73C8B0651406D5D62F57 /* PhobosUtil.m */,
27440EFAD3362169444F61771C45997B /* UIViewController+Phobos.h */,
AD00B73BAB34EBFC507A19EA1C21DE9D /* UIViewController+Phobos.m */,
);
path = Classes;
sourceTree = "<group>";
};
28ADB08AFE4B9E058B474D9AB49B39A7 /* GMPhobos */ = {
isa = PBXGroup;
children = (
142DCB552050D113C4C7C421EBEC0742 /* Pod */,
01CC1A236211C0114AD4D0E53536EBFC /* Pod */,
038DC0073529673F7466DA59DA307178 /* Support Files */,
);
name = GMPhobos;
......@@ -392,39 +410,28 @@
name = iOS;
sourceTree = "<group>";
};
E532AE589D51DDBCCCF1402E987591C0 /* Classes */ = {
isa = PBXGroup;
children = (
9888D3221ABA7DE821AE9E2BEFE1A709 /* Phobos.h */,
F4E51CEF442885C143295307FFAFCC10 /* Phobos.m */,
0E82A318F148F2EE13E41A780878CF20 /* PhobosConfig.h */,
9E930C1FFA83D23B9174F365EAE121B9 /* PhobosUtil.h */,
A947F471C56F4024674B8ADD771C83A6 /* PhobosUtil.m */,
);
path = Classes;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
2D97727E02B4E509EA28372BC3D0FE94 /* Headers */ = {
19D5CC05D285BFC21A2A926EF52D80EC /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
27F684D14A75E0A30DCF068E0549D462 /* GMCache-umbrella.h in Headers */,
F7A85D8A1BDB3B0D057A966828386C03 /* WMCacheService.h in Headers */,
45670AB914D1B871A398901B7C347E8A /* WMDocumentCache.h in Headers */,
DC61F16C477B3F9AF4D0F328B3539326 /* GMPhobos-umbrella.h in Headers */,
34FE0393B4B9B294DF353FAE16B67B1F /* Phobos.h in Headers */,
55DE9409A8A60B7EBC4EEC27CC8463EE /* PhobosConfig.h in Headers */,
A32F8FFE68BD686B5AF496AEC05B15B4 /* PhobosUtil.h in Headers */,
B58E754D7A1F1ADBA24AA805716C3EAB /* UIViewController+Phobos.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
731A8F43ED018FE8F70B174C29BE2B9D /* Headers */ = {
2D97727E02B4E509EA28372BC3D0FE94 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
9546803EF4B3E38DDBF0FB3058683805 /* GMPhobos-umbrella.h in Headers */,
04C0DA2024BE8A12B6374211F76DC63C /* Phobos.h in Headers */,
A64C166A95F7ACBFA95A88B07E4F6F41 /* PhobosConfig.h in Headers */,
5ECBD1690AEA46BD92E44E096B40DF67 /* PhobosUtil.h in Headers */,
27F684D14A75E0A30DCF068E0549D462 /* GMCache-umbrella.h in Headers */,
F7A85D8A1BDB3B0D057A966828386C03 /* WMCacheService.h in Headers */,
45670AB914D1B871A398901B7C347E8A /* WMDocumentCache.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -514,19 +521,19 @@
productReference = 9A5E011464A0875C4ABBEBAFE19D6A5A /* Pods_GMPhobos_Example.framework */;
productType = "com.apple.product-type.framework";
};
4D5EFB6B449BFCB2F03FD297009163FD /* GMPhobos */ = {
9C1B3C6DCB1E0D374523918F264059A2 /* GMPhobos */ = {
isa = PBXNativeTarget;
buildConfigurationList = B6215C0A40DBE05C57B1689DD85FC012 /* Build configuration list for PBXNativeTarget "GMPhobos" */;
buildConfigurationList = 90E3CF14D72177B525F4CA0B92E16CFC /* Build configuration list for PBXNativeTarget "GMPhobos" */;
buildPhases = (
7AE8D17DAB4552166C8CABC9D74AE38C /* Sources */,
97B00CA8A70D205E71A455866EAC2E98 /* Frameworks */,
731A8F43ED018FE8F70B174C29BE2B9D /* Headers */,
8BA64578C5DD40155F648147E1C49816 /* Sources */,
54349479B5602308A330D7A3CD8C66B7 /* Frameworks */,
19D5CC05D285BFC21A2A926EF52D80EC /* Headers */,
);
buildRules = (
);
dependencies = (
70401CBD889B19D63279D70A1BF5AC22 /* PBXTargetDependency */,
C8D42CFD661BB27420DD3F9557DB6E68 /* PBXTargetDependency */,
322111BF86454A4E9D84251FB15B5AC2 /* PBXTargetDependency */,
706BD3097C078EE05C2C4BF2702400F0 /* PBXTargetDependency */,
);
name = GMPhobos;
productName = GMPhobos;
......@@ -572,7 +579,7 @@
projectRoot = "";
targets = (
3CEC93D360D00FDE7FB0084DC2464EAD /* GMCache */,
4D5EFB6B449BFCB2F03FD297009163FD /* GMPhobos */,
9C1B3C6DCB1E0D374523918F264059A2 /* GMPhobos */,
41CEC507F058212814B110F11C73DA7B /* Pods-GMPhobos_Example */,
C563C5DB007E0B1344CC5D868834BA8E /* Pods-GMPhobos_Tests */,
28923DD1C76A98F6675D115FD930DB64 /* TMCache */,
......@@ -589,13 +596,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
7AE8D17DAB4552166C8CABC9D74AE38C /* Sources */ = {
8BA64578C5DD40155F648147E1C49816 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
31EB1D083240428D24AA641FA1007E60 /* GMPhobos-dummy.m in Sources */,
D7F7F3896DCEEEB6DA58024C75991005 /* Phobos.m in Sources */,
2D5BBE27D269F5ABCA1283F86BE63ADF /* PhobosUtil.m in Sources */,
18A33E672B4F3BBB89D617516BE49C30 /* GMPhobos-dummy.m in Sources */,
F3FE5704FE326DC3FD2FF21F3D481E19 /* Phobos.m in Sources */,
0CFBC5A4DB385139E416037045A82AB8 /* PhobosUtil.m in Sources */,
486FEF1A2D3DC22FEB58945BA7A294C8 /* UIViewController+Phobos.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -637,22 +645,28 @@
target = 3CEC93D360D00FDE7FB0084DC2464EAD /* GMCache */;
targetProxy = 57E7897E31CF564C282AA7BCBF3979E3 /* PBXContainerItemProxy */;
};
322111BF86454A4E9D84251FB15B5AC2 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = GMCache;
target = 3CEC93D360D00FDE7FB0084DC2464EAD /* GMCache */;
targetProxy = D1766CD5DF3D1D6FAA8F2164F4FCA133 /* PBXContainerItemProxy */;
};
630EA0258FEE5B66255D93C41352CA4B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = TMCache;
target = 28923DD1C76A98F6675D115FD930DB64 /* TMCache */;
targetProxy = E7E41D55AF399EE3B6C3EB34062F94AC /* PBXContainerItemProxy */;
};
70401CBD889B19D63279D70A1BF5AC22 /* PBXTargetDependency */ = {
706BD3097C078EE05C2C4BF2702400F0 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = GMCache;
target = 3CEC93D360D00FDE7FB0084DC2464EAD /* GMCache */;
targetProxy = 706284A68D335E339DECA5DAFC1A610F /* PBXContainerItemProxy */;
name = TMCache;
target = 28923DD1C76A98F6675D115FD930DB64 /* TMCache */;
targetProxy = CDAFA1456D8159320D31CA8BF6CAB002 /* PBXContainerItemProxy */;
};
8962B2F5AA475C70895DEC857DB1DC81 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = GMPhobos;
target = 4D5EFB6B449BFCB2F03FD297009163FD /* GMPhobos */;
target = 9C1B3C6DCB1E0D374523918F264059A2 /* GMPhobos */;
targetProxy = E6E3168FF07B32830937E8291E6A91AA /* PBXContainerItemProxy */;
};
A838F00D018EAE517E0236D5AB254ABB /* PBXTargetDependency */ = {
......@@ -661,12 +675,6 @@
target = 28923DD1C76A98F6675D115FD930DB64 /* TMCache */;
targetProxy = F61ECE6BCC033458BCA3BFC6291505E1 /* PBXContainerItemProxy */;
};
C8D42CFD661BB27420DD3F9557DB6E68 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = TMCache;
target = 28923DD1C76A98F6675D115FD930DB64 /* TMCache */;
targetProxy = C8EB68B31D18EEF4F354B620DBD9E0C0 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
......@@ -836,35 +844,6 @@
};
name = Release;
};
A41C56A50F831FAEC95602816C5A6422 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 4B83281B4137DA954D83EA220CDB90E2 /* GMPhobos.xcconfig */;
buildSettings = {
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREFIX_HEADER = "Target Support Files/GMPhobos/GMPhobos-prefix.pch";
INFOPLIST_FILE = "Target Support Files/GMPhobos/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MODULEMAP_FILE = "Target Support Files/GMPhobos/GMPhobos.modulemap";
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_NAME = GMPhobos;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Release;
};
AAF678CED40D3499169D10F63CA0719E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
......@@ -903,6 +882,35 @@
};
name = Release;
};
B1D3CF9DDA3BD012E27D57489B39AA5B /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 4B83281B4137DA954D83EA220CDB90E2 /* GMPhobos.xcconfig */;
buildSettings = {
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREFIX_HEADER = "Target Support Files/GMPhobos/GMPhobos-prefix.pch";
INFOPLIST_FILE = "Target Support Files/GMPhobos/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MODULEMAP_FILE = "Target Support Files/GMPhobos/GMPhobos.modulemap";
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_NAME = GMPhobos;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Debug;
};
C98D61C6D7AB3C73C53E9912FA67CCA1 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 9B4A38A63BA332BA886AD102B72BD1F3 /* Pods-GMPhobos_Example.debug.xcconfig */;
......@@ -936,38 +944,38 @@
};
name = Debug;
};
D8D4796BF4F392A9D72AF4AD63642048 /* Debug */ = {
E36DB408E18C2085C85B015C7ADF30D6 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 4B83281B4137DA954D83EA220CDB90E2 /* GMPhobos.xcconfig */;
baseConfigurationReference = 89BC70DE0DE80150CBB5A1CC6AB9E62E /* GMCache.xcconfig */;
buildSettings = {
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = dwarf;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREFIX_HEADER = "Target Support Files/GMPhobos/GMPhobos-prefix.pch";
INFOPLIST_FILE = "Target Support Files/GMPhobos/Info.plist";
GCC_PREFIX_HEADER = "Target Support Files/GMCache/GMCache-prefix.pch";
INFOPLIST_FILE = "Target Support Files/GMCache/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MODULEMAP_FILE = "Target Support Files/GMPhobos/GMPhobos.modulemap";
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_NAME = GMPhobos;
MODULEMAP_FILE = "Target Support Files/GMCache/GMCache.modulemap";
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_NAME = GMCache;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Debug;
name = Release;
};
E36DB408E18C2085C85B015C7ADF30D6 /* Release */ = {
E861249683016502A808A1250B9FBAFB /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 89BC70DE0DE80150CBB5A1CC6AB9E62E /* GMCache.xcconfig */;
baseConfigurationReference = 4B83281B4137DA954D83EA220CDB90E2 /* GMPhobos.xcconfig */;
buildSettings = {
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 1;
......@@ -978,14 +986,14 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREFIX_HEADER = "Target Support Files/GMCache/GMCache-prefix.pch";
INFOPLIST_FILE = "Target Support Files/GMCache/Info.plist";
GCC_PREFIX_HEADER = "Target Support Files/GMPhobos/GMPhobos-prefix.pch";
INFOPLIST_FILE = "Target Support Files/GMPhobos/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MODULEMAP_FILE = "Target Support Files/GMCache/GMCache.modulemap";
MODULEMAP_FILE = "Target Support Files/GMPhobos/GMPhobos.modulemap";
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_NAME = GMCache;
PRODUCT_NAME = GMPhobos;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
......@@ -1086,11 +1094,11 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
B6215C0A40DBE05C57B1689DD85FC012 /* Build configuration list for PBXNativeTarget "GMPhobos" */ = {
90E3CF14D72177B525F4CA0B92E16CFC /* Build configuration list for PBXNativeTarget "GMPhobos" */ = {
isa = XCConfigurationList;
buildConfigurations = (
D8D4796BF4F392A9D72AF4AD63642048 /* Debug */,
A41C56A50F831FAEC95602816C5A6422 /* Release */,
B1D3CF9DDA3BD012E27D57489B39AA5B /* Debug */,
E861249683016502A808A1250B9FBAFB /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
......
......@@ -3,6 +3,7 @@
#import "Phobos.h"
#import "PhobosConfig.h"
#import "PhobosUtil.h"
#import "UIViewController+Phobos.h"
FOUNDATION_EXPORT double GMPhobosVersionNumber;
FOUNDATION_EXPORT const unsigned char GMPhobosVersionString[];
......
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.2.4</string>
<string>0.2.8</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
......@@ -48,8 +48,8 @@ EOM
ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS}
;;
*.xib)
echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT}"
ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}"
echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}"
ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS}
;;
*.framework)
echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
......
......@@ -48,8 +48,8 @@ EOM
ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS}
;;
*.xib)
echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT}"
ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}"
echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}"
ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS}
;;
*.framework)
echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
......
......@@ -7,8 +7,8 @@
//
#import <XCTest/XCTest.h>
#import "Phobos.h"
#import "WMCacheService.h"
#import <GMPhobos/Phobos.h>
#import <GMCache/WMCacheService.h>
#define PhobosCacheKey @"PhobosCacheKey"
......@@ -47,7 +47,7 @@ NSString *const MockCityId = @"beijing";
- (void)testClientWithUserId{
[_client setUserId:MockUserId];
[_client setCurrentCityId:MockCityId];
[_client track:MockEventId];
[Phobos track:MockEventId];
NSArray *array = [_cache fetchObjectAtDiskWithkey:PhobosCacheKey];
XCTAssertTrue(array.count == 1, @"array is empty");
NSDictionary *dict = [array objectAtIndex:0];
......@@ -113,4 +113,44 @@ NSString *const MockCityId = @"beijing";
XCTAssertTrue([keys containsObject:@"params"], @"Missing params");
}
- (void)testOnPageStartThenOnPageEnd {
[_client onPageStart:nil businessId:nil referer:nil];
NSDictionary *pageEnterParam1 = [_client valueForKey:@"_pageEnterParam"];
XCTAssertTrue(pageEnterParam1 != nil, @"pageEnterParam 应该实例化成功");
XCTAssertTrue(pageEnterParam1.allKeys.count == 4, @"pageEnterParam 应该有4个key");
[_client onPageStart:@"aaa" businessId:@"adf" referer:nil];
NSDictionary *pageEnterParam2 = [_client valueForKey:@"_pageEnterParam"];
XCTAssertTrue(pageEnterParam2 != nil, @"pageEnterParam 应该实例化成功");
XCTAssertTrue(pageEnterParam2.allKeys.count == 4, @"pageEnterParam 应该有4个key");
[_client onPageEnd];
[self paramUnNilCheck];
NSDictionary *pageEnterParam3 = [_client valueForKey:@"_pageEnterParam"];
XCTAssertTrue(pageEnterParam3.allKeys.count == 0, @"pageEnterParam 应该在onPageEnd后为空的");
}
// 某种情况下没有先走 onPageStart,只走了OnPageEnd,此时数据应该完整,某个key对应的value可以是空
- (void)testOnPageEnd {
[_client setValue:nil forKey:@"_pageEnterParam"];
[_client onPageEnd];
[self paramUnNilCheck];
}
- (void)testSimulativePageViewEvent {
[_client simulativePageViewEventWithPageName:nil BusinessId:nil referer:nil];
[self paramUnNilCheck];
}
- (void)paramUnNilCheck {
NSArray *array = [[WMCacheService sharedInstance] fetchObjectAtDiskWithkey:PhobosCacheKey];
XCTAssertTrue(array.count != 0, @"PhobosCacheKey 下面应该有数据");
NSDictionary *dic = array[0][@"params"];
XCTAssertTrue(dic[@"page_name"] != nil, @"page_name至少使用默认的空字符串");
XCTAssertTrue(dic[@"referer"] != nil, @"referer至少使用默认的空字符串");
XCTAssertTrue(dic[@"business_id"] != nil, @"business_id至少使用默认的空字符串");
}
@end
......@@ -8,7 +8,7 @@
Pod::Spec.new do |s|
s.name = "GMPhobos"
s.version = "0.2.5"
s.version = "0.2.9"
s.summary = "GM statistic data sdk"
s.description = <<-DESC
......
......@@ -95,7 +95,7 @@ static NSString *sdkVersion = @"110";
}
#pragma - mark notification handler
#pragma mark - notification handler
/**
* @brief 设置对APP的通知监听
*
......@@ -177,7 +177,8 @@ static NSString *sdkVersion = @"110";
[cache removeObjectAtDiskWithkey:PhobosBeginTime];
}
#pragma - mark track event handler
#pragma mark - track event handler
+ (void)track:(NSString *)eventId{
[Phobos track:eventId attributes:@{}];
}
......@@ -224,17 +225,12 @@ static NSString *sdkVersion = @"110";
}
}
#pragma - mark pv
#pragma mark - pv
- (void)onPageStart:(NSString *)pageName businessId:(NSString *)businessId referer:(NSString *)refererPageName{
self.businessId = [self isNonEmpty:businessId] ? businessId : @"";
self.refererPageName = [self isNonEmpty:refererPageName] ? refererPageName : @"";
if (![self isNonEmpty:pageName]) {
return;
}
_pageEnterParam = [NSMutableDictionary dictionaryWithObjectsAndKeys:
pageName,@"page_name",
self.businessId,@"business_id",
self.refererPageName,@"referer",
pageName?:@"",@"page_name",
businessId?:@"",@"business_id",
refererPageName?:@"",@"referer",
[self currentTime],@"in",nil];
}
......@@ -242,10 +238,10 @@ static NSString *sdkVersion = @"110";
NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
@try {
[dict setObject:[self currentTime] forKey:@"out"];
[dict setObject:@([_pageEnterParam[@"in"] doubleValue]) forKey:@"in"];
[dict setObject:_pageEnterParam[@"page_name"] forKey:@"page_name"];
[dict setObject:_pageEnterParam[@"business_id"] forKey:@"business_id"];
[dict setObject:_pageEnterParam[@"referer"] forKey:@"referer"];
[dict setObject:@([_pageEnterParam[@"in"] doubleValue])?:@"" forKey:@"in"];
[dict setObject:_pageEnterParam[@"page_name"]?:@"" forKey:@"page_name"];
[dict setObject:_pageEnterParam[@"business_id"]?:@"" forKey:@"business_id"];
[dict setObject:_pageEnterParam[@"referer"]?:@"" forKey:@"referer"];
[dict setObject:@(0) forKey:@"fake"];
[Phobos track:@"page_view" attributes:dict];
......@@ -261,9 +257,9 @@ static NSString *sdkVersion = @"110";
@try {
[dict setObject:[self currentTime] forKey:@"in"];
[dict setObject:[self currentTime] forKey:@"out"];
[dict setObject:pageName forKey:@"page_name"];
[dict setObject:bid forKey:@"business_id"];
[dict setObject:referer forKey:@"referer"];
[dict setObject:pageName?:@"" forKey:@"page_name"];
[dict setObject:bid?:@"" forKey:@"business_id"];
[dict setObject:referer?:@"" forKey:@"referer"];
[dict setObject:@(1) forKey:@"fake"];
[Phobos track:@"page_view" attributes:dict];
......
//
// UIViewController+Phobos.h
// Pods
//
// Created by wangyang on 16/7/12.
//
//
#import <UIKit/UIKit.h>
@interface UIViewController (Phobos)
/**
* @author 翟国钧, 16-02-24 17:02:22
*
* @brief 埋点的时候,有些埋点都需要业务id,比如DoctorId,针对那些只能在父类中埋点的业务,要在子类中设置当前id,然后在父类中取到
* 在一些详情页的分享和收藏的时候,由于分享、收藏的方法在basewebview里,所以,统一在里面做处理,但是需要在子类中把想要的参数传过去。包括:type(类型)、from(来自哪)、businessId(对应业务id)
* @since 5.9.1
*/
@property (nonatomic, copy, nonnull) NSString *businessId;
/**
* @author 翟国钧 in 16-02-25 19:02:32
*
* @brief 获取前一个页面的pageName
*
* @since 5.9.1
*/
@property (nonatomic, strong, readonly, nonnull) NSString *referer;
/**
* @author 翟国钧 in 16-02-25 19:02:32
*
* 埋点pv事件中当前页面的别名
* @since 5.9.1
*/
@property (nonatomic, copy, nonnull) NSString *pageName;
@end
//
// UIViewController+Phobos.m
// Pods
//
// Created by wangyang on 16/7/12.
//
//
#import "UIViewController+Phobos.h"
#import <objc/runtime.h>
@implementation UIViewController (Phobos)
/**
* @author 翟国钧, 16-03-01 15:03:24
*
* @brief 取当前导航栈中当前VC的上级VC,如果该VC存在,就获取他的pageName
*
* @return 前一页的pageName
*
* @since 5.9.1
*/
- (NSString *)referer
{
NSArray *navigationPool = self.navigationController.viewControllers;
NSInteger refererIndex = navigationPool.count - 2;
if (refererIndex < 0 ) {
return @"";
}
UIViewController *controller = navigationPool[refererIndex];
return controller.pageName == nil ? @"" : controller.pageName;
}
- (NSString *)pageName {
NSString *name = objc_getAssociatedObject(self, @selector(pageName));
return name == nil ? @"" : name;
}
- (void)setPageName:(NSString *)pageName {
objc_setAssociatedObject(self, @selector(pageName), pageName, OBJC_ASSOCIATION_COPY);
}
- (NSString *)businessId {
NSString *businessId = objc_getAssociatedObject(self, @selector(businessId));
return businessId == nil ? @"" : businessId;
}
- (void)setBusinessId:(NSString *)businessId {
objc_setAssociatedObject(self, @selector(businessId), businessId, OBJC_ASSOCIATION_COPY);
}
@end
# Customise this file, documentation can be found here:
# https://github.com/fastlane/fastlane/tree/master/docs
# All available actions: https://github.com/fastlane/fastlane/blob/master/docs/Actions.md
# can also be listed using the `fastlane actions` command
# Change the syntax highlighting to Ruby
# All lines starting with a # are ignored when running `fastlane`
# By default, fastlane will send which actions are used
# No personal data is shared, more information on https://github.com/fastlane/enhancer
# Uncomment the following line to opt out
# opt_out_usage
# If you want to automatically update fastlane if a new version is available:
# update_fastlane
# This is the minimum version number required.
# Update this, if you use features of a newer version
fastlane_version "1.88.0"
default_platform :ios
actions_path "#{File.join(Dir.home, '.Jaguar', 'actions')}"
import "#{File.join(Dir.home, '.Jaguar', 'fastfile', 'pod_fastfile')}"
platform :ios do
before_all do
end
desc "Release new version"
lane :release do |options|
path = "GMPhobos.podspec"
target_version = options[:version]
raise "The version is missed." if target_version.nil?
ensure_git_branch # 确认 master 分支
pod_install
pod_lib_lint(verbose: true, allow_warnings: true, sources: ["git@git.gengmei.cc:gengmeiios/GMSpecs.git","https://github.com/CocoaPods/Specs"], use_bundle_exec: true)
version_bump_podspec(path: path, version_number: target_version) # 更新 podspec
git_commit_all(message: "Bump version to #{target_version}") # 提交版本号修改
add_git_tag tag: target_version # 设置 tag
push_to_git_remote # 推送到 git 仓库
pod_push(path: path, repo: "GMSpecs", allow_warnings: true, sources: ["git@git.gengmei.cc:gengmeiios/GMSpecs.git","https://github.com/CocoaPods/Specs"]) # 提交到 CocoaPods
options[:name] = 'GMPhobos'
do_release(options)
end
end
\ No newline at end of file
# More information about multiple platforms in fastlane: https://github.com/fastlane/fastlane/blob/master/docs/Platforms.md
# All available actions: https://github.com/fastlane/fastlane/blob/master/docs/Actions.md
......@@ -6,6 +6,11 @@ sudo gem install fastlane
```
# Available Actions
## iOS
### ios do_release
```
fastlane ios do_release
```
Do release new version
### ios release
```
fastlane ios release
......
......@@ -3,52 +3,39 @@
<testsuite name="fastlane.lanes">
<testcase classname="fastlane.lanes" name="0: Verifying required fastlane version" time="0.000514">
<testcase classname="fastlane.lanes" name="0: Verifying required fastlane version" time="0.000871">
</testcase>
<testcase classname="fastlane.lanes" name="1: default_platform" time="0.000257">
<testcase classname="fastlane.lanes" name="1: default_platform" time="0.000305">
</testcase>
<testcase classname="fastlane.lanes" name="2: ensure_git_branch" time="0.006822">
<testcase classname="fastlane.lanes" name="2: Switch to ios do_release lane" time="0.000408">
</testcase>
<testcase classname="fastlane.lanes" name="3: pod_install" time="10.03506">
<testcase classname="fastlane.lanes" name="3: git_pull" time="2.396995">
</testcase>
<testcase classname="fastlane.lanes" name="4: pod_lib_lint" time="17.796841">
<testcase classname="fastlane.lanes" name="4: ensure_git_branch" time="0.018778">
</testcase>
<testcase classname="fastlane.lanes" name="5: version_bump_podspec" time="0.001254">
<testcase classname="fastlane.lanes" name="5: pod_install" time="23.128242">
</testcase>
<testcase classname="fastlane.lanes" name="6: git_commit_all" time="0.037435">
<testcase classname="fastlane.lanes" name="6: pod_lib_lint" time="0.001267">
</testcase>
<testcase classname="fastlane.lanes" name="7: add_git_tag" time="0.014082">
</testcase>
<testcase classname="fastlane.lanes" name="8: push_to_git_remote" time="2.367411">
</testcase>
<testcase classname="fastlane.lanes" name="9: pod_push" time="17.870847">
<failure message="/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/actions/actions_helper.rb:33:in `execute_action'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/runner.rb:162:in `block in execute_action'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/runner.rb:161:in `chdir'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/runner.rb:161:in `execute_action'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/runner.rb:109:in `trigger_action_by_name'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/fast_file.rb:140:in `method_missing'&#10;../../fastfile/pod_fastfile:20:in `block (2 levels) in parsing_binding'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/lane.rb:33:in `call'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/lane.rb:33:in `call'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/runner.rb:138:in `try_switch_to_lane'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/runner.rb:101:in `rescue in trigger_action_by_name'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/runner.rb:96:in `trigger_action_by_name'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/fast_file.rb:140:in `method_missing'&#10;Fastfile:8:in `block (2 levels) in parsing_binding'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/lane.rb:33:in `call'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/lane.rb:33:in `call'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/runner.rb:50:in `block in execute'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/runner.rb:46:in `chdir'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/runner.rb:46:in `execute'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/lane_manager.rb:46:in `cruise_lane'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/command_line_handler.rb:30:in `handle'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/commands_generator.rb:42:in `block (2 levels) in run'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/commander-4.3.5/lib/commander/command.rb:178:in `call'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/commander-4.3.5/lib/commander/command.rb:178:in `call'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/commander-4.3.5/lib/commander/command.rb:153:in `run'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/commander-4.3.5/lib/commander/runner.rb:428:in `run_active_command'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane_core-0.48.1/lib/fastlane_core/ui/fastlane_runner.rb:26:in `run!'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/commander-4.3.5/lib/commander/delegates.rb:15:in `run!'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/commands_generator.rb:159:in `run'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/commands_generator.rb:13:in `start'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/lib/fastlane/cli_tools_distributor.rb:47:in `take_off'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/gems/fastlane-1.90.0/bin/fastlane:5:in `&lt;top (required)&gt;'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/bin/fastlane:23:in `load'&#10;/Users/gengmei/.rvm/gems/ruby-2.1.1@newgemset/bin/fastlane:23:in `&lt;main&gt;'&#10;&#10;Could not find option 'use_libraries' in the list of available options: use_bundle_exec, verbose, allow_warnings, sources" />
</testcase>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment