Commit 3a7b4261 authored by 汪洋's avatar 汪洋

save progress

parent 9ce5da0a
......@@ -208,12 +208,12 @@
isa = PBXNativeTarget;
buildConfigurationList = 6003F5BF195388D20070C39A /* Build configuration list for PBXNativeTarget "GMRefresh_Example" */;
buildPhases = (
BD53463213654FBF55212ABA /* 📦 Check Pods Manifest.lock */,
BD53463213654FBF55212ABA /* [CP] Check Pods Manifest.lock */,
6003F586195388D20070C39A /* Sources */,
6003F587195388D20070C39A /* Frameworks */,
6003F588195388D20070C39A /* Resources */,
88C96FFAE5ACFCA8DAE2E535 /* 📦 Embed Pods Frameworks */,
AC731551ACD6686FC4DB21B0 /* 📦 Copy Pods Resources */,
88C96FFAE5ACFCA8DAE2E535 /* [CP] Embed Pods Frameworks */,
AC731551ACD6686FC4DB21B0 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
......@@ -228,12 +228,12 @@
isa = PBXNativeTarget;
buildConfigurationList = 6003F5C2195388D20070C39A /* Build configuration list for PBXNativeTarget "GMRefresh_Tests" */;
buildPhases = (
2AFA6B79FCCF1E413875AF85 /* 📦 Check Pods Manifest.lock */,
2AFA6B79FCCF1E413875AF85 /* [CP] Check Pods Manifest.lock */,
6003F5AA195388D20070C39A /* Sources */,
6003F5AB195388D20070C39A /* Frameworks */,
6003F5AC195388D20070C39A /* Resources */,
AC94AF4168D3DD1E67AAB021 /* 📦 Embed Pods Frameworks */,
B24157C697F0666FDF323615 /* 📦 Copy Pods Resources */,
AC94AF4168D3DD1E67AAB021 /* [CP] Embed Pods Frameworks */,
B24157C697F0666FDF323615 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
......@@ -302,14 +302,14 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
2AFA6B79FCCF1E413875AF85 /* 📦 Check Pods Manifest.lock */ = {
2AFA6B79FCCF1E413875AF85 /* [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;
......@@ -317,14 +317,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;
};
88C96FFAE5ACFCA8DAE2E535 /* 📦 Embed Pods Frameworks */ = {
88C96FFAE5ACFCA8DAE2E535 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Embed Pods Frameworks";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -332,14 +332,14 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GMRefresh_Example/Pods-GMRefresh_Example-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
AC731551ACD6686FC4DB21B0 /* 📦 Copy Pods Resources */ = {
AC731551ACD6686FC4DB21B0 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Copy Pods Resources";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -347,14 +347,14 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GMRefresh_Example/Pods-GMRefresh_Example-resources.sh\"\n";
showEnvVarsInLog = 0;
};
AC94AF4168D3DD1E67AAB021 /* 📦 Embed Pods Frameworks */ = {
AC94AF4168D3DD1E67AAB021 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Embed Pods Frameworks";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -362,14 +362,14 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GMRefresh_Tests/Pods-GMRefresh_Tests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
B24157C697F0666FDF323615 /* 📦 Copy Pods Resources */ = {
B24157C697F0666FDF323615 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Copy Pods Resources";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -377,14 +377,14 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GMRefresh_Tests/Pods-GMRefresh_Tests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
BD53463213654FBF55212ABA /* 📦 Check Pods Manifest.lock */ = {
BD53463213654FBF55212ABA /* [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;
......
......@@ -7,8 +7,9 @@
//
#import "GMTableViewController.h"
#import <GMRefresh/GMRefreshHeader.h>
#import <GMRefresh/GMRefreshFooter.h>
#import <GMRefresh/GMRefresh-umbrella.h>
//#import <GMRefresh/GMRefreshHeader.h>
//#import <GMRefresh/GMRefreshFooter.h>
@interface GMTableViewController ()
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="fLh-jI-GTC">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="fLh-jI-GTC">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
......
PODS:
- GMRefresh (0.1.2):
- GMRefresh (0.1.3):
- MJRefresh (~> 3.1.0)
- MJRefresh (3.1.0)
......@@ -11,9 +11,9 @@ EXTERNAL SOURCES:
:path: "../"
SPEC CHECKSUMS:
GMRefresh: 80bfd6220568e7ee58d1a1cb83d9251ec1a50635
GMRefresh: 182cfde175a3228b644160430c386ceb7fa631ad
MJRefresh: 743e6404967d1c2c688472ea3ecfde247d872db4
PODFILE CHECKSUM: 9e12f3fbdc35e42e007aeabb4d7a97d764319eea
COCOAPODS: 1.0.0
COCOAPODS: 1.0.1
{
"name": "GMRefresh",
"version": "0.1.2",
"version": "0.1.3",
"summary": "基于MJRefresh做的下拉刷新,自动加载更多",
"homepage": "http://git.gengmei.cc/gengmeiios/GMLibrary/GMRefresh",
"license": "MIT",
......@@ -9,7 +9,7 @@
},
"source": {
"git": "http://git.gengmei.cc/gengmeiios/GMRefresh.git",
"tag": "0.1.2"
"tag": "0.1.3"
},
"platforms": {
"ios": "8.0"
......
PODS:
- GMRefresh (0.1.2):
- GMRefresh (0.1.3):
- MJRefresh (~> 3.1.0)
- MJRefresh (3.1.0)
......@@ -11,9 +11,9 @@ EXTERNAL SOURCES:
:path: "../"
SPEC CHECKSUMS:
GMRefresh: 80bfd6220568e7ee58d1a1cb83d9251ec1a50635
GMRefresh: 182cfde175a3228b644160430c386ceb7fa631ad
MJRefresh: 743e6404967d1c2c688472ea3ecfde247d872db4
PODFILE CHECKSUM: 9e12f3fbdc35e42e007aeabb4d7a97d764319eea
COCOAPODS: 1.0.0
COCOAPODS: 1.0.1
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.1.2</string>
<string>0.1.3</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}"
......
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