Commit e06ebadc authored by jz's avatar jz

update GMRe=fresh

parent 5f02ae6e
...@@ -8,7 +8,7 @@ platform :ios, '8.0' ...@@ -8,7 +8,7 @@ platform :ios, '8.0'
target 'GMRefresh_Example' do target 'GMRefresh_Example' do
pod 'GMRefresh', :path => '../' pod 'GMRefresh', :path => '../'
pod 'GMPhobos', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git', :commit => 'ed064ed2' # pod 'GMPhobos', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git', :commit => 'ed064ed2'
target 'GMRefresh_Tests' do target 'GMRefresh_Tests' do
inherit! :search_paths inherit! :search_paths
......
PODS: PODS:
- GMCache (1.0.1): - GMCache (1.0.1):
- TMCache (= 2.1.0) - TMCache (= 2.1.0)
- GMPhobos (2.0.5): - GMPhobos (2.1.4):
- GMCache - GMCache
- MagicalRecord - MagicalRecord
- MJExtension - MJExtension
- GMRefresh (1.0.7): - GMRefresh (1.0.10):
- GMPhobos - GMPhobos
- MJRefresh - MJRefresh
- MagicalRecord (2.3.2): - MagicalRecord (2.3.2):
- MagicalRecord/Core (= 2.3.2) - MagicalRecord/Core (= 2.3.2)
- MagicalRecord/Core (2.3.2) - MagicalRecord/Core (2.3.2)
- MJExtension (3.2.1) - MJExtension (3.2.2)
- MJRefresh (3.4.3) - MJRefresh (3.4.3)
- TMCache (2.1.0) - TMCache (2.1.0)
DEPENDENCIES: DEPENDENCIES:
- "GMPhobos (from `git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git`, commit `ed064ed2`)"
- GMRefresh (from `../`) - GMRefresh (from `../`)
SPEC REPOS: SPEC REPOS:
"git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git": "git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git":
- GMCache - GMCache
- GMPhobos
https://github.com/CocoaPods/Specs.git: https://github.com/CocoaPods/Specs.git:
- MagicalRecord - MagicalRecord
- MJExtension - MJExtension
...@@ -29,26 +29,18 @@ SPEC REPOS: ...@@ -29,26 +29,18 @@ SPEC REPOS:
- TMCache - TMCache
EXTERNAL SOURCES: EXTERNAL SOURCES:
GMPhobos:
:commit: ed064ed2
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git"
GMRefresh: GMRefresh:
:path: "../" :path: "../"
CHECKOUT OPTIONS:
GMPhobos:
:commit: ed064ed2
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git"
SPEC CHECKSUMS: SPEC CHECKSUMS:
GMCache: b78d8e46db864405e91d226ce640cc80d966c611 GMCache: b78d8e46db864405e91d226ce640cc80d966c611
GMPhobos: abab7c666c8a75549adea937e40e101d4d341b0d GMPhobos: b4e16c162df6618c6f7d10f4649a5f32920961fd
GMRefresh: f9c68dc35d360f5603b6fd12d1879bc4c604fca4 GMRefresh: 83bace29d46fc6fa7af8a5f804c87c6d9d877f03
MagicalRecord: 53bed74b4323b930992a725be713e53b37d19755 MagicalRecord: 53bed74b4323b930992a725be713e53b37d19755
MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545 MJExtension: d9b9c74cbdeb724c1e9ecbb157b318276e62e876
MJRefresh: 53e3e3219f204425ee6d3e62e8733d3295944cd6 MJRefresh: 53e3e3219f204425ee6d3e62e8733d3295944cd6
TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
PODFILE CHECKSUM: 3bb388bc9c1a63689947d21bc4175bf6d8906093 PODFILE CHECKSUM: 5b26187304a92618b05fa7364bee6b2003edf1b0
COCOAPODS: 1.9.2 COCOAPODS: 1.9.3
...@@ -14,7 +14,7 @@ Pod::Spec.new do |s| ...@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
s.license = 'MIT' s.license = 'MIT'
s.author = { "wangyang" => "wangyang@gmei.com" } s.author = { "wangyang" => "wangyang@gmei.com" }
s.source = { :git => "git@git.wanmeizhensuo.com:gengmeiios/GMRefresh.git", :tag => s.version.to_s } s.source = { :git => "git@git.wanmeizhensuo.com:gengmeiios/GMRefresh.git", :tag => s.version.to_s }
s.ios.deployment_target = '8.0' s.ios.deployment_target = '9.0'
#s.dependency 'MJRefresh', '3.1.15.1' #s.dependency 'MJRefresh', '3.1.15.1'
s.dependency 'GMPhobos' s.dependency 'GMPhobos'
s.dependency 'MJRefresh' s.dependency 'MJRefresh'
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
#import "GMRefreshFooter.h" #import "GMRefreshFooter.h"
#import "GMRefreshConstant.h" #import "GMRefreshConstant.h"
#import "MJRefreshComponent+Private.h" #import "MJRefreshComponent+Private.h"
@import GMPhobos; #import <GMPhobos/GMPhobos-umbrella.h>
//@import GMPhobos;
#define ImageCount 16 #define ImageCount 16
......
...@@ -9,7 +9,9 @@ ...@@ -9,7 +9,9 @@
#import "GMRefreshHeader.h" #import "GMRefreshHeader.h"
#import "GMRefreshConstant.h" #import "GMRefreshConstant.h"
#import "MJRefreshComponent+Private.h" #import "MJRefreshComponent+Private.h"
@import GMPhobos; #import <GMPhobos/GMPhobos-umbrella.h>
//@import GMPhobos;
#define GM_REFRESH_WIDTH 46 #define GM_REFRESH_WIDTH 46
#define GM_REFRESH_HEIGHT 14 #define GM_REFRESH_HEIGHT 14
......
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