RxGoogleMaps 4.0.0

Cartfile

@@ -1 +1 @@
-github "ReactiveX/RxSwift" ~> 4.4
+github "ReactiveX/RxSwift" ~> 5.0

Podfile

@@ -8,8 +8,7 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
-        config.build_settings['SWIFT_VERSION'] = '4.2'
-        #config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '10.10'
+        config.build_settings['SWIFT_VERSION'] = '5.0'
     end
   end
 end

Podfile.lock

@@ -4,13 +4,16 @@ PODS:
   - GoogleMaps/Base (3.1.0)
   - GoogleMaps/Maps (3.1.0):
     - GoogleMaps/Base
-  - RxCocoa (4.5.0):
-    - RxSwift (>= 4.4.2, ~> 4.4)
-  - RxGoogleMaps (3.2.0):
+  - RxCocoa (5.0.0):
+    - RxRelay (~> 5)
+    - RxSwift (~> 5)
+  - RxGoogleMaps (4.0.0):
     - GoogleMaps (~> 3)
-    - RxCocoa (~> 4)
-    - RxSwift (~> 4)
-  - RxSwift (4.5.0)
+    - RxCocoa (~> 5)
+    - RxSwift (~> 5)
+  - RxRelay (5.0.0):
+    - RxSwift (~> 5)
+  - RxSwift (5.0.0)
 
 DEPENDENCIES:
   - RxGoogleMaps (from `./`)
@@ -19,6 +22,7 @@ SPEC REPOS:
   https://github.com/cocoapods/specs.git:
     - GoogleMaps
     - RxCocoa
+    - RxRelay
     - RxSwift
 
 EXTERNAL SOURCES:
@@ -27,10 +31,11 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   GoogleMaps: 5c13302e6fe6bb6e686b267196586b91cd594225
-  RxCocoa: cbf70265dc65a981d4ac982e513c10cf23df24a0
-  RxGoogleMaps: d097750dd5b512e3c9e860305ee289709779c8fe
-  RxSwift: f172070dfd1a93d70a9ab97a5a01166206e1c575
+  RxCocoa: fcf32050ac00d801f34a7f71d5e8e7f23026dcd8
+  RxGoogleMaps: 5d8a91a26dc9e3f703c5be09424e3ecf7f607328
+  RxRelay: 4f7409406a51a55cd88483f21ed898c234d60f18
+  RxSwift: 8b0671caa829a763bbce7271095859121cbd895f
 
-PODFILE CHECKSUM: e792f107d2ba042de4cbc3845ff8c3ef4be9fae3
+PODFILE CHECKSUM: b57e58c55d574ab5693f061b8799cf62f94c9842
 
 COCOAPODS: 1.7.0.beta.3

RxGoogleMaps.podspec

@@ -1,22 +1,18 @@
 Pod::Spec.new do |s|
   s.name             = "RxGoogleMaps"
-  s.version          = "3.2.0"
+  s.version          = "4.0.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.author           = { "RxSwift Community" => "[email protected]" }
   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 = '9.0'
   s.source_files          = 'Sources/*.swift'
 
   s.static_framework = true
-  s.dependency 'RxSwift', '~> 4'
-  s.dependency 'RxCocoa', '~> 4'
+  s.dependency 'RxSwift', '~> 5'
+  s.dependency 'RxCocoa', '~> 5'
   s.dependency 'GoogleMaps', '~> 3'
-
-  s.pod_target_xcconfig = {
-    'SWIFT_VERSION' => '4.2'
-  }
 end

RxGoogleMaps.xcodeproj/project.pbxproj

@@ -182,7 +182,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "Gen X Hippies Company";
 				TargetAttributes = {
 					090646D11EB8C350007F53BA = {
@@ -199,7 +199,7 @@
 			};
 			buildConfigurationList = A90F9C951DAAB67100A3461E /* Build configuration list for PBXProject "RxGoogleMaps" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -363,6 +363,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -415,6 +416,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -425,6 +427,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -469,6 +472,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -487,7 +491,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.oo-v.RxGoogleMaps.Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -502,7 +506,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.oo-v.RxGoogleMaps.Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

RxGoogleMaps.xcodeproj/xcshareddata/xcschemes/RxGoogleMaps-iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -37,7 +36,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

RxGoogleMaps.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Sources/GMSCircle+Rx.swift

@@ -14,35 +14,33 @@ import RxCocoa
 import GoogleMaps
 
 public extension Reactive where Base: GMSCircle {
-
-    public var position: AnyObserver<CLLocationCoordinate2D> {
+    var position: Binder<CLLocationCoordinate2D> {
         return Binder(base) { control, position in
             control.position = position
-        }.asObserver()
+        }
     }
 
-    public var radius: AnyObserver<CLLocationDistance> {
+    var radius: Binder<CLLocationDistance> {
         return Binder(base) { control, radius in
             control.radius = radius
-        }.asObserver()
+        }
     }
 
-    public var strokeWidth: AnyObserver<CGFloat> {
+    var strokeWidth: Binder<CGFloat> {
         return Binder(base) { control, strokeWidth in
             control.strokeWidth = strokeWidth
-        }.asObserver()
+        }
     }
 
-    public var strokeColor: AnyObserver<UIColor?> {
+    var strokeColor: Binder<UIColor?> {
         return Binder(base) { control, strokeColor in
             control.strokeColor = strokeColor
-        }.asObserver()
+        }
     }
 
-    public var fillColor: AnyObserver<UIColor?> {
+    var fillColor: Binder<UIColor?> {
         return Binder(base) { control, fillColor in
             control.fillColor = fillColor
-        }.asObserver()
+        }
     }
-
 }

Sources/GMSGroundOverlay+Rx.swift

@@ -14,35 +14,33 @@ import RxCocoa
 import GoogleMaps
 
 public extension Reactive where Base: GMSGroundOverlay {
-
-    public var position: AnyObserver<CLLocationCoordinate2D> {
+    var position: Binder<CLLocationCoordinate2D> {
         return Binder(base) { control, position in
             control.position = position
-        }.asObserver()
+        }
     }
 
-    public var anchor: AnyObserver<CGPoint> {
+    var anchor: Binder<CGPoint> {
         return Binder(base) { control, anchor in
             control.anchor = anchor
-        }.asObserver()
+        }
     }
 
-    public var icon: AnyObserver<UIImage?> {
+    var icon: Binder<UIImage?> {
         return Binder(base) { control, icon in
             control.icon = icon
-        }.asObserver()
+        }
     }
 
-    public var opacity: AnyObserver<Float> {
+    var opacity: Binder<Float> {
         return Binder(base) { control, opacity in
             control.opacity = opacity
-        }.asObserver()
+        }
     }
 
-    public var bearing: AnyObserver<CLLocationDirection> {
+    var bearing: Binder<CLLocationDirection> {
         return Binder(base) { control, bearing in
             control.bearing = bearing
-        }.asObserver()
+        }
     }
-
 }