Merge pull request #23 from aksswami/master

Update to swift 4.2, GoogleMap 2.7.0 RxSwift, RxCocoa 4.3.1

.gitignore

@@ -65,3 +65,5 @@ fastlane/screenshots
 fastlane/test_output
 
 Example/key.plist
+
+.DS_Store

Cartfile

@@ -1 +1 @@
-github "ReactiveX/RxSwift" ~> 4.0
+github "ReactiveX/RxSwift" ~> 4.3

Cartfile.resolved

@@ -1 +1 @@
-github "ReactiveX/RxSwift" ~> 4.0
+github "ReactiveX/RxSwift" "4.3.1"

Example/AppDelegate.swift

@@ -21,12 +21,18 @@
 import UIKit
 import GoogleMaps
 
+#if swift(>=4.2)
+    typealias ApplicationLaunchOptionsKey = UIApplication.LaunchOptionsKey
+#else
+    typealias ApplicationLaunchOptionsKey = UIApplicationLaunchOptionsKey
+#endif
+
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
-
+    
     var window: UIWindow?
-
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [ApplicationLaunchOptionsKey: Any]?) -> Bool {
         // TODO: Replace with your API Key from https://developers.google.com/maps/documentation/ios-sdk/
         GMSServices.provideAPIKey("YOUR-API-KEY")
         return true

Podfile

@@ -9,7 +9,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.0'
+        config.build_settings['SWIFT_VERSION'] = '4.2'
         #config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '10.10'
     end
   end

Podfile.lock

@@ -1,30 +1,36 @@
 PODS:
-  - GoogleMaps (2.6.0):
-    - GoogleMaps/Maps (= 2.6.0)
-  - GoogleMaps/Base (2.6.0)
-  - GoogleMaps/Maps (2.6.0):
+  - GoogleMaps (2.7.0):
+    - GoogleMaps/Maps (= 2.7.0)
+  - GoogleMaps/Base (2.7.0)
+  - GoogleMaps/Maps (2.7.0):
     - GoogleMaps/Base
-  - RxCocoa (4.1.2):
+  - RxCocoa (4.3.1):
     - RxSwift (~> 4.0)
-  - RxGoogleMaps (3.0.1):
-    - GoogleMaps (~> 2.6.0)
+  - RxGoogleMaps (3.1.0):
+    - GoogleMaps (~> 2.7.0)
     - RxCocoa (~> 4.0)
     - RxSwift (~> 4.0)
-  - RxSwift (4.1.2)
+  - RxSwift (4.3.1)
 
 DEPENDENCIES:
   - RxGoogleMaps (from `./`)
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - GoogleMaps
+    - RxCocoa
+    - RxSwift
+
 EXTERNAL SOURCES:
   RxGoogleMaps:
-    :path: ./
+    :path: "./"
 
 SPEC CHECKSUMS:
-  GoogleMaps: 42f91c68b7fa2f84d5c86597b18ceb99f5414c7f
-  RxCocoa: d88ba0f1f6abf040011a9eb4b539324fc426843a
-  RxGoogleMaps: 35ac8f51dc37e2b2ca0bf475ddd713a96ad896a6
-  RxSwift: e49536837d9901277638493ea537394d4b55f570
+  GoogleMaps: f79af95cb24d869457b1f961c93d3ce8b2f3b848
+  RxCocoa: 78763c7b07d02455598d9fc3c1ad091a28b73635
+  RxGoogleMaps: a801d6a49c0c24c6e4003a376040b8714d76562c
+  RxSwift: fe0fd770a43acdb7d0a53da411c9b892e69bb6e4
 
-PODFILE CHECKSUM: 8926bb4f317d1813c964a7c97038b24441fbcde8
+PODFILE CHECKSUM: 5ddedf02cee7bfec75a7b664a996fde670dfb87b
 
-COCOAPODS: 1.4.0
+COCOAPODS: 1.5.3

README.md

@@ -142,9 +142,9 @@ Than run `pod install`, and you should be good to go!
 
 ## Requirements
 
-- Swift 4.0
-- [RxSwift](https://github.com/ReactiveX/RxSwift) >= 4.0
-- [RxCocoa](https://github.com/ReactiveX/RxSwift) >= 4.0
+- Swift 4.2
+- [RxSwift](https://github.com/ReactiveX/RxSwift) >= 4.3
+- [RxCocoa](https://github.com/ReactiveX/RxSwift) >= 4.3
 
 ## License
 

RxGoogleMaps.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RxGoogleMaps"
-  s.version          = "3.0.1"
+  s.version          = "3.1.0"
   s.summary          = "RxSwift reactive wrapper for GoogleMaps SDK."
   s.homepage         = "https://github.com/RxSwiftCommunity/RxGoogleMaps"
   s.license          = 'MIT'
@@ -12,11 +12,11 @@ Pod::Spec.new do |s|
   s.source_files          = 'Sources/*.swift'
 
   s.static_framework = true
-  s.dependency 'RxSwift', '~> 4.0'
-  s.dependency 'RxCocoa', '~> 4.0'
-  s.dependency 'GoogleMaps', '~> 2.6.0'
+  s.dependency 'RxSwift', '~> 4.3'
+  s.dependency 'RxCocoa', '~> 4.3'
+  s.dependency 'GoogleMaps', '~> 2.7.0'
 
   s.pod_target_xcconfig = {
-    'SWIFT_VERSION' => '4.0'
+    'SWIFT_VERSION' => '4.2'
   }
 end

RxGoogleMaps.xcodeproj/project.pbxproj

@@ -183,7 +183,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1000;
 				ORGANIZATIONNAME = "Gen X Hippies Company";
 				TargetAttributes = {
 					090646D11EB8C350007F53BA = {
@@ -193,6 +193,7 @@
 					A90F9CB81DAABB5600A3461E = {
 						CreatedOnToolsVersion = 8.0;
 						DevelopmentTeam = H7VM6ZW9AJ;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -353,7 +354,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.oo-v.RxGoogleMaps";
 				PRODUCT_NAME = RxGoogleMaps;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -375,7 +376,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.oo-v.RxGoogleMaps";
 				PRODUCT_NAME = RxGoogleMaps;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -392,13 +393,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -452,13 +455,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -503,7 +508,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.oo-v.RxGoogleMaps.Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -518,7 +523,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.oo-v.RxGoogleMaps.Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

Sources/GMSMapViewDelegateProxy.swift

@@ -121,7 +121,7 @@ func castOrThrow<T>(_ resultType: T.Type, _ object: Any) throws -> T {
 func castOrFatalError<T>(_ value: Any!) -> T {
     let maybeResult: T? = value as? T
     guard let result = maybeResult else {
-        fatalError("Failure converting from \(value) to \(T.self)")
+        fatalError("Failure converting from \(value ?? "") to \(T.self)")
     }
 
     return result