Commit bb73c1bb authored by luyueming's avatar luyueming

Merge branch 'lym/text' of git.wanmeizhensuo.com:gengmeiios/GMBase into lym/text

* 'lym/text' of git.wanmeizhensuo.com:gengmeiios/GMBase:
  update
parents 54dcbd9d 93d00cad
...@@ -11,7 +11,7 @@ target 'GMBase_Example' do ...@@ -11,7 +11,7 @@ target 'GMBase_Example' do
pod 'SnapKit', '4.2.0' pod 'SnapKit', '4.2.0'
pod 'GMShareSDK', '0.2.1' pod 'GMShareSDK', '0.2.1'
pod 'GMFoundation', :path => '../../GMFoundation' # pod 'GMFoundation', :path => '../../GMFoundation'
pod 'GMPhobos', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git', :commit => '7e58199898627699373ad6a9f87b875ab04b0927' pod 'GMPhobos', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git', :commit => '7e58199898627699373ad6a9f87b875ab04b0927'
target 'GMBase_Tests' do target 'GMBase_Tests' do
inherit! :search_paths inherit! :search_paths
......
...@@ -30,7 +30,7 @@ PODS: ...@@ -30,7 +30,7 @@ PODS:
- "UITableView+FDTemplateLayoutCell (= 1.4)" - "UITableView+FDTemplateLayoutCell (= 1.4)"
- GMCache (1.0.1): - GMCache (1.0.1):
- TMCache (= 2.1.0) - TMCache (= 2.1.0)
- GMFoundation (1.0.7) - GMFoundation (1.0.8)
- GMHud (1.0.3): - GMHud (1.0.3):
- MBProgressHUD (= 0.9.2) - MBProgressHUD (= 0.9.2)
- GMJSONModel (1.7.4) - GMJSONModel (1.7.4)
...@@ -112,7 +112,6 @@ PODS: ...@@ -112,7 +112,6 @@ PODS:
DEPENDENCIES: DEPENDENCIES:
- GMBase (from `../`) - GMBase (from `../`)
- GMFoundation (from `../../GMFoundation`)
- "GMPhobos (from `git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git`, commit `7e58199898627699373ad6a9f87b875ab04b0927`)" - "GMPhobos (from `git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git`, commit `7e58199898627699373ad6a9f87b875ab04b0927`)"
- GMShareSDK (= 0.2.1) - GMShareSDK (= 0.2.1)
- SnapKit (= 4.2.0) - SnapKit (= 4.2.0)
...@@ -120,6 +119,7 @@ DEPENDENCIES: ...@@ -120,6 +119,7 @@ DEPENDENCIES:
SPEC REPOS: SPEC REPOS:
"git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git": "git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git":
- GMCache - GMCache
- GMFoundation
- GMHud - GMHud
- GMJSONModel - GMJSONModel
- GMKit - GMKit
...@@ -145,8 +145,6 @@ SPEC REPOS: ...@@ -145,8 +145,6 @@ SPEC REPOS:
EXTERNAL SOURCES: EXTERNAL SOURCES:
GMBase: GMBase:
:path: "../" :path: "../"
GMFoundation:
:path: "../../GMFoundation"
GMPhobos: GMPhobos:
:commit: 7e58199898627699373ad6a9f87b875ab04b0927 :commit: 7e58199898627699373ad6a9f87b875ab04b0927
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git" :git: "git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git"
...@@ -162,7 +160,7 @@ SPEC CHECKSUMS: ...@@ -162,7 +160,7 @@ SPEC CHECKSUMS:
DouyinOpenSDK: 5ba83de22963ba7a3ba70c8ff11dfcb2885ecc2b DouyinOpenSDK: 5ba83de22963ba7a3ba70c8ff11dfcb2885ecc2b
GMBase: 2f05a06e886f8ea355e6f8be4276b667611140b4 GMBase: 2f05a06e886f8ea355e6f8be4276b667611140b4
GMCache: b78d8e46db864405e91d226ce640cc80d966c611 GMCache: b78d8e46db864405e91d226ce640cc80d966c611
GMFoundation: 59cdf19ad5bdc479162da975cc739cf5cb418ab6 GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682
GMHud: 18d41f4900a204f27be14e9504fcee2060ae3b2c GMHud: 18d41f4900a204f27be14e9504fcee2060ae3b2c
GMJSONModel: 5e81a98de668e9f93cf6ff77869f77b0d1a806be GMJSONModel: 5e81a98de668e9f93cf6ff77869f77b0d1a806be
GMKit: ff2a77a9b85e13b4de333ec5eeb10b1ffef09756 GMKit: ff2a77a9b85e13b4de333ec5eeb10b1ffef09756
...@@ -182,6 +180,6 @@ SPEC CHECKSUMS: ...@@ -182,6 +180,6 @@ SPEC CHECKSUMS:
WechatOpenSDK: 8b3ba4239193d1112205c139c94e21934e8f369a WechatOpenSDK: 8b3ba4239193d1112205c139c94e21934e8f369a
Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089 Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089
PODFILE CHECKSUM: 91fc775f851c4b233485f262092149bc6027c830 PODFILE CHECKSUM: b74f2b194504ef9d44b1d8f86b5b3ace5f59b61c
COCOAPODS: 1.9.1 COCOAPODS: 1.9.1
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