Skip to content

Commit

Permalink
Merge pull request #14 from rwjc/google-maps-2.6.0
Browse files Browse the repository at this point in the history
Update Google maps to 2.6.0
  • Loading branch information
freak4pc authored Feb 16, 2018
2 parents 8d74307 + 47a0d3d commit 7fa9ceb
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
26 changes: 13 additions & 13 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
PODS:
- GoogleMaps (2.5.0):
- GoogleMaps/Maps (= 2.5.0)
- GoogleMaps/Base (2.5.0)
- GoogleMaps/Maps (2.5.0):
- GoogleMaps (2.6.0):
- GoogleMaps/Maps (= 2.6.0)
- GoogleMaps/Base (2.6.0)
- GoogleMaps/Maps (2.6.0):
- GoogleMaps/Base
- RxCocoa (4.0.0):
- RxCocoa (4.1.2):
- RxSwift (~> 4.0)
- RxGoogleMaps (3.0.0):
- GoogleMaps (~> 2.5.0)
- RxGoogleMaps (3.0.1):
- GoogleMaps (~> 2.6.0)
- RxCocoa (~> 4.0)
- RxSwift (~> 4.0)
- RxSwift (4.0.0)
- RxSwift (4.1.2)

DEPENDENCIES:
- RxGoogleMaps (from `./`)
Expand All @@ -20,11 +20,11 @@ EXTERNAL SOURCES:
:path: ./

SPEC CHECKSUMS:
GoogleMaps: c087b8e5dfe87ca6ebf59adb9b4894a4146bec4f
RxCocoa: d62846ca96495d862fa4c59ea7d87e5031d7340e
RxGoogleMaps: 4292d12054bbd652967cb4da399a4992fe5d3bd8
RxSwift: fd680d75283beb5e2559486f3c0ff852f0d35334
GoogleMaps: 42f91c68b7fa2f84d5c86597b18ceb99f5414c7f
RxCocoa: d88ba0f1f6abf040011a9eb4b539324fc426843a
RxGoogleMaps: 35ac8f51dc37e2b2ca0bf475ddd713a96ad896a6
RxSwift: e49536837d9901277638493ea537394d4b55f570

PODFILE CHECKSUM: 8926bb4f317d1813c964a7c97038b24441fbcde8

COCOAPODS: 1.4.0.beta.2
COCOAPODS: 1.4.0
2 changes: 1 addition & 1 deletion RxGoogleMaps-iOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.0.0</string>
<string>3.0.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
4 changes: 2 additions & 2 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 = "3.0"
s.version = "3.0.1"
s.summary = "RxSwift reactive wrapper for GoogleMaps SDK."
s.homepage = "https://github.com/RxSwiftCommunity/RxGoogleMaps"
s.license = 'MIT'
Expand All @@ -14,7 +14,7 @@ Pod::Spec.new do |s|
s.static_framework = true
s.dependency 'RxSwift', '~> 4.0'
s.dependency 'RxCocoa', '~> 4.0'
s.dependency 'GoogleMaps', '~> 2.5.0'
s.dependency 'GoogleMaps', '~> 2.6.0'

s.pod_target_xcconfig = {
'SWIFT_VERSION' => '4.0'
Expand Down
2 changes: 1 addition & 1 deletion RxGoogleMaps.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
);
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down

0 comments on commit 7fa9ceb

Please sign in to comment.