Merge pull request #32 from leoru/feature/google-maps-spm-support

Google Maps 7.3.0 SPM Support
RxSwiftCommunity · Jul 10, 2023 · 819e480 · 819e480
2 parents 6d0d561 + c43d5a9
commit 819e480
Show file tree

Hide file tree

Showing 17 changed files with 127 additions and 45 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 jobs:
   "RxGoogleMaps CI":
     macos:
-      xcode: 11.3.0 # Specify the Xcode version to use
+      xcode: 14.3.1 # Specify the Xcode version to use
 
     steps:
       - checkout
@@ -15,7 +15,7 @@ jobs:
           command: set -o pipefail 
       - run: 
           name: XCode Build Example
-          command: xcodebuild build -scheme 'Example' -workspace 'RxGoogleMaps.xcworkspace' -sdk iphonesimulator -destination "name=iPhone 8" | xcpretty -c
+          command: xcodebuild build -scheme 'Example' -workspace 'RxGoogleMaps.xcworkspace' -sdk iphonesimulator -destination "name=iPhone 14 Pro Max" | xcpretty -c
 
   "RxGoogleMaps Release":
     working_directory: ~/RxSwiftCommunity/RxGoogleMaps
@@ -24,7 +24,7 @@ jobs:
     environment:
       LANG: en_US.UTF-8
     macos:
-      xcode: 11.3.0
+      xcode: 14.3.1
     steps:
       - checkout
       - run:

diff --git a/Package.resolved b/Package.resolved
@@ -0,0 +1,25 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "GoogleMaps",
+        "repositoryURL": "https://github.com/gomore/GoogleMaps-SPM.git",
+        "state": {
+          "branch": null,
+          "revision": "50acb0007868133ef9039c67ac04f6e4003c2b12",
+          "version": "7.3.0"
+        }
+      },
+      {
+        "package": "RxSwift",
+        "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
+        "state": {
+          "branch": null,
+          "revision": "9dcaa4b333db437b0fbfaf453fad29069044a8b4",
+          "version": "6.6.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,17 @@
+// swift-tools-version:5.1
+
+import PackageDescription
+
+let package = Package(
+  name: "RxGoogleMaps",
+  products: [
+    .library(name: "RxGoogleMaps", targets: ["RxGoogleMaps"]),
+  ],
+  dependencies: [
+    .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.6.0")),
+    .package(url: "https://github.com/gomore/GoogleMaps-SPM.git", .upToNextMajor(from: "7.3.0")),
+  ],
+  targets: [
+    .target(name: "RxGoogleMaps", dependencies: ["RxSwift", "RxCocoa", "GoogleMaps", "GoogleMapsCore", "GoogleMapsBase"]),
+  ]
+)
diff --git a/Podfile b/Podfile
@@ -1,4 +1,4 @@
-platform :ios, '9.0'
+platform :ios, '14.0'
 source 'https://github.com/CocoaPods/Specs.git'
 
 target 'Example' do
@@ -9,6 +9,7 @@ post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
         config.build_settings['SWIFT_VERSION'] = '5.0'
+        config.build_settings['ENABLE_USER_SCRIPT_SANDBOXING'] = 'NO'
     end
   end
 end
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,19 +1,19 @@
 PODS:
-  - GoogleMaps (3.1.0):
-    - GoogleMaps/Maps (= 3.1.0)
-  - GoogleMaps/Base (3.1.0)
-  - GoogleMaps/Maps (3.1.0):
+  - GoogleMaps (7.3.0):
+    - GoogleMaps/Maps (= 7.3.0)
+  - GoogleMaps/Base (7.3.0)
+  - GoogleMaps/Maps (7.3.0):
     - GoogleMaps/Base
-  - RxCocoa (6.0.0):
-    - RxRelay (= 6.0.0)
-    - RxSwift (= 6.0.0)
-  - RxGoogleMaps (5.0.0):
-    - GoogleMaps (~> 3)
+  - RxCocoa (6.5.0):
+    - RxRelay (= 6.5.0)
+    - RxSwift (= 6.5.0)
+  - RxGoogleMaps (7.3.0):
+    - GoogleMaps (~> 7.3.0)
     - RxCocoa (~> 6)
     - RxSwift (~> 6)
-  - RxRelay (6.0.0):
-    - RxSwift (= 6.0.0)
-  - RxSwift (6.0.0)
+  - RxRelay (6.5.0):
+    - RxSwift (= 6.5.0)
+  - RxSwift (6.5.0)
 
 DEPENDENCIES:
   - RxGoogleMaps (from `./`)
@@ -30,12 +30,12 @@ EXTERNAL SOURCES:
     :path: "./"
 
 SPEC CHECKSUMS:
-  GoogleMaps: 5c13302e6fe6bb6e686b267196586b91cd594225
-  RxCocoa: 3f79328fafa3645b34600f37c31e64c73ae3a80e
-  RxGoogleMaps: fcf1e560f99a89723ee5004d450ff54fd52e4914
-  RxRelay: 8d593be109c06ea850df027351beba614b012ffb
-  RxSwift: c14e798c59b9f6e9a2df8fd235602e85cc044295
+  GoogleMaps: a146f275ee429d14822178c7a841c03366ec92a1
+  RxCocoa: 94f817b71c07517321eb4f9ad299112ca8af743b
+  RxGoogleMaps: 62355f79874c54bb5c3af1a31c4f1d5502962fdb
+  RxRelay: 1de1523e604c72b6c68feadedd1af3b1b4d0ecbd
+  RxSwift: 5710a9e6b17f3c3d6e40d6e559b9fa1e813b2ef8
 
-PODFILE CHECKSUM: b57e58c55d574ab5693f061b8799cf62f94c9842
+PODFILE CHECKSUM: b8fbb96e50fe23f05387790effa2fcc475d7bf39
 
-COCOAPODS: 1.8.4
+COCOAPODS: 1.12.1
diff --git a/README.md b/README.md
@@ -122,6 +122,16 @@ mapView.rx.handleMarkerInfoWindow { marker in
 
 ## Installation
 
+### Swift Package Manager
+
+Add as a dependecy to your Swift Package
+
+```swift
+dependencies: [
+  .package(url: "https://github.com/RxSwiftCommunity/RxGoogleMaps.git", branch: "master")
+]
+```
+
 ### CocoaPods
 
   *Note:* Due to the fact Google Maps is delivered as a static library, you must have CocoaPods 1.4.0 installed to install this library.

diff --git a/RxGoogleMaps.podspec b/RxGoogleMaps.podspec
@@ -1,18 +1,18 @@
 Pod::Spec.new do |s|
   s.name             = "RxGoogleMaps"
-  s.version          = "5.0.0"
+  s.version          = "7.3.0"
   s.summary          = "RxSwift reactive wrapper for GoogleMaps SDK."
   s.homepage         = "https://github.com/RxSwiftCommunity/RxGoogleMaps"
   s.license          = 'MIT'
   s.author           = { "RxSwift Community" => "[email protected]" }
-  s.platform         = :ios, "9.0"
+  s.platform         = :ios, "14.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.ios.deployment_target = '14.0'
+  s.source_files          = 'Sources/RxGoogleMaps/*.swift'
 
   s.static_framework = true
   s.dependency 'RxSwift', '~> 6'
   s.dependency 'RxCocoa', '~> 6'
-  s.dependency 'GoogleMaps', '~> 3'
+  s.dependency 'GoogleMaps', '~> 7.3.0'
 end
diff --git a/RxGoogleMaps.xcodeproj/project.pbxproj b/RxGoogleMaps.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -181,8 +181,9 @@
 		A90F9C921DAAB67100A3461E /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1500;
 				ORGANIZATIONNAME = "Gen X Hippies Company";
 				TargetAttributes = {
 					090646D11EB8C350007F53BA = {
@@ -244,7 +245,8 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-resources.sh",
-				"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle",
+				"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.xcframework/ios-arm64/GoogleMaps.framework/Resources/GoogleMaps.bundle",
+				"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.xcframework/ios-arm64_x86_64-simulator/GoogleMaps.framework/Resources/GoogleMaps.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
@@ -326,10 +328,18 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = "RxGoogleMaps-iOS/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
+				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.oo-v.RxGoogleMaps";
 				PRODUCT_NAME = RxGoogleMaps;
 				SKIP_INSTALL = YES;
@@ -347,10 +357,18 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = "RxGoogleMaps-iOS/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
+				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.oo-v.RxGoogleMaps";
 				PRODUCT_NAME = RxGoogleMaps;
 				SKIP_INSTALL = YES;
@@ -382,6 +400,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -394,6 +413,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -408,7 +428,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -446,6 +466,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -458,6 +479,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -466,10 +488,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
@@ -484,9 +507,14 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				DEVELOPMENT_TEAM = H7VM6ZW9AJ;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = Example/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.oo-v.RxGoogleMaps.Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -498,9 +526,14 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				DEVELOPMENT_TEAM = H7VM6ZW9AJ;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = Example/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.oo-v.RxGoogleMaps.Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};

diff --git a/RxGoogleMaps.xcodeproj/xcshareddata/xcschemes/RxGoogleMaps-iOS.xcscheme b/RxGoogleMaps.xcodeproj/xcshareddata/xcschemes/RxGoogleMaps-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:RxGoogleMaps.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Sources/GMSCircle+Rx.swift → Sources/RxGoogleMaps/GMSCircle+Rx.swift b/Sources/GMSCircle+Rx.swift → Sources/RxGoogleMaps/GMSCircle+Rx.swift
diff --git a/Sources/GMSGroundOverlay+Rx.swift → ...es/RxGoogleMaps/GMSGroundOverlay+Rx.swift b/Sources/GMSGroundOverlay+Rx.swift → ...es/RxGoogleMaps/GMSGroundOverlay+Rx.swift
diff --git a/Sources/GMSMapView+Rx.swift → Sources/RxGoogleMaps/GMSMapView+Rx.swift b/Sources/GMSMapView+Rx.swift → Sources/RxGoogleMaps/GMSMapView+Rx.swift
diff --git a/Sources/GMSMapViewDelegateProxy.swift → ...xGoogleMaps/GMSMapViewDelegateProxy.swift b/Sources/GMSMapViewDelegateProxy.swift → ...xGoogleMaps/GMSMapViewDelegateProxy.swift
diff --git a/Sources/GMSMarker+Rx.swift → Sources/RxGoogleMaps/GMSMarker+Rx.swift b/Sources/GMSMarker+Rx.swift → Sources/RxGoogleMaps/GMSMarker+Rx.swift
diff --git a/Sources/GMSOverlay+Rx.swift → Sources/RxGoogleMaps/GMSOverlay+Rx.swift b/Sources/GMSOverlay+Rx.swift → Sources/RxGoogleMaps/GMSOverlay+Rx.swift
diff --git a/Sources/GMSPolygon+Rx.swift → Sources/RxGoogleMaps/GMSPolygon+Rx.swift b/Sources/GMSPolygon+Rx.swift → Sources/RxGoogleMaps/GMSPolygon+Rx.swift
diff --git a/Sources/GMSPolyline+Rx.swift → Sources/RxGoogleMaps/GMSPolyline+Rx.swift b/Sources/GMSPolyline+Rx.swift → Sources/RxGoogleMaps/GMSPolyline+Rx.swift