Commit 9e91ae10 authored by jz's avatar jz

update

parent b3afead9
...@@ -326,6 +326,8 @@ ...@@ -326,6 +326,8 @@
"${PODS_ROOT}/Target Support Files/Pods-GMBase_Example/Pods-GMBase_Example-frameworks.sh", "${PODS_ROOT}/Target Support Files/Pods-GMBase_Example/Pods-GMBase_Example-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework", "${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
"${BUILT_PRODUCTS_DIR}/EVReflection/EVReflection.framework",
"${BUILT_PRODUCTS_DIR}/GM-Swift-Observable/GM_Swift_Observable.framework",
"${BUILT_PRODUCTS_DIR}/GMCache/GMCache.framework", "${BUILT_PRODUCTS_DIR}/GMCache/GMCache.framework",
"${BUILT_PRODUCTS_DIR}/GMFoundation/GMFoundation.framework", "${BUILT_PRODUCTS_DIR}/GMFoundation/GMFoundation.framework",
"${BUILT_PRODUCTS_DIR}/GMHud/GMHud.framework", "${BUILT_PRODUCTS_DIR}/GMHud/GMHud.framework",
...@@ -349,6 +351,8 @@ ...@@ -349,6 +351,8 @@
outputPaths = ( outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/EVReflection.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GM_Swift_Observable.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMCache.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMCache.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMFoundation.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMFoundation.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMHud.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMHud.framework",
......
...@@ -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 'GMBaseSwift', :path => '../../GMBaseSwift'
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
......
...@@ -18,7 +18,12 @@ PODS: ...@@ -18,7 +18,12 @@ PODS:
- BDOpenSDKKit (1.0.0) - BDOpenSDKKit (1.0.0)
- DouyinOpenSDK (1.4.1): - DouyinOpenSDK (1.4.1):
- BDOpenSDKKit (~> 1.0.0) - BDOpenSDKKit (~> 1.0.0)
- EVReflection (5.10.0):
- EVReflection/Core (= 5.10.0)
- EVReflection/Core (5.10.0)
- GM-Swift-Observable (4.0.1)
- GMBase (1.1.5): - GMBase (1.1.5):
- GMBaseSwift
- GMHud - GMHud
- GMJSONModel - GMJSONModel
- GMKit - GMKit
...@@ -30,6 +35,15 @@ PODS: ...@@ -30,6 +35,15 @@ PODS:
- MBProgressHUD - MBProgressHUD
- SDWebImage - SDWebImage
- "UITableView+FDTemplateLayoutCell (= 1.4)" - "UITableView+FDTemplateLayoutCell (= 1.4)"
- GMBaseSwift (3.4.1):
- EVReflection (= 5.10.0)
- GM-Swift-Observable
- GMHud
- GMKit
- GMNetworking
- GMPhobos
- GMRefresh
- SnapKit (= 4.2.0)
- GMCache (1.0.1): - GMCache (1.0.1):
- TMCache (= 2.1.0) - TMCache (= 2.1.0)
- GMFoundation (1.0.8) - GMFoundation (1.0.8)
...@@ -116,12 +130,14 @@ PODS: ...@@ -116,12 +130,14 @@ PODS:
DEPENDENCIES: DEPENDENCIES:
- GMBase (from `../`) - GMBase (from `../`)
- GMBaseSwift (from `../../GMBaseSwift`)
- "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)
SPEC REPOS: SPEC REPOS:
"git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git": "git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git":
- GM-Swift-Observable
- GMCache - GMCache
- GMFoundation - GMFoundation
- GMHud - GMHud
...@@ -136,6 +152,7 @@ SPEC REPOS: ...@@ -136,6 +152,7 @@ SPEC REPOS:
- Alamofire - Alamofire
- BDOpenSDKKit - BDOpenSDKKit
- DouyinOpenSDK - DouyinOpenSDK
- EVReflection
- MagicalRecord - MagicalRecord
- Masonry - Masonry
- MBProgressHUD - MBProgressHUD
...@@ -151,6 +168,8 @@ SPEC REPOS: ...@@ -151,6 +168,8 @@ SPEC REPOS:
EXTERNAL SOURCES: EXTERNAL SOURCES:
GMBase: GMBase:
:path: "../" :path: "../"
GMBaseSwift:
:path: "../../GMBaseSwift"
GMPhobos: GMPhobos:
:commit: 7e58199898627699373ad6a9f87b875ab04b0927 :commit: 7e58199898627699373ad6a9f87b875ab04b0927
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git" :git: "git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git"
...@@ -165,7 +184,10 @@ SPEC CHECKSUMS: ...@@ -165,7 +184,10 @@ SPEC CHECKSUMS:
Alamofire: 907e0a98eb68cdb7f9d1f541a563d6ac5dc77b25 Alamofire: 907e0a98eb68cdb7f9d1f541a563d6ac5dc77b25
BDOpenSDKKit: 3fb530ce73f85a7d6ee69e7fd3d9158444c5bd09 BDOpenSDKKit: 3fb530ce73f85a7d6ee69e7fd3d9158444c5bd09
DouyinOpenSDK: 5ba83de22963ba7a3ba70c8ff11dfcb2885ecc2b DouyinOpenSDK: 5ba83de22963ba7a3ba70c8ff11dfcb2885ecc2b
GMBase: c05543aeb65efd5ec47febc1f382ec45ff0d3fcd EVReflection: 1abc1a81927ab0d30170238cf9b79bff489e9728
GM-Swift-Observable: 756d8fc13638b9faa68cb10266b2ffb47a911595
GMBase: 358e72062cb0f64a57ff34ec181b20ad9973d79b
GMBaseSwift: 8f327883b33ac24d0dcdb648ac3f9d6c57949ad5
GMCache: b78d8e46db864405e91d226ce640cc80d966c611 GMCache: b78d8e46db864405e91d226ce640cc80d966c611
GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682 GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682
GMHud: 18d41f4900a204f27be14e9504fcee2060ae3b2c GMHud: 18d41f4900a204f27be14e9504fcee2060ae3b2c
...@@ -188,6 +210,6 @@ SPEC CHECKSUMS: ...@@ -188,6 +210,6 @@ SPEC CHECKSUMS:
WechatOpenSDK: 8b3ba4239193d1112205c139c94e21934e8f369a WechatOpenSDK: 8b3ba4239193d1112205c139c94e21934e8f369a
Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089 Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089
PODFILE CHECKSUM: b74f2b194504ef9d44b1d8f86b5b3ace5f59b61c PODFILE CHECKSUM: db60bbf458f56874386142fa246e256c5fa92944
COCOAPODS: 1.9.1 COCOAPODS: 1.9.1
...@@ -26,7 +26,7 @@ Pod::Spec.new do |s| ...@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
# s.dependency 'GMAlbum' # s.dependency 'GMAlbum'
# SnapKit 4.2.0 # SnapKit 4.2.0
# s.dependency 'SnapKit', '4.2.0' # s.dependency 'SnapKit', '4.2.0'
s.dependency 'GMBaseSwift'
s.swift_version = '4.2' s.swift_version = '4.2'
s.static_framework = true s.static_framework = true
end end
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
//#import "GMAdLabel.h" //#import "GMAdLabel.h"
#import <GMKit/GMKit-umbrella.h> #import <GMKit/GMKit-umbrella.h>
//#import "AllLayoutButton.swift" //#import "AllLayoutButton.swift"
@import GMBaseSwift;
@interface GMLiveWelfareView () @interface GMLiveWelfareView ()
@property (nonatomic , strong) AllLayoutButton *rightButton; @property (nonatomic , strong) AllLayoutButton *rightButton;
@property (nonatomic , strong) GMLabel *leftLabel; @property (nonatomic , strong) GMLabel *leftLabel;
......
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