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

save progress

parent 207d53cd
PODS: PODS:
- GMRefresh (0.1.3): - GMRefresh (0.1.4):
- MJRefresh (~> 3.1.0) - MJRefresh (~> 3.1.0)
- MJRefresh (3.1.0) - MJRefresh (3.1.0)
...@@ -11,9 +11,9 @@ EXTERNAL SOURCES: ...@@ -11,9 +11,9 @@ EXTERNAL SOURCES:
:path: "../" :path: "../"
SPEC CHECKSUMS: SPEC CHECKSUMS:
GMRefresh: 182cfde175a3228b644160430c386ceb7fa631ad GMRefresh: 4a1d3332576e7a4d9be742d62fec260fd718e65d
MJRefresh: 743e6404967d1c2c688472ea3ecfde247d872db4 MJRefresh: 743e6404967d1c2c688472ea3ecfde247d872db4
PODFILE CHECKSUM: 9e12f3fbdc35e42e007aeabb4d7a97d764319eea PODFILE CHECKSUM: 9e12f3fbdc35e42e007aeabb4d7a97d764319eea
COCOAPODS: 1.1.0.rc.2 COCOAPODS: 1.1.1
{ {
"name": "GMRefresh", "name": "GMRefresh",
"version": "0.1.3", "version": "0.1.4",
"summary": "基于MJRefresh做的下拉刷新,自动加载更多", "summary": "基于MJRefresh做的下拉刷新,自动加载更多",
"homepage": "http://git.gengmei.cc/gengmeiios/GMLibrary/GMRefresh", "homepage": "http://git.gengmei.cc/gengmeiios/GMLibrary/GMRefresh",
"license": "MIT", "license": "MIT",
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
"wangyang": "wangyang@gmei.com" "wangyang": "wangyang@gmei.com"
}, },
"source": { "source": {
"git": "http://git.gengmei.cc/gengmeiios/GMRefresh.git", "git": "git@git.gengmei.cc:gengmeiios/GMRefresh.git",
"tag": "0.1.3" "tag": "0.1.4"
}, },
"platforms": { "platforms": {
"ios": "8.0" "ios": "8.0"
......
PODS: PODS:
- GMRefresh (0.1.3): - GMRefresh (0.1.4):
- MJRefresh (~> 3.1.0) - MJRefresh (~> 3.1.0)
- MJRefresh (3.1.0) - MJRefresh (3.1.0)
...@@ -11,9 +11,9 @@ EXTERNAL SOURCES: ...@@ -11,9 +11,9 @@ EXTERNAL SOURCES:
:path: "../" :path: "../"
SPEC CHECKSUMS: SPEC CHECKSUMS:
GMRefresh: 182cfde175a3228b644160430c386ceb7fa631ad GMRefresh: 4a1d3332576e7a4d9be742d62fec260fd718e65d
MJRefresh: 743e6404967d1c2c688472ea3ecfde247d872db4 MJRefresh: 743e6404967d1c2c688472ea3ecfde247d872db4
PODFILE CHECKSUM: 9e12f3fbdc35e42e007aeabb4d7a97d764319eea PODFILE CHECKSUM: 9e12f3fbdc35e42e007aeabb4d7a97d764319eea
COCOAPODS: 1.1.0.rc.2 COCOAPODS: 1.1.1
This diff is collapsed.
#ifdef __OBJC__
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#endif
#import "GMRefreshConstant.h" #import "GMRefreshConstant.h"
#import "GMRefreshFooter.h" #import "GMRefreshFooter.h"
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.1.3</string> <string>0.1.4</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>BNDL</string> <string>BNDL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.1.3</string> <string>0.1.4</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
#ifdef __OBJC__
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#endif
#import "MJRefreshAutoFooter.h" #import "MJRefreshAutoFooter.h"
#import "MJRefreshBackFooter.h" #import "MJRefreshBackFooter.h"
......
...@@ -23,12 +23,6 @@ case "${TARGETED_DEVICE_FAMILY}" in ...@@ -23,12 +23,6 @@ case "${TARGETED_DEVICE_FAMILY}" in
;; ;;
esac esac
realpath() {
DIRECTORY="$(cd "${1%/*}" && pwd)"
FILENAME="${1##*/}"
echo "$DIRECTORY/$FILENAME"
}
install_resource() install_resource()
{ {
if [[ "$1" = /* ]] ; then if [[ "$1" = /* ]] ; then
...@@ -70,7 +64,7 @@ EOM ...@@ -70,7 +64,7 @@ EOM
xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
;; ;;
*.xcassets) *.xcassets)
ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH") ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH"
XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
;; ;;
*) *)
...@@ -93,7 +87,7 @@ then ...@@ -93,7 +87,7 @@ then
# Find all other xcassets (this unfortunately includes those of path pods and other targets). # Find all other xcassets (this unfortunately includes those of path pods and other targets).
OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
while read line; do while read line; do
if [[ $line != "`realpath $PODS_ROOT`*" ]]; then if [[ $line != "${PODS_ROOT}*" ]]; then
XCASSET_FILES+=("$line") XCASSET_FILES+=("$line")
fi fi
done <<<"$OTHER_XCASSETS" done <<<"$OTHER_XCASSETS"
......
#ifdef __OBJC__
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#endif
FOUNDATION_EXPORT double Pods_GMRefresh_ExampleVersionNumber; FOUNDATION_EXPORT double Pods_GMRefresh_ExampleVersionNumber;
......
...@@ -23,12 +23,6 @@ case "${TARGETED_DEVICE_FAMILY}" in ...@@ -23,12 +23,6 @@ case "${TARGETED_DEVICE_FAMILY}" in
;; ;;
esac esac
realpath() {
DIRECTORY="$(cd "${1%/*}" && pwd)"
FILENAME="${1##*/}"
echo "$DIRECTORY/$FILENAME"
}
install_resource() install_resource()
{ {
if [[ "$1" = /* ]] ; then if [[ "$1" = /* ]] ; then
...@@ -70,7 +64,7 @@ EOM ...@@ -70,7 +64,7 @@ EOM
xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
;; ;;
*.xcassets) *.xcassets)
ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH") ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH"
XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
;; ;;
*) *)
...@@ -93,7 +87,7 @@ then ...@@ -93,7 +87,7 @@ then
# Find all other xcassets (this unfortunately includes those of path pods and other targets). # Find all other xcassets (this unfortunately includes those of path pods and other targets).
OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
while read line; do while read line; do
if [[ $line != "`realpath $PODS_ROOT`*" ]]; then if [[ $line != "${PODS_ROOT}*" ]]; then
XCASSET_FILES+=("$line") XCASSET_FILES+=("$line")
fi fi
done <<<"$OTHER_XCASSETS" done <<<"$OTHER_XCASSETS"
......
#ifdef __OBJC__
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#endif
FOUNDATION_EXPORT double Pods_GMRefresh_TestsVersionNumber; 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