From 19f7ec7ce794cfb6b706783482b5331518e32f89 Mon Sep 17 00:00:00 2001 From: ShenYj Date: Thu, 24 Mar 2022 13:48:59 +0800 Subject: [PATCH 1/6] update Readme --- Readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Readme.md b/Readme.md index 4bedcbd..779511d 100644 --- a/Readme.md +++ b/Readme.md @@ -19,7 +19,7 @@ RxCoreLocation abstract the Rx behavior for Core Location ## Requirements -- iOS 9.0+ / Mac OS X 10.10+ / tvOS 9.0+ / watchOS 2.0+ +- iOS 11.0+ / Mac OS X 10.10+ / tvOS 9.0+ / watchOS 3.0+ - Xcode 9.1+ ## Installation @@ -36,7 +36,7 @@ To integrate RxCoreLocation into your Xcode project using CocoaPods, specify it ```ruby source 'https://github.com/CocoaPods/Specs.git' -platform :ios, '9.0' +platform :ios, '11.0' use_frameworks! pod 'RxCoreLocation', '~> 1.5.1' From ae70b53acad4baba43dc158c6f62b3a981503aa4 Mon Sep 17 00:00:00 2001 From: ShenYj Date: Sat, 26 Mar 2022 11:46:39 +0800 Subject: [PATCH 2/6] @available attribute is unnecessary for iOS target this attribute make some troubles, now is unnecessary in 1.5.1, troubles maybe fix --- Sources/RxKeyPaths.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/Sources/RxKeyPaths.swift b/Sources/RxKeyPaths.swift index 9c8f61d..254c02f 100644 --- a/Sources/RxKeyPaths.swift +++ b/Sources/RxKeyPaths.swift @@ -14,7 +14,6 @@ extension String { static let desiredAccuracy = #keyPath(CLLocationManager.desiredAccuracy) static let pausesLocationUpdatesAutomatically = #keyPath(CLLocationManager.pausesLocationUpdatesAutomatically) static let allowsBackgroundLocationUpdates = #keyPath(CLLocationManager.allowsBackgroundLocationUpdates) - @available(iOS 11.0, *) static let showsBackgroundLocationIndicator = #keyPath(CLLocationManager.showsBackgroundLocationIndicator) static let location = #keyPath(CLLocationManager.location) static let headingFilter = #keyPath(CLLocationManager.headingFilter) From 8dc177035328c709f35c4d206ed4ce1db50089a2 Mon Sep 17 00:00:00 2001 From: ShenYj Date: Sat, 26 Mar 2022 11:52:33 +0800 Subject: [PATCH 3/6] [fix up on macOS]: too many keyPaths are available on macOS 10.15 --- RxCoreLocation.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RxCoreLocation.podspec b/RxCoreLocation.podspec index 7bbff0f..2c49c0b 100644 --- a/RxCoreLocation.podspec +++ b/RxCoreLocation.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.authors = { "Obi Bob Godwin" => "bobgodwinx@gmail.com" } s.source = { :git => "https://github.com/RxSwiftCommunity/RxCoreLocation.git", :tag => s.version.to_s } s.ios.deployment_target = '11.0' - s.osx.deployment_target = '10.10' + s.osx.deployment_target = '10.15' s.watchos.deployment_target = '3.0' s.tvos.deployment_target = '9.0' s.requires_arc = true From 0f7518e35ead5314db7a49ea97b9225493683f9e Mon Sep 17 00:00:00 2001 From: ShenYj Date: Sat, 26 Mar 2022 11:54:38 +0800 Subject: [PATCH 4/6] update the way to config of swift-version --- .swift-version | 1 - RxCoreLocation.podspec | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 .swift-version diff --git a/.swift-version b/.swift-version deleted file mode 100644 index bf77d54..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -4.2 diff --git a/RxCoreLocation.podspec b/RxCoreLocation.podspec index 2c49c0b..5e5ef38 100644 --- a/RxCoreLocation.podspec +++ b/RxCoreLocation.podspec @@ -12,6 +12,7 @@ Pod::Spec.new do |s| s.watchos.deployment_target = '3.0' s.tvos.deployment_target = '9.0' s.requires_arc = true + s.swift_versions = ['5.0', '5.6'] s.default_subspec = "Core" s.subspec "Core" do |ss| From 0e0c28113462a06674b9dacda493e833f889b4ba Mon Sep 17 00:00:00 2001 From: ShenYj Date: Sat, 26 Mar 2022 11:56:42 +0800 Subject: [PATCH 5/6] update Readme: Mac OS X 10.15+ --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 779511d..3494d29 100644 --- a/Readme.md +++ b/Readme.md @@ -19,7 +19,7 @@ RxCoreLocation abstract the Rx behavior for Core Location ## Requirements -- iOS 11.0+ / Mac OS X 10.10+ / tvOS 9.0+ / watchOS 3.0+ +- iOS 11.0+ / Mac OS X 10.15+ / tvOS 9.0+ / watchOS 3.0+ - Xcode 9.1+ ## Installation From 0c8b113d977750084ac996abade185a0615be37b Mon Sep 17 00:00:00 2001 From: ShenYj Date: Sat, 26 Mar 2022 12:26:23 +0800 Subject: [PATCH 6/6] [fix lint errors]update watchOS target minimum version to 4.0 activityType and allowsBackgroundLocationUpdates can be used on 4.0 --- Readme.md | 2 +- RxCoreLocation.podspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Readme.md b/Readme.md index 3494d29..ea7e584 100644 --- a/Readme.md +++ b/Readme.md @@ -19,7 +19,7 @@ RxCoreLocation abstract the Rx behavior for Core Location ## Requirements -- iOS 11.0+ / Mac OS X 10.15+ / tvOS 9.0+ / watchOS 3.0+ +- iOS 11.0+ / Mac OS X 10.15+ / tvOS 9.0+ / watchOS 4.0+ - Xcode 9.1+ ## Installation diff --git a/RxCoreLocation.podspec b/RxCoreLocation.podspec index 5e5ef38..e899990 100644 --- a/RxCoreLocation.podspec +++ b/RxCoreLocation.podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/RxSwiftCommunity/RxCoreLocation.git", :tag => s.version.to_s } s.ios.deployment_target = '11.0' s.osx.deployment_target = '10.15' - s.watchos.deployment_target = '3.0' + s.watchos.deployment_target = '4.0' s.tvos.deployment_target = '9.0' s.requires_arc = true s.swift_versions = ['5.0', '5.6']