Commit 076fac84 authored by 汪洋's avatar 汪洋

save progress

parent 207d53cd
PODS:
- GMRefresh (0.1.3):
- GMRefresh (0.1.4):
- MJRefresh (~> 3.1.0)
- MJRefresh (3.1.0)
......@@ -11,9 +11,9 @@ EXTERNAL SOURCES:
:path: "../"
SPEC CHECKSUMS:
GMRefresh: 182cfde175a3228b644160430c386ceb7fa631ad
GMRefresh: 4a1d3332576e7a4d9be742d62fec260fd718e65d
MJRefresh: 743e6404967d1c2c688472ea3ecfde247d872db4
PODFILE CHECKSUM: 9e12f3fbdc35e42e007aeabb4d7a97d764319eea
COCOAPODS: 1.1.0.rc.2
COCOAPODS: 1.1.1
{
"name": "GMRefresh",
"version": "0.1.3",
"version": "0.1.4",
"summary": "基于MJRefresh做的下拉刷新,自动加载更多",
"homepage": "http://git.gengmei.cc/gengmeiios/GMLibrary/GMRefresh",
"license": "MIT",
......@@ -8,8 +8,8 @@
"wangyang": "wangyang@gmei.com"
},
"source": {
"git": "http://git.gengmei.cc/gengmeiios/GMRefresh.git",
"tag": "0.1.3"
"git": "git@git.gengmei.cc:gengmeiios/GMRefresh.git",
"tag": "0.1.4"
},
"platforms": {
"ios": "8.0"
......
PODS:
- GMRefresh (0.1.3):
- GMRefresh (0.1.4):
- MJRefresh (~> 3.1.0)
- MJRefresh (3.1.0)
......@@ -11,9 +11,9 @@ EXTERNAL SOURCES:
:path: "../"
SPEC CHECKSUMS:
GMRefresh: 182cfde175a3228b644160430c386ceb7fa631ad
GMRefresh: 4a1d3332576e7a4d9be742d62fec260fd718e65d
MJRefresh: 743e6404967d1c2c688472ea3ecfde247d872db4
PODFILE CHECKSUM: 9e12f3fbdc35e42e007aeabb4d7a97d764319eea
COCOAPODS: 1.1.0.rc.2
COCOAPODS: 1.1.1
......@@ -34,6 +34,7 @@
49DD1890430A86FA6D7387441387C900 /* GMRefreshFooter.m in Sources */ = {isa = PBXBuildFile; fileRef = CF8D03690E3F8241A0C0B7B875F22C1E /* GMRefreshFooter.m */; };
4A092FC468E9A5880064C2AAAB037B15 /* MJRefreshNormalHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = E9FF982FEAE665E04F9299B972D48C9C /* MJRefreshNormalHeader.m */; };
4A2CDD76C828AD59230D3C0EACABC96F /* pullLoading1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E368356604CF10F8AAD7EE433BD0C827 /* pullLoading1@2x.png */; };
4AA08BD34A2CD4DB3DB6FB20B467486E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0DB34F35BDC86CAD77512DD8D95666F3 /* Foundation.framework */; };
4B568CCA459EB125E42A26CA942AD518 /* pullLoading15@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = FE61357185D9334BFF0CDD0B07D7E93B /* pullLoading15@3x.png */; };
4CFBEFAA832D0AB7D0E31485CF75152A /* MJRefreshConst.h in Headers */ = {isa = PBXBuildFile; fileRef = 048976C2EDA0818EFEC9CA01BBB880C6 /* MJRefreshConst.h */; settings = {ATTRIBUTES = (Public, ); }; };
5009C221C2D07C6F6642E5AC44239DBC /* MJRefreshBackNormalFooter.h in Headers */ = {isa = PBXBuildFile; fileRef = E3150750AF3E7DB5F86EAE6AC7189E5C /* MJRefreshBackNormalFooter.h */; settings = {ATTRIBUTES = (Public, ); }; };
......@@ -46,7 +47,6 @@
60850F32D5160051EDF6E38E5F8BAC66 /* MJRefreshHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = A08D8BC4A0BF4E0CF529ECE95F92D07B /* MJRefreshHeader.m */; };
60FBC76762B035B3FCD31B2C04FC7339 /* pullLoading12@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6B34906F6C59E69783E189EAF8B283EA /* pullLoading12@2x.png */; };
61D9E900AA0AB8A046642D7E23D616C2 /* pullLoading4@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = F80206AE99E13A1525DF415A60A84125 /* pullLoading4@3x.png */; };
627B5FC9F7B8FAEE2AD6CB0B53D79A9D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EE08DA53E1C73BAB6F07FC89DCF9A36 /* Foundation.framework */; };
6D4251B1C1D0ACF97D4313EAE8C1EBB9 /* pullLoading6@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 81821DE75DF7C24810847A261D6FEB8F /* pullLoading6@2x.png */; };
6F638EFCB75C3B0AC0D2BA098C93D532 /* pullLoading14@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4C74133EC32B59B322722897FCCD8EB8 /* pullLoading14@3x.png */; };
703BF92772BEA0646364DF8F3E7E1F46 /* pullLoading11@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 127B1D0F0701DB4651EC7D0E81301635 /* pullLoading11@3x.png */; };
......@@ -65,7 +65,6 @@
932F77B143BA898328DD8591F2593880 /* Pods-GMRefresh_Tests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EC9A078E363D9EB755D5F4555A94B84 /* Pods-GMRefresh_Tests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
93CB184422505F167F771B3EA512628A /* pullLoading17@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 074388FFA7261AC4C91045DC07E040FB /* pullLoading17@3x.png */; };
958F4E479AA1074880BE8BB0D7C010C0 /* MJRefresh.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 5F173BEB68548D2B27EC5A2012B3637C /* MJRefresh.bundle */; };
9755A4AFCE613F91C8A170D307F024DB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EE08DA53E1C73BAB6F07FC89DCF9A36 /* Foundation.framework */; };
98D6C2AD90448A3F619A1E87E8511189 /* pullLoading5@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = FC4887E492494F321BB21A501D791E75 /* pullLoading5@3x.png */; };
9E244A4CB70E9555C699E509BF419493 /* pullLoading2@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C25F97CF99D16466A1195A66184C1ACA /* pullLoading2@3x.png */; };
9F3ADE7A1E814EDBC9DF05347B13DC3E /* MJRefreshFooter.m in Sources */ = {isa = PBXBuildFile; fileRef = 12D8D2B7DE72D4468D8F1D9160A45CA4 /* MJRefreshFooter.m */; };
......@@ -88,22 +87,23 @@
CD8214A3EECFE528C4D73B053757DF69 /* pullLoading19@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 01941CF671ED67515F7EE1C0A1F07C7A /* pullLoading19@2x.png */; };
CD855137702657E028300FD292F0DD1A /* MJRefreshAutoFooter.h in Headers */ = {isa = PBXBuildFile; fileRef = 111692DE01530A8C29FD26231BD49F11 /* MJRefreshAutoFooter.h */; settings = {ATTRIBUTES = (Public, ); }; };
CEF66AE1BB37F4658E17ECDFB8DB8E0C /* MJRefreshConst.m in Sources */ = {isa = PBXBuildFile; fileRef = DC096625EEDED28072BD26DB1BE09598 /* MJRefreshConst.m */; };
D3714D8D868000E5F1BAAA60DE257338 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EE08DA53E1C73BAB6F07FC89DCF9A36 /* Foundation.framework */; };
D8D02C9DC7F7DB935F6E7B82FA04D8FD /* MJRefreshStateHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B59FCE777CCCF7415D10A2087C505DA /* MJRefreshStateHeader.h */; settings = {ATTRIBUTES = (Public, ); }; };
DA0605BE52D3F34978D85AF921F09B71 /* MJRefreshFooter.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E5D85CC23130E87B4C2EE8136642079 /* MJRefreshFooter.h */; settings = {ATTRIBUTES = (Public, ); }; };
DFDCF987754D459A9A658F78419380A1 /* pullLoading7@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3A739740D67CEA9E4E8DE6D9DD341465 /* pullLoading7@3x.png */; };
E0A2B5F201AFF5ACEB374CCEAF494CBD /* pullLoading19@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0DD9E540E36CD36B76C86327144B0317 /* pullLoading19@3x.png */; };
E0D7CB3F95B89A8D8ABF18DD5D57AEB9 /* MJRefreshBackFooter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B8A400588B82BF4960EF4D2EA09623C /* MJRefreshBackFooter.m */; };
E36EB3BA619A1F99BD7CF7510D8B4CC8 /* pullLoading6@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 21CAB8220984AE62194E76101CDD9A0F /* pullLoading6@3x.png */; };
E463942C761B48C41C5DA0C597B4AC47 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0DB34F35BDC86CAD77512DD8D95666F3 /* Foundation.framework */; };
E556DC32AA42204DB9718609196BDA75 /* GMRefreshFooter.h in Headers */ = {isa = PBXBuildFile; fileRef = DBEDC954B807ABDC0EB3C3DC5D529F42 /* GMRefreshFooter.h */; settings = {ATTRIBUTES = (Public, ); }; };
E8178D7CF977D481B2C43A312072CBA5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EE08DA53E1C73BAB6F07FC89DCF9A36 /* Foundation.framework */; };
EAF32F38497142C44E5D88A2E2E96C8D /* MJRefreshAutoGifFooter.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CDFC130D70F53C367821B55F8F4384A /* MJRefreshAutoGifFooter.m */; };
ED18891522BF1804F0E420150E8BEF2F /* Pods-GMRefresh_Tests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = E9CF8AE082AAF299E64C89DBA458BD9E /* Pods-GMRefresh_Tests-dummy.m */; };
EDBD2A98A13386905DE6A6ECD47103E7 /* pullLoading17@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B61DBE5AEE6420C452C646F7F7370C64 /* pullLoading17@2x.png */; };
F13C9869A5EE0B2900764D9FFE58E2D9 /* MJRefresh.h in Headers */ = {isa = PBXBuildFile; fileRef = 77DC3F79F06F6843F2309A295230E743 /* MJRefresh.h */; settings = {ATTRIBUTES = (Public, ); }; };
F4420F78529EA2D3E21B71CDAB85E0BC /* MJRefreshBackStateFooter.h in Headers */ = {isa = PBXBuildFile; fileRef = 31A707E4DAD17CB1922117E26D48BB58 /* MJRefreshBackStateFooter.h */; settings = {ATTRIBUTES = (Public, ); }; };
F51F668D3934078613DE5969F635609A /* pullLoading1@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 81015378881A17A5A6827F8DE97C941B /* pullLoading1@3x.png */; };
F9D704F66AC107054AFB7470363C5C1E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0DB34F35BDC86CAD77512DD8D95666F3 /* Foundation.framework */; };
FD373F73FF87B880993CC1530F2E2675 /* MJRefreshAutoNormalFooter.m in Sources */ = {isa = PBXBuildFile; fileRef = ECF77FA8854EEBEBEBDDDF91586FB587 /* MJRefreshAutoNormalFooter.m */; };
FF626A9078CEBD507473BAE83BA13B55 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0DB34F35BDC86CAD77512DD8D95666F3 /* Foundation.framework */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
......@@ -147,9 +147,9 @@
095F569E4B7D1E3A327AA8CF8D501A5B /* Pods_GMRefresh_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GMRefresh_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
0B59FCE777CCCF7415D10A2087C505DA /* MJRefreshStateHeader.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MJRefreshStateHeader.h; path = MJRefresh/Custom/Header/MJRefreshStateHeader.h; sourceTree = "<group>"; };
0CDFC130D70F53C367821B55F8F4384A /* MJRefreshAutoGifFooter.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MJRefreshAutoGifFooter.m; path = MJRefresh/Custom/Footer/Auto/MJRefreshAutoGifFooter.m; sourceTree = "<group>"; };
0DB34F35BDC86CAD77512DD8D95666F3 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
0DD9E540E36CD36B76C86327144B0317 /* pullLoading19@3x.png */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = image.png; path = "pullLoading19@3x.png"; sourceTree = "<group>"; };
0E2E8027F6BF315C3A0DFBF692EFC708 /* Pods-GMRefresh_Tests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-GMRefresh_Tests.modulemap"; sourceTree = "<group>"; };
0EE08DA53E1C73BAB6F07FC89DCF9A36 /* 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; };
1013BB4138A5E96F38483C00B1C31B04 /* GMRefresh.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = GMRefresh.xcconfig; sourceTree = "<group>"; };
111692DE01530A8C29FD26231BD49F11 /* MJRefreshAutoFooter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MJRefreshAutoFooter.h; path = MJRefresh/Base/MJRefreshAutoFooter.h; sourceTree = "<group>"; };
127B1D0F0701DB4651EC7D0E81301635 /* pullLoading11@3x.png */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = image.png; path = "pullLoading11@3x.png"; sourceTree = "<group>"; };
......@@ -269,7 +269,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9755A4AFCE613F91C8A170D307F024DB /* Foundation.framework in Frameworks */,
4AA08BD34A2CD4DB3DB6FB20B467486E /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -284,7 +284,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
D3714D8D868000E5F1BAAA60DE257338 /* Foundation.framework in Frameworks */,
F9D704F66AC107054AFB7470363C5C1E /* Foundation.framework in Frameworks */,
551BF0C86E61595CF843CB7FCC99C76E /* MJRefresh.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -293,7 +293,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
627B5FC9F7B8FAEE2AD6CB0B53D79A9D /* Foundation.framework in Frameworks */,
E463942C761B48C41C5DA0C597B4AC47 /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -301,21 +301,13 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
E8178D7CF977D481B2C43A312072CBA5 /* Foundation.framework in Frameworks */,
FF626A9078CEBD507473BAE83BA13B55 /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
03723F43D8D52D181CB50D90DEF139A2 /* iOS */ = {
isa = PBXGroup;
children = (
0EE08DA53E1C73BAB6F07FC89DCF9A36 /* Foundation.framework */,
);
name = iOS;
sourceTree = "<group>";
};
0FBDFD9E171EB28DEBD050738E1BC52E /* Pods-GMRefresh_Tests */ = {
isa = PBXGroup;
children = (
......@@ -415,6 +407,14 @@
);
sourceTree = "<group>";
};
81DCAD954D661D4959A616EA21FF4526 /* iOS */ = {
isa = PBXGroup;
children = (
0DB34F35BDC86CAD77512DD8D95666F3 /* Foundation.framework */,
);
name = iOS;
sourceTree = "<group>";
};
8588C25B248C56948572F3DD25ECE6BF /* MJRefresh */ = {
isa = PBXGroup;
children = (
......@@ -582,7 +582,7 @@
isa = PBXGroup;
children = (
82183AC086CC04F7C2B2F83F402DEA80 /* MJRefresh.framework */,
03723F43D8D52D181CB50D90DEF139A2 /* iOS */,
81DCAD954D661D4959A616EA21FF4526 /* iOS */,
);
name = Frameworks;
sourceTree = "<group>";
......
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#endif
#import "GMRefreshConstant.h"
#import "GMRefreshFooter.h"
......
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.1.3</string>
<string>0.1.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
......@@ -13,7 +13,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>0.1.3</string>
<string>0.1.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#endif
#import "MJRefreshAutoFooter.h"
#import "MJRefreshBackFooter.h"
......
......@@ -23,12 +23,6 @@ case "${TARGETED_DEVICE_FAMILY}" in
;;
esac
realpath() {
DIRECTORY="$(cd "${1%/*}" && pwd)"
FILENAME="${1##*/}"
echo "$DIRECTORY/$FILENAME"
}
install_resource()
{
if [[ "$1" = /* ]] ; then
......@@ -70,7 +64,7 @@ EOM
xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
;;
*.xcassets)
ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH")
ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH"
XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
;;
*)
......@@ -93,7 +87,7 @@ then
# Find all other xcassets (this unfortunately includes those of path pods and other targets).
OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
while read line; do
if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
if [[ $line != "${PODS_ROOT}*" ]]; then
XCASSET_FILES+=("$line")
fi
done <<<"$OTHER_XCASSETS"
......
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#endif
FOUNDATION_EXPORT double Pods_GMRefresh_ExampleVersionNumber;
......
......@@ -23,12 +23,6 @@ case "${TARGETED_DEVICE_FAMILY}" in
;;
esac
realpath() {
DIRECTORY="$(cd "${1%/*}" && pwd)"
FILENAME="${1##*/}"
echo "$DIRECTORY/$FILENAME"
}
install_resource()
{
if [[ "$1" = /* ]] ; then
......@@ -70,7 +64,7 @@ EOM
xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
;;
*.xcassets)
ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH")
ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH"
XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
;;
*)
......@@ -93,7 +87,7 @@ then
# Find all other xcassets (this unfortunately includes those of path pods and other targets).
OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
while read line; do
if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
if [[ $line != "${PODS_ROOT}*" ]]; then
XCASSET_FILES+=("$line")
fi
done <<<"$OTHER_XCASSETS"
......
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#endif
FOUNDATION_EXPORT double Pods_GMRefresh_TestsVersionNumber;
......
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