Skip to content

Commit

Permalink
Merge pull request #4 from inkyfox/master
Browse files Browse the repository at this point in the history
Update dependencies to GoogleMaps 2.2 and RxSwift 3.2
  • Loading branch information
inkyfox authored Feb 19, 2017
2 parents 6c2793f + a187e27 commit 1a0b7f8
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 22 deletions.
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git'
use_frameworks!

target 'Example' do
pod 'GoogleMaps', '~> 2.1.0'
pod 'GoogleMaps', '~> 2.2.0'
pod 'RxGoogleMaps', :path => './'
end

Expand Down
36 changes: 18 additions & 18 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
PODS:
- GoogleMaps (2.1.0):
- GoogleMaps/Maps (= 2.1.0)
- GoogleMaps/Base (2.1.0)
- GoogleMaps/Maps (2.1.0):
- GoogleMaps/Base (= 2.1.0)
- RxCocoa (3.0.0):
- RxSwift (~> 3.0)
- RxGoogleMaps (2.1.3):
- RxCocoa (~> 3.0.0)
- RxSwift (~> 3.0.0)
- RxSwift (3.0.0)
- GoogleMaps (2.2.0):
- GoogleMaps/Maps (= 2.2.0)
- GoogleMaps/Base (2.2.0)
- GoogleMaps/Maps (2.2.0):
- GoogleMaps/Base
- RxCocoa (3.2.0):
- RxSwift (~> 3.1)
- RxGoogleMaps (2.2.0):
- RxCocoa (~> 3.2)
- RxSwift (~> 3.2)
- RxSwift (3.2.0)

DEPENDENCIES:
- GoogleMaps (~> 2.1.0)
- GoogleMaps (~> 2.2.0)
- RxGoogleMaps (from `./`)

EXTERNAL SOURCES:
RxGoogleMaps:
:path: "./"

SPEC CHECKSUMS:
GoogleMaps: 06589b9a38097bce0cd6e90f0fd9b5e4b4a9344c
RxCocoa: 0a2f3ae381cf16f4021a4cee7a4420f83058a965
RxGoogleMaps: f0ca4fb55863359b30ab04026faf36e19d19239c
RxSwift: a930cd662f5b4a7ca9dc3518585dba91dadf497c
GoogleMaps: 104c418d61ab8a05dff06ed0784c25ea9d37da45
RxCocoa: ccdf43101a70407097a29082f648ba1676075b30
RxGoogleMaps: 69e5bb879d96cec2c35002337cd318e7734bbd28
RxSwift: 46574f70d416b7923c237195939cc488a7fbf3a0

PODFILE CHECKSUM: 71aee9cbf63e0f6325ab78366a9e3c7e2e7a7596
PODFILE CHECKSUM: b63938aa5b51c49ecf0f250904ab70520a91e33a

COCOAPODS: 1.1.0.rc.3
COCOAPODS: 1.2.0
7 changes: 4 additions & 3 deletions RxGoogleMaps.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "RxGoogleMaps"
s.version = "2.1.3"
s.version = "2.2.0"
s.summary = "RxSwift reactive wrapper for GoogleMaps SDK."
s.homepage = "https://github.com/RxSwiftCommunity/RxGoogleMaps"
s.license = 'MIT'
Expand All @@ -11,8 +11,9 @@ Pod::Spec.new do |s|
s.ios.deployment_target = '8.0'
s.source_files = 'Sources/*.swift'
s.preserve_paths = 'RxGoogleMapsBridge.swift'
s.dependency 'RxSwift', '~> 3.0.0'
s.dependency 'RxCocoa', '~> 3.0.0'

s.dependency 'RxSwift', '~> 3.2'
s.dependency 'RxCocoa', '~> 3.2'
s.pod_target_xcconfig = {
'SWIFT_VERSION' => '3.0'
}
Expand Down

0 comments on commit 1a0b7f8

Please sign in to comment.