Skip to content

Commit

Permalink
Update Google Maps SDK to 3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
freak4pc committed May 2, 2019
1 parent 2dd2550 commit ae3e24d
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 58 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" ~> 4.3
github "ReactiveX/RxSwift" ~> 4.4
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" "4.3.1"
github "ReactiveX/RxSwift" "4.5.0"
3 changes: 1 addition & 2 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
platform :ios, '8.0'
platform :ios, '9.0'
source 'https://github.com/CocoaPods/Specs.git'
use_frameworks!

target 'Example' do
pod 'RxGoogleMaps', :path => './'
Expand Down
34 changes: 17 additions & 17 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
PODS:
- GoogleMaps (2.7.0):
- GoogleMaps/Maps (= 2.7.0)
- GoogleMaps/Base (2.7.0)
- GoogleMaps/Maps (2.7.0):
- GoogleMaps (3.1.0):
- GoogleMaps/Maps (= 3.1.0)
- GoogleMaps/Base (3.1.0)
- GoogleMaps/Maps (3.1.0):
- GoogleMaps/Base
- RxCocoa (4.3.1):
- RxSwift (~> 4.0)
- RxGoogleMaps (3.1.0):
- GoogleMaps (~> 2.7.0)
- RxCocoa (~> 4.0)
- RxSwift (~> 4.0)
- RxSwift (4.3.1)
- RxCocoa (4.5.0):
- RxSwift (>= 4.4.2, ~> 4.4)
- RxGoogleMaps (3.2.0):
- GoogleMaps (~> 3)
- RxCocoa (~> 4)
- RxSwift (~> 4)
- RxSwift (4.5.0)

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

SPEC CHECKSUMS:
GoogleMaps: f79af95cb24d869457b1f961c93d3ce8b2f3b848
RxCocoa: 78763c7b07d02455598d9fc3c1ad091a28b73635
RxGoogleMaps: a801d6a49c0c24c6e4003a376040b8714d76562c
RxSwift: fe0fd770a43acdb7d0a53da411c9b892e69bb6e4
GoogleMaps: 5c13302e6fe6bb6e686b267196586b91cd594225
RxCocoa: cbf70265dc65a981d4ac982e513c10cf23df24a0
RxGoogleMaps: d097750dd5b512e3c9e860305ee289709779c8fe
RxSwift: f172070dfd1a93d70a9ab97a5a01166206e1c575

PODFILE CHECKSUM: 5ddedf02cee7bfec75a7b664a996fde670dfb87b
PODFILE CHECKSUM: e792f107d2ba042de4cbc3845ff8c3ef4be9fae3

COCOAPODS: 1.5.3
COCOAPODS: 1.7.0.beta.3
12 changes: 6 additions & 6 deletions RxGoogleMaps.podspec
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
Pod::Spec.new do |s|
s.name = "RxGoogleMaps"
s.version = "3.1.0"
s.version = "3.2.0"
s.summary = "RxSwift reactive wrapper for GoogleMaps SDK."
s.homepage = "https://github.com/RxSwiftCommunity/RxGoogleMaps"
s.license = 'MIT'
s.author = { "Yongha Yoo" => "[email protected]", "RxSwift Community" => "[email protected]" }
s.platform = :ios, "8.0"
s.platform = :ios, "9.0"
s.source = { :git => "https://github.com/RxSwiftCommunity/RxGoogleMaps.git", :tag => s.version.to_s }
s.requires_arc = true
s.ios.deployment_target = '8.0'
s.ios.deployment_target = '9.0'
s.source_files = 'Sources/*.swift'

s.static_framework = true
s.dependency 'RxSwift', '~> 4.3'
s.dependency 'RxCocoa', '~> 4.3'
s.dependency 'GoogleMaps', '~> 2.7.0'
s.dependency 'RxSwift', '~> 4'
s.dependency 'RxCocoa', '~> 4'
s.dependency 'GoogleMaps', '~> 3'

s.pod_target_xcconfig = {
'SWIFT_VERSION' => '4.2'
Expand Down
41 changes: 10 additions & 31 deletions RxGoogleMaps.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@

/* Begin PBXBuildFile section */
090646D61EB8C350007F53BA /* RxGoogleMaps-iOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 090646D41EB8C350007F53BA /* RxGoogleMaps-iOS.h */; settings = {ATTRIBUTES = (Public, ); }; };
4F0951D5D1A0A6BCFF5F114B /* libPods-Example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A92896541D9A368FBDD85BED /* libPods-Example.a */; };
A90F9CBC1DAABB5600A3461E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90F9CBB1DAABB5600A3461E /* AppDelegate.swift */; };
A90F9CBE1DAABB5600A3461E /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90F9CBD1DAABB5600A3461E /* ViewController.swift */; };
A90F9CC11DAABB5600A3461E /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A90F9CBF1DAABB5600A3461E /* Main.storyboard */; };
A90F9CC31DAABB5600A3461E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A90F9CC21DAABB5600A3461E /* Assets.xcassets */; };
A90F9CC61DAABB5600A3461E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A90F9CC41DAABB5600A3461E /* LaunchScreen.storyboard */; };
C5B2468C4099994FDD74ED4D /* Pods_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AEE9272F37DFF9F5256AB1B0 /* Pods_Example.framework */; settings = {ATTRIBUTES = (Required, ); }; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -31,7 +31,7 @@
A90F9CC21DAABB5600A3461E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
A90F9CC51DAABB5600A3461E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
A90F9CC71DAABB5600A3461E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
AEE9272F37DFF9F5256AB1B0 /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
A92896541D9A368FBDD85BED /* libPods-Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Example.a"; sourceTree = BUILT_PRODUCTS_DIR; };
E58C77E01FABF78500521822 /* libRxGoogleMaps.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libRxGoogleMaps.a; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

Expand All @@ -47,7 +47,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
C5B2468C4099994FDD74ED4D /* Pods_Example.framework in Frameworks */,
4F0951D5D1A0A6BCFF5F114B /* libPods-Example.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -76,7 +76,7 @@
E58C77E01FABF78500521822 /* libRxGoogleMaps.a */,
096B037F1EBD1F16008387E2 /* RxSwift.framework */,
096B037D1EBD1F00008387E2 /* RxCocoa.framework */,
AEE9272F37DFF9F5256AB1B0 /* Pods_Example.framework */,
A92896541D9A368FBDD85BED /* libPods-Example.a */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -164,7 +164,6 @@
A90F9CB51DAABB5600A3461E /* Sources */,
A90F9CB61DAABB5600A3461E /* Frameworks */,
A90F9CB71DAABB5600A3461E /* Resources */,
B242D01270BF228B3014484C /* [CP] Embed Pods Frameworks */,
6B2BC5CA30B5D2E4A6CED63E /* [CP] Copy Pods Resources */,
);
buildRules = (
Expand Down Expand Up @@ -244,7 +243,7 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-resources.sh",
"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-resources.sh",
"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle",
);
name = "[CP] Copy Pods Resources";
Expand All @@ -253,27 +252,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-resources.sh\"\n";
showEnvVarsInLog = 0;
};
B242D01270BF228B3014484C /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-resources.sh\"\n";
showEnvVarsInLog = 0;
};
E60D97708A067C5B28366CED /* [CP] Check Pods Manifest.lock */ = {
Expand Down Expand Up @@ -349,7 +328,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "RxGoogleMaps-iOS/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.oo-v.RxGoogleMaps";
PRODUCT_NAME = RxGoogleMaps;
Expand All @@ -371,7 +350,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "RxGoogleMaps-iOS/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.oo-v.RxGoogleMaps";
PRODUCT_NAME = RxGoogleMaps;
Expand Down Expand Up @@ -430,7 +409,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -486,7 +465,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand Down

0 comments on commit ae3e24d

Please sign in to comment.