diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 0000000..904ea5f --- /dev/null +++ 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 new file mode 100644 index 0000000..a505f47 --- /dev/null +++ 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"]), + ] +) \ No newline at end of file diff --git a/Podfile b/Podfile index 3a5d510..92b1dee 100644 --- 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 diff --git a/Podfile.lock b/Podfile.lock index a59257f..24628fb 100644 --- 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: 549e4a1d4b3390c9b9853b0406f703800ccd4a0f -COCOAPODS: 1.8.4 +COCOAPODS: 1.12.1 diff --git a/RxGoogleMaps.podspec b/RxGoogleMaps.podspec index 49eb681..1977ff9 100644 --- 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" => "community@rxswift.org" } - 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 index b148c16..d164453 100644 --- 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,17 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; 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 +356,17 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; 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 +398,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 +411,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 +426,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 +464,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 +477,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 +486,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; @@ -486,7 +507,11 @@ DEVELOPMENT_TEAM = H7VM6ZW9AJ; 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)"; }; @@ -500,7 +525,11 @@ DEVELOPMENT_TEAM = H7VM6ZW9AJ; 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 index 8ca6e58..cf5b332 100644 --- a/RxGoogleMaps.xcodeproj/xcshareddata/xcschemes/RxGoogleMaps-iOS.xcscheme +++ b/RxGoogleMaps.xcodeproj/xcshareddata/xcschemes/RxGoogleMaps-iOS.xcscheme @@ -1,6 +1,6 @@ - - - -