diff --git a/Podfile b/Podfile index bfac36b..7691ae4 100644 --- a/Podfile +++ b/Podfile @@ -5,16 +5,16 @@ use_frameworks! target 'librx' do pod 'RESideMenu', '~> 4.0.7' pod 'Alamofire', '~> 2.0' - pod 'SwiftyJSON', :git => 'https://github.com/SwiftyJSON/SwiftyJSON.git', :branch => 'xcode7' +# pod 'SwiftyJSON', :git => 'https://github.com/SwiftyJSON/SwiftyJSON.git', :branch => 'xcode7.1' + pod 'SwiftyJSON', '~> 2.3.1' pod 'Spring', :git => 'https://github.com/MengTo/Spring.git', :branch => 'swift2' pod 'JSONWebToken', '~> 1.4.0' pod 'Appirater' pod 'SDWebImage', '~>3.7' pod 'WeiboSDK', :git => 'https://github.com/sinaweibosdk/weibo_ios_sdk.git', :tag => '3.1.3' - pod 'WebViewJavascriptBridge', '~> 4.0.1' - pod 'Toast', '~> 2.4’ +# pod 'WebViewJavascriptBridge', '~> 4.0.1' +# pod 'Toast', '~> 2.4’ end target 'librxTests' do - end diff --git a/Podfile.lock b/Podfile.lock index d8c3ea5..95766cd 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -9,8 +9,7 @@ PODS: - SDWebImage/Core (= 3.7.3) - SDWebImage/Core (3.7.3) - Spring (1.0.3) - - Toast (2.4) - - WebViewJavascriptBridge (4.0.1) + - SwiftyJSON (2.3.1) - WeiboSDK (3.1.3) DEPENDENCIES: @@ -20,8 +19,7 @@ DEPENDENCIES: - RESideMenu (~> 4.0.7) - SDWebImage (~> 3.7) - Spring (from `https://github.com/MengTo/Spring.git`, branch `swift2`) - - Toast (~> 2.4) - - WebViewJavascriptBridge (~> 4.0.1) + - SwiftyJSON (~> 2.3.1) - WeiboSDK (from `https://github.com/sinaweibosdk/weibo_ios_sdk.git`, tag `3.1.3`) EXTERNAL SOURCES: @@ -48,8 +46,7 @@ SPEC CHECKSUMS: RESideMenu: f24c508404b49c667344c54aba7e590883533958 SDWebImage: 1d2b1a1efda1ade1b00b6f8498865f8ddedc8a84 Spring: 3f02b5dc3308572ef177b3cad0fa7bbc4b0706f7 - Toast: 0773b8fc0e97352ca6054517bec7ebdd4110029d - WebViewJavascriptBridge: 61763151d6ca476c71dd4274f777262416f6b54f + SwiftyJSON: 592b53bee5ef3dd9b3bebc6b9cb7ee35426ae8c3 WeiboSDK: 5f2a707c4569a64f4641f4171acd712016f24342 COCOAPODS: 0.38.2