From 48d7b127f9e318ab5e6784d98dcddd5353ccd6ed Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 3 Jan 2021 20:15:09 +0100 Subject: [PATCH 01/14] RxSwift 6.0.0 Update 1. Updated Cartfile 2. Updated Package.swift 3. Updated RxCoreLocation.podspec 4. Updated circle.yml --- Cartfile | 2 +- Cartfile.resolved | 3 +++ Package.swift | 2 +- RxCoreLocation.podspec | 6 +++--- circle.yml | 27 +++++++++++++++++---------- 5 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 Cartfile.resolved diff --git a/Cartfile b/Cartfile index ee48bc1..b974c62 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "ReactiveX/RxSwift" ~> 5.1.1 +github "ReactiveX/RxSwift" ~> 6.0.0 diff --git a/Cartfile.resolved b/Cartfile.resolved new file mode 100644 index 0000000..6e8c82c --- /dev/null +++ b/Cartfile.resolved @@ -0,0 +1,3 @@ +github "Quick/Nimble" "v9.0.0" +github "Quick/Quick" "v3.0.0" +github "ReactiveX/RxSwift" "6.0.0" diff --git a/Package.swift b/Package.swift index a14be6e..de5ed2f 100644 --- a/Package.swift +++ b/Package.swift @@ -15,7 +15,7 @@ let package = Package( .library(name: "RxCoreLocation", targets: ["RxCoreLocation"]) ], dependencies: [ - .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.1.1") + .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "6.0.0") ], targets: [ .target(name: "RxCoreLocation", dependencies: ["RxSwift", "RxCocoa"], path: "Sources") diff --git a/RxCoreLocation.podspec b/RxCoreLocation.podspec index ec4fec0..1386756 100644 --- a/RxCoreLocation.podspec +++ b/RxCoreLocation.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'RxCoreLocation' - s.version = '1.5.0' + s.version = '1.5.1' s.license = { :type => "MIT", :file => "LICENSE" } s.summary = 'RxCoreLocation abstract the Rx behavior for Core Location' s.homepage = 'http://github.com/RxSwiftCommunity/RxCoreLocation' @@ -17,8 +17,8 @@ Pod::Spec.new do |s| s.subspec "Core" do |ss| ss.source_files = "Sources/*.swift" ss.framework = "Foundation" - ss.dependency "RxSwift", "~> 5.1" - ss.dependency "RxCocoa", "~> 5.1" + ss.dependency "RxSwift", "~> 6.0" + ss.dependency "RxCocoa", "~> 6.0" end end diff --git a/circle.yml b/circle.yml index c837732..cb64e92 100644 --- a/circle.yml +++ b/circle.yml @@ -9,7 +9,7 @@ jobs: XCODE_TEST_REPORTS: /tmp/xcode-test-results LANG: en_US.UTF-8 macos: - xcode: '11.4.0' + xcode: '12.3.0' steps: - checkout - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS $XCODE_TEST_REPORTS @@ -20,7 +20,14 @@ jobs: - v1-dep- - run: name: Bootstrap Carthage - command: carthage update --no-use-binaries + command: > + set -euo pipefail + xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX) + trap 'rm -f "$xcconfig"' INT TERM HUP EXIT + echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig + echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig + export XCODE_XCCONFIG_FILE="$xcconfig" + carthage update --no-use-binaries - save_cache: key: v1-dep-{{ .Branch }}-{{ epoch }} paths: @@ -33,9 +40,9 @@ jobs: -scheme 'RxCoreLocation-iOS' -sdk iphonesimulator -destination "name=iPhone 11" | xcpretty -c --test - run: - name: Run Tests (Swift 5.1) + name: Run Tests (Swift 5.3) command: > - set -o pipefail && xcodebuild test SWIFT_VERSION=5.1 + set -o pipefail && xcodebuild test SWIFT_VERSION=5.3 -workspace RxCoreLocation.xcworkspace -scheme 'RxCoreLocation-iOS' -sdk iphonesimulator -destination "name=iPhone 11" | xcpretty -c --test @@ -47,9 +54,9 @@ jobs: -scheme RxCoreLocation-watchOS -sdk watchsimulator -destination "name=Apple Watch Series 5 - 44mm" | xcpretty -c - run: - name: Build watchOS (Swift 5.1) + name: Build watchOS (Swift 5.3) command: > - set -o pipefail && xcodebuild build SWIFT_VERSION=5.1 + set -o pipefail && xcodebuild build SWIFT_VERSION=5.3 -workspace RxCoreLocation.xcworkspace -scheme RxCoreLocation-watchOS -sdk watchsimulator -destination "name=Apple Watch Series 5 - 44mm" | xcpretty -c @@ -61,9 +68,9 @@ jobs: -scheme RxCoreLocation-macOS -sdk macosx -destination "arch=x86_64" | xcpretty -c - run: - name: Build macOS (Swift 5.1) + name: Build macOS (Swift 5.3) command: > - set -o pipefail && xcodebuild build SWIFT_VERSION=5.1 + set -o pipefail && xcodebuild build SWIFT_VERSION=5.3 -workspace RxCoreLocation.xcworkspace -scheme RxCoreLocation-macOS -sdk macosx -destination "arch=x86_64" | xcpretty -c @@ -75,9 +82,9 @@ jobs: -scheme RxCoreLocation-tvOS -sdk appletvsimulator -destination "name=Apple TV 4K (at 1080p)" | xcpretty -c - run: - name: Build tvOS (Swift 5.1) + name: Build tvOS (Swift 5.3) command: > - set -o pipefail && xcodebuild build SWIFT_VERSION=5.1 + set -o pipefail && xcodebuild build SWIFT_VERSION=5.3 -workspace RxCoreLocation.xcworkspace -scheme RxCoreLocation-tvOS -sdk appletvsimulator -destination "name=Apple TV 4K (at 1080p)" | xcpretty -c From 2f765511d117241fa544744fa183712139990aeb Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 3 Jan 2021 20:20:02 +0100 Subject: [PATCH 02/14] Updated Readme.md --- Readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Readme.md b/Readme.md index ad95720..4bedcbd 100644 --- a/Readme.md +++ b/Readme.md @@ -39,7 +39,7 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, '9.0' use_frameworks! -pod 'RxCoreLocation', '~> 1.4' +pod 'RxCoreLocation', '~> 1.5.1' ``` Then, run the following command: @@ -62,7 +62,7 @@ $ brew install carthage To integrate RxCoreLocation into your Xcode project using Carthage, specify it in your `Cartfile`: ```ogdl -github "RxSwiftCommunity/RxCoreLocation" ~> 1.4 +github "RxSwiftCommunity/RxCoreLocation" ~> 1.5.1 ``` ### Swift Package Manager @@ -74,7 +74,7 @@ import PackageDescription let package = Package( name: "HelloRxCoreLocation", dependencies: [ - .Package(url: "https://github.com/RxSwiftCommunity/RxCoreLocation.git", "1.4") + .Package(url: "https://github.com/RxSwiftCommunity/RxCoreLocation.git", "1.5.1") ] ) ``` From e23028f4687839644ce47389916a967b2311d04b Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 3 Jan 2021 21:28:02 +0100 Subject: [PATCH 03/14] Updated project setting. --- RxCoreLocation.xcodeproj/project.pbxproj | 184 ++++++++++++------ .../project.pbxproj | 8 - 2 files changed, 120 insertions(+), 72 deletions(-) diff --git a/RxCoreLocation.xcodeproj/project.pbxproj b/RxCoreLocation.xcodeproj/project.pbxproj index 8efcaa3..0762e0d 100644 --- a/RxCoreLocation.xcodeproj/project.pbxproj +++ b/RxCoreLocation.xcodeproj/project.pbxproj @@ -13,27 +13,44 @@ 3549BB531DA38A2200C63030 /* RxCoreLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 3549BB181DA3890B00C63030 /* RxCoreLocation.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3549BB661DA38ADB00C63030 /* RxCoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3549BB211DA389CD00C63030 /* RxCoreLocation.framework */; }; 3549BB8B1DA38C0A00C63030 /* RxCoreLocationSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3549BB8A1DA38C0A00C63030 /* RxCoreLocationSpec.swift */; }; - 35B7422F1F82A5E000829B21 /* Nimble.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 35B7422D1F82A5DF00829B21 /* Nimble.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 35B742301F82A5E000829B21 /* Quick.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 35B7422E1F82A5E000829B21 /* Quick.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 35B742311F82A5EC00829B21 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35B7422D1F82A5DF00829B21 /* Nimble.framework */; }; - 35B742321F82A5EC00829B21 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35B7422E1F82A5E000829B21 /* Quick.framework */; }; A85013AF204F093C00094A90 /* RxKeyPaths.swift in Sources */ = {isa = PBXBuildFile; fileRef = A85013AE204F093C00094A90 /* RxKeyPaths.swift */; }; A85013B0204F174100094A90 /* RxKeyPaths.swift in Sources */ = {isa = PBXBuildFile; fileRef = A85013AE204F093C00094A90 /* RxKeyPaths.swift */; }; A85013B1204F174100094A90 /* RxKeyPaths.swift in Sources */ = {isa = PBXBuildFile; fileRef = A85013AE204F093C00094A90 /* RxKeyPaths.swift */; }; A85013B2204F174200094A90 /* RxKeyPaths.swift in Sources */ = {isa = PBXBuildFile; fileRef = A85013AE204F093C00094A90 /* RxKeyPaths.swift */; }; C44FC2861FB59E150051CCA2 /* ForwardsEventsBehavior.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44FC2851FB59E150051CCA2 /* ForwardsEventsBehavior.swift */; }; C44FC28A1FB59FC00051CCA2 /* HasEventsBehavior.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44FC2891FB59FC00051CCA2 /* HasEventsBehavior.swift */; }; - C48D554A1FA4FBD400FF1BF0 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C48D55481FA4FBD300FF1BF0 /* RxCocoa.framework */; }; - C48D554B1FA4FBD400FF1BF0 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C48D55491FA4FBD400FF1BF0 /* RxSwift.framework */; }; - C48D554E1FA4FBEB00FF1BF0 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C48D554C1FA4FBEB00FF1BF0 /* RxCocoa.framework */; }; - C48D554F1FA4FBEB00FF1BF0 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C48D554D1FA4FBEB00FF1BF0 /* RxSwift.framework */; }; - C48D55521FA4FC0500FF1BF0 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C48D55501FA4FC0500FF1BF0 /* RxCocoa.framework */; }; - C48D55531FA4FC0500FF1BF0 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C48D55511FA4FC0500FF1BF0 /* RxSwift.framework */; }; - C48D55561FA4FC1B00FF1BF0 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C48D55541FA4FC1B00FF1BF0 /* RxSwift.framework */; }; - C48D55571FA4FC1B00FF1BF0 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C48D55551FA4FC1B00FF1BF0 /* RxCocoa.framework */; }; - C48D556E1FA4FFAD00FF1BF0 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C48D55481FA4FBD300FF1BF0 /* RxCocoa.framework */; }; - C48D556F1FA4FFAD00FF1BF0 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C48D55491FA4FBD400FF1BF0 /* RxSwift.framework */; }; - C48D55711FA4FFAD00FF1BF0 /* RxTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C48D55701FA4FFAD00FF1BF0 /* RxTest.framework */; }; + C4A5FBBB25A25E4100B9A09D /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB425A25E4000B9A09D /* RxSwift.framework */; }; + C4A5FBBC25A25E4100B9A09D /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB425A25E4000B9A09D /* RxSwift.framework */; }; + C4A5FBBD25A25E4100B9A09D /* RxBlocking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB525A25E4000B9A09D /* RxBlocking.framework */; }; + C4A5FBBE25A25E4100B9A09D /* RxBlocking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB525A25E4000B9A09D /* RxBlocking.framework */; }; + C4A5FBBF25A25E4100B9A09D /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB625A25E4000B9A09D /* Quick.framework */; }; + C4A5FBC025A25E4100B9A09D /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB625A25E4000B9A09D /* Quick.framework */; }; + C4A5FBC125A25E4100B9A09D /* RxTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB725A25E4000B9A09D /* RxTest.framework */; }; + C4A5FBC225A25E4100B9A09D /* RxTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB725A25E4000B9A09D /* RxTest.framework */; }; + C4A5FBC325A25E4100B9A09D /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB825A25E4000B9A09D /* RxCocoa.framework */; }; + C4A5FBC425A25E4100B9A09D /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB825A25E4000B9A09D /* RxCocoa.framework */; }; + C4A5FBC525A25E4100B9A09D /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB925A25E4000B9A09D /* Nimble.framework */; }; + C4A5FBC625A25E4100B9A09D /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB925A25E4000B9A09D /* Nimble.framework */; }; + C4A5FBC725A25E4100B9A09D /* RxRelay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBBA25A25E4100B9A09D /* RxRelay.framework */; }; + C4A5FBC825A25E4100B9A09D /* RxRelay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBBA25A25E4100B9A09D /* RxRelay.framework */; }; + C4A5FBDC25A25E8800B9A09D /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBD525A25E8700B9A09D /* Nimble.framework */; }; + C4A5FBDD25A25E8800B9A09D /* RxTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBD625A25E8700B9A09D /* RxTest.framework */; }; + C4A5FBDE25A25E8800B9A09D /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBD725A25E8700B9A09D /* RxCocoa.framework */; }; + C4A5FBDF25A25E8800B9A09D /* RxBlocking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBD825A25E8700B9A09D /* RxBlocking.framework */; }; + C4A5FBE025A25E8800B9A09D /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBD925A25E8700B9A09D /* Quick.framework */; }; + C4A5FBE125A25E8800B9A09D /* RxRelay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBDA25A25E8800B9A09D /* RxRelay.framework */; }; + C4A5FBE225A25E8800B9A09D /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBDB25A25E8800B9A09D /* RxSwift.framework */; }; + C4A5FBEE25A25EE100B9A09D /* RxBlocking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBE725A25EE000B9A09D /* RxBlocking.framework */; }; + C4A5FBEF25A25EE100B9A09D /* RxRelay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBE825A25EE000B9A09D /* RxRelay.framework */; }; + C4A5FBF025A25EE100B9A09D /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBE925A25EE000B9A09D /* Nimble.framework */; }; + C4A5FBF125A25EE100B9A09D /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBEA25A25EE000B9A09D /* RxSwift.framework */; }; + C4A5FBF225A25EE100B9A09D /* RxTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBEB25A25EE000B9A09D /* RxTest.framework */; }; + C4A5FBF325A25EE100B9A09D /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBEC25A25EE000B9A09D /* Quick.framework */; }; + C4A5FBF425A25EE100B9A09D /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBED25A25EE000B9A09D /* RxCocoa.framework */; }; + C4A5FBF925A25F2100B9A09D /* RxBlocking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBF525A25F2000B9A09D /* RxBlocking.framework */; }; + C4A5FBFA25A25F2100B9A09D /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBF625A25F2000B9A09D /* RxSwift.framework */; }; + C4A5FBFB25A25F2100B9A09D /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBF725A25F2000B9A09D /* RxCocoa.framework */; }; + C4A5FBFC25A25F2100B9A09D /* RxRelay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBF825A25F2000B9A09D /* RxRelay.framework */; }; C4B87A8E1FB476EC00E250BD /* RxTest+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B87A8D1FB476EC00E250BD /* RxTest+Extension.swift */; }; C4B8B1FC1FA50C1E005E0A69 /* RxSelectors.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B8B1FB1FA50C1E005E0A69 /* RxSelectors.swift */; }; C4B8B1FD1FA50C1E005E0A69 /* RxSelectors.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B8B1FB1FA50C1E005E0A69 /* RxSelectors.swift */; }; @@ -78,8 +95,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 35B7422F1F82A5E000829B21 /* Nimble.framework in Embed Frameworks */, - 35B742301F82A5E000829B21 /* Quick.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -98,26 +113,34 @@ 3549BB581DA38A8800C63030 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 3549BB611DA38ADB00C63030 /* RxCoreLocationTests-iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "RxCoreLocationTests-iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 3549BB8A1DA38C0A00C63030 /* RxCoreLocationSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxCoreLocationSpec.swift; sourceTree = ""; }; - 354AD5841F8A659800B18FAE /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quick.framework; path = Carthage/Build/tvOS/Quick.framework; sourceTree = ""; }; - 354AD5851F8A659800B18FAE /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = Carthage/Build/tvOS/Nimble.framework; sourceTree = ""; }; - 35B7422D1F82A5DF00829B21 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = Carthage/Build/iOS/Nimble.framework; sourceTree = ""; }; - 35B7422E1F82A5E000829B21 /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quick.framework; path = Carthage/Build/iOS/Quick.framework; sourceTree = ""; }; - 35B742341F82A61D00829B21 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = Carthage/Build/Mac/Nimble.framework; sourceTree = ""; }; - 35B742351F82A61E00829B21 /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quick.framework; path = Carthage/Build/Mac/Quick.framework; sourceTree = ""; }; A85013AE204F093C00094A90 /* RxKeyPaths.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxKeyPaths.swift; sourceTree = ""; }; C44FC2851FB59E150051CCA2 /* ForwardsEventsBehavior.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ForwardsEventsBehavior.swift; sourceTree = ""; }; C44FC2891FB59FC00051CCA2 /* HasEventsBehavior.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HasEventsBehavior.swift; sourceTree = ""; }; - C48D55481FA4FBD300FF1BF0 /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/iOS/RxCocoa.framework; sourceTree = ""; }; - C48D55491FA4FBD400FF1BF0 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = ""; }; - C48D554C1FA4FBEB00FF1BF0 /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/Mac/RxCocoa.framework; sourceTree = ""; }; - C48D554D1FA4FBEB00FF1BF0 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/Mac/RxSwift.framework; sourceTree = ""; }; - C48D55501FA4FC0500FF1BF0 /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/tvOS/RxCocoa.framework; sourceTree = ""; }; - C48D55511FA4FC0500FF1BF0 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/tvOS/RxSwift.framework; sourceTree = ""; }; - C48D55541FA4FC1B00FF1BF0 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/watchOS/RxSwift.framework; sourceTree = ""; }; - C48D55551FA4FC1B00FF1BF0 /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/watchOS/RxCocoa.framework; sourceTree = ""; }; - C48D55701FA4FFAD00FF1BF0 /* RxTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxTest.framework; path = Carthage/Build/iOS/RxTest.framework; sourceTree = ""; }; - C48D55741FA5000C00FF1BF0 /* RxTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxTest.framework; path = Carthage/Build/Mac/RxTest.framework; sourceTree = ""; }; - C48D55781FA5003000FF1BF0 /* RxTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxTest.framework; path = Carthage/Build/tvOS/RxTest.framework; sourceTree = ""; }; + C4A5FBB425A25E4000B9A09D /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = ""; }; + C4A5FBB525A25E4000B9A09D /* RxBlocking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxBlocking.framework; path = Carthage/Build/iOS/RxBlocking.framework; sourceTree = ""; }; + C4A5FBB625A25E4000B9A09D /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quick.framework; path = Carthage/Build/iOS/Quick.framework; sourceTree = ""; }; + C4A5FBB725A25E4000B9A09D /* RxTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxTest.framework; path = Carthage/Build/iOS/RxTest.framework; sourceTree = ""; }; + C4A5FBB825A25E4000B9A09D /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/iOS/RxCocoa.framework; sourceTree = ""; }; + C4A5FBB925A25E4000B9A09D /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = Carthage/Build/iOS/Nimble.framework; sourceTree = ""; }; + C4A5FBBA25A25E4100B9A09D /* RxRelay.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxRelay.framework; path = Carthage/Build/iOS/RxRelay.framework; sourceTree = ""; }; + C4A5FBD525A25E8700B9A09D /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = Carthage/Build/Mac/Nimble.framework; sourceTree = ""; }; + C4A5FBD625A25E8700B9A09D /* RxTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxTest.framework; path = Carthage/Build/Mac/RxTest.framework; sourceTree = ""; }; + C4A5FBD725A25E8700B9A09D /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/Mac/RxCocoa.framework; sourceTree = ""; }; + C4A5FBD825A25E8700B9A09D /* RxBlocking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxBlocking.framework; path = Carthage/Build/Mac/RxBlocking.framework; sourceTree = ""; }; + C4A5FBD925A25E8700B9A09D /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quick.framework; path = Carthage/Build/Mac/Quick.framework; sourceTree = ""; }; + C4A5FBDA25A25E8800B9A09D /* RxRelay.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxRelay.framework; path = Carthage/Build/Mac/RxRelay.framework; sourceTree = ""; }; + C4A5FBDB25A25E8800B9A09D /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/Mac/RxSwift.framework; sourceTree = ""; }; + C4A5FBE725A25EE000B9A09D /* RxBlocking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxBlocking.framework; path = Carthage/Build/tvOS/RxBlocking.framework; sourceTree = ""; }; + C4A5FBE825A25EE000B9A09D /* RxRelay.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxRelay.framework; path = Carthage/Build/tvOS/RxRelay.framework; sourceTree = ""; }; + C4A5FBE925A25EE000B9A09D /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = Carthage/Build/tvOS/Nimble.framework; sourceTree = ""; }; + C4A5FBEA25A25EE000B9A09D /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/tvOS/RxSwift.framework; sourceTree = ""; }; + C4A5FBEB25A25EE000B9A09D /* RxTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxTest.framework; path = Carthage/Build/tvOS/RxTest.framework; sourceTree = ""; }; + C4A5FBEC25A25EE000B9A09D /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quick.framework; path = Carthage/Build/tvOS/Quick.framework; sourceTree = ""; }; + C4A5FBED25A25EE000B9A09D /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/tvOS/RxCocoa.framework; sourceTree = ""; }; + C4A5FBF525A25F2000B9A09D /* RxBlocking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxBlocking.framework; path = Carthage/Build/watchOS/RxBlocking.framework; sourceTree = ""; }; + C4A5FBF625A25F2000B9A09D /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/watchOS/RxSwift.framework; sourceTree = ""; }; + C4A5FBF725A25F2000B9A09D /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/watchOS/RxCocoa.framework; sourceTree = ""; }; + C4A5FBF825A25F2000B9A09D /* RxRelay.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxRelay.framework; path = Carthage/Build/watchOS/RxRelay.framework; sourceTree = ""; }; C4B87A8D1FB476EC00E250BD /* RxTest+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RxTest+Extension.swift"; sourceTree = ""; }; C4B8B1FB1FA50C1E005E0A69 /* RxSelectors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxSelectors.swift; sourceTree = ""; }; C4B8B2001FA5C9D0005E0A69 /* RxEventTypealias.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxEventTypealias.swift; sourceTree = ""; }; @@ -132,8 +155,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C48D554A1FA4FBD400FF1BF0 /* RxCocoa.framework in Frameworks */, - C48D554B1FA4FBD400FF1BF0 /* RxSwift.framework in Frameworks */, + C4A5FBBB25A25E4100B9A09D /* RxSwift.framework in Frameworks */, + C4A5FBBD25A25E4100B9A09D /* RxBlocking.framework in Frameworks */, + C4A5FBC125A25E4100B9A09D /* RxTest.framework in Frameworks */, + C4A5FBC525A25E4100B9A09D /* Nimble.framework in Frameworks */, + C4A5FBC725A25E4100B9A09D /* RxRelay.framework in Frameworks */, + C4A5FBC325A25E4100B9A09D /* RxCocoa.framework in Frameworks */, + C4A5FBBF25A25E4100B9A09D /* Quick.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -141,8 +169,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C48D55561FA4FC1B00FF1BF0 /* RxSwift.framework in Frameworks */, - C48D55571FA4FC1B00FF1BF0 /* RxCocoa.framework in Frameworks */, + C4A5FBFC25A25F2100B9A09D /* RxRelay.framework in Frameworks */, + C4A5FBFB25A25F2100B9A09D /* RxCocoa.framework in Frameworks */, + C4A5FBFA25A25F2100B9A09D /* RxSwift.framework in Frameworks */, + C4A5FBF925A25F2100B9A09D /* RxBlocking.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -150,8 +180,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C48D554E1FA4FBEB00FF1BF0 /* RxCocoa.framework in Frameworks */, - C48D554F1FA4FBEB00FF1BF0 /* RxSwift.framework in Frameworks */, + C4A5FBDE25A25E8800B9A09D /* RxCocoa.framework in Frameworks */, + C4A5FBDD25A25E8800B9A09D /* RxTest.framework in Frameworks */, + C4A5FBE225A25E8800B9A09D /* RxSwift.framework in Frameworks */, + C4A5FBE125A25E8800B9A09D /* RxRelay.framework in Frameworks */, + C4A5FBDC25A25E8800B9A09D /* Nimble.framework in Frameworks */, + C4A5FBE025A25E8800B9A09D /* Quick.framework in Frameworks */, + C4A5FBDF25A25E8800B9A09D /* RxBlocking.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -159,8 +194,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C48D55521FA4FC0500FF1BF0 /* RxCocoa.framework in Frameworks */, - C48D55531FA4FC0500FF1BF0 /* RxSwift.framework in Frameworks */, + C4A5FBF125A25EE100B9A09D /* RxSwift.framework in Frameworks */, + C4A5FBF025A25EE100B9A09D /* Nimble.framework in Frameworks */, + C4A5FBF425A25EE100B9A09D /* RxCocoa.framework in Frameworks */, + C4A5FBF325A25EE100B9A09D /* Quick.framework in Frameworks */, + C4A5FBEF25A25EE100B9A09D /* RxRelay.framework in Frameworks */, + C4A5FBF225A25EE100B9A09D /* RxTest.framework in Frameworks */, + C4A5FBEE25A25EE100B9A09D /* RxBlocking.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -168,12 +208,14 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C48D55711FA4FFAD00FF1BF0 /* RxTest.framework in Frameworks */, - C48D556E1FA4FFAD00FF1BF0 /* RxCocoa.framework in Frameworks */, - C48D556F1FA4FFAD00FF1BF0 /* RxSwift.framework in Frameworks */, - 35B742311F82A5EC00829B21 /* Nimble.framework in Frameworks */, - 35B742321F82A5EC00829B21 /* Quick.framework in Frameworks */, + C4A5FBC425A25E4100B9A09D /* RxCocoa.framework in Frameworks */, + C4A5FBC025A25E4100B9A09D /* Quick.framework in Frameworks */, + C4A5FBBC25A25E4100B9A09D /* RxSwift.framework in Frameworks */, 3549BB661DA38ADB00C63030 /* RxCoreLocation.framework in Frameworks */, + C4A5FBC825A25E4100B9A09D /* RxRelay.framework in Frameworks */, + C4A5FBC225A25E4100B9A09D /* RxTest.framework in Frameworks */, + C4A5FBBE25A25E4100B9A09D /* RxBlocking.framework in Frameworks */, + C4A5FBC625A25E4100B9A09D /* Nimble.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -259,23 +301,31 @@ 357D954B1DA3F2B400AEC55F /* Frameworks */ = { isa = PBXGroup; children = ( - C48D55701FA4FFAD00FF1BF0 /* RxTest.framework */, - C48D55741FA5000C00FF1BF0 /* RxTest.framework */, - C48D55781FA5003000FF1BF0 /* RxTest.framework */, - C48D55481FA4FBD300FF1BF0 /* RxCocoa.framework */, - C48D55551FA4FC1B00FF1BF0 /* RxCocoa.framework */, - C48D55491FA4FBD400FF1BF0 /* RxSwift.framework */, - C48D554C1FA4FBEB00FF1BF0 /* RxCocoa.framework */, - C48D554D1FA4FBEB00FF1BF0 /* RxSwift.framework */, - C48D55501FA4FC0500FF1BF0 /* RxCocoa.framework */, - C48D55511FA4FC0500FF1BF0 /* RxSwift.framework */, - C48D55541FA4FC1B00FF1BF0 /* RxSwift.framework */, - 35B742341F82A61D00829B21 /* Nimble.framework */, - 35B742351F82A61E00829B21 /* Quick.framework */, - 35B7422D1F82A5DF00829B21 /* Nimble.framework */, - 35B7422E1F82A5E000829B21 /* Quick.framework */, - 354AD5851F8A659800B18FAE /* Nimble.framework */, - 354AD5841F8A659800B18FAE /* Quick.framework */, + C4A5FBE925A25EE000B9A09D /* Nimble.framework */, + C4A5FBEC25A25EE000B9A09D /* Quick.framework */, + C4A5FBE725A25EE000B9A09D /* RxBlocking.framework */, + C4A5FBF725A25F2000B9A09D /* RxCocoa.framework */, + C4A5FBF825A25F2000B9A09D /* RxRelay.framework */, + C4A5FBF625A25F2000B9A09D /* RxSwift.framework */, + C4A5FBED25A25EE000B9A09D /* RxCocoa.framework */, + C4A5FBE825A25EE000B9A09D /* RxRelay.framework */, + C4A5FBEA25A25EE000B9A09D /* RxSwift.framework */, + C4A5FBEB25A25EE000B9A09D /* RxTest.framework */, + C4A5FBF525A25F2000B9A09D /* RxBlocking.framework */, + C4A5FBD525A25E8700B9A09D /* Nimble.framework */, + C4A5FBD925A25E8700B9A09D /* Quick.framework */, + C4A5FBD825A25E8700B9A09D /* RxBlocking.framework */, + C4A5FBD725A25E8700B9A09D /* RxCocoa.framework */, + C4A5FBDA25A25E8800B9A09D /* RxRelay.framework */, + C4A5FBDB25A25E8800B9A09D /* RxSwift.framework */, + C4A5FBD625A25E8700B9A09D /* RxTest.framework */, + C4A5FBB925A25E4000B9A09D /* Nimble.framework */, + C4A5FBB625A25E4000B9A09D /* Quick.framework */, + C4A5FBB525A25E4000B9A09D /* RxBlocking.framework */, + C4A5FBB825A25E4000B9A09D /* RxCocoa.framework */, + C4A5FBBA25A25E4100B9A09D /* RxRelay.framework */, + C4A5FBB425A25E4000B9A09D /* RxSwift.framework */, + C4A5FBB725A25E4000B9A09D /* RxTest.framework */, ); name = Frameworks; sourceTree = ""; @@ -768,6 +818,7 @@ FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/watchOS", + "$(PROJECT_DIR)/Carthage/Build/iOS", ); INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -796,6 +847,7 @@ FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/watchOS", + "$(PROJECT_DIR)/Carthage/Build/iOS", ); INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -822,6 +874,7 @@ FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/Mac", + "$(PROJECT_DIR)/Carthage/Build/iOS", ); FRAMEWORK_VERSION = A; INFOPLIST_FILE = Sources/Info.plist; @@ -849,6 +902,7 @@ FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/Mac", + "$(PROJECT_DIR)/Carthage/Build/iOS", ); FRAMEWORK_VERSION = A; INFOPLIST_FILE = Sources/Info.plist; @@ -875,6 +929,7 @@ FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/tvOS", + "$(PROJECT_DIR)/Carthage/Build/iOS", ); INFOPLIST_FILE = "Sources/Info-tvOS.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -902,6 +957,7 @@ FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/tvOS", + "$(PROJECT_DIR)/Carthage/Build/iOS", ); INFOPLIST_FILE = "Sources/Info-tvOS.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; diff --git a/RxCoreLocationExample.xcodeproj/project.pbxproj b/RxCoreLocationExample.xcodeproj/project.pbxproj index 06831a6..d6e67c9 100644 --- a/RxCoreLocationExample.xcodeproj/project.pbxproj +++ b/RxCoreLocationExample.xcodeproj/project.pbxproj @@ -7,10 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - C41E94981FC4388400815E71 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41E94951FC4380F00815E71 /* RxSwift.framework */; }; - C41E94991FC4388400815E71 /* RxSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C41E94951FC4380F00815E71 /* RxSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - C41E949A1FC4388A00815E71 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C41E94941FC4380F00815E71 /* RxCocoa.framework */; }; - C41E949B1FC4388A00815E71 /* RxCocoa.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C41E94941FC4380F00815E71 /* RxCocoa.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; C47207A01FB8ED5400197310 /* berlin.gpx in Resources */ = {isa = PBXBuildFile; fileRef = C472079F1FB8ED5400197310 /* berlin.gpx */; }; C4A8A3EA1FB5B4F600356A42 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A8A3E91FB5B4F600356A42 /* AppDelegate.swift */; }; C4A8A3EC1FB5B4F600356A42 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A8A3EB1FB5B4F600356A42 /* ViewController.swift */; }; @@ -29,8 +25,6 @@ dstSubfolderSpec = 10; files = ( C4BADF221FC4D8B800847618 /* RxCoreLocation.framework in Embed Frameworks */, - C41E949B1FC4388A00815E71 /* RxCocoa.framework in Embed Frameworks */, - C41E94991FC4388400815E71 /* RxSwift.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -60,8 +54,6 @@ buildActionMask = 2147483647; files = ( C4BADF211FC4D8B800847618 /* RxCoreLocation.framework in Frameworks */, - C41E949A1FC4388A00815E71 /* RxCocoa.framework in Frameworks */, - C41E94981FC4388400815E71 /* RxSwift.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; From bf1b956dc6267b8dd41779fc237062b352f5e889 Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 3 Jan 2021 21:40:49 +0100 Subject: [PATCH 04/14] Updated Cicle.yml to 2.1 --- circle.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/circle.yml b/circle.yml index cb64e92..6d3357d 100644 --- a/circle.yml +++ b/circle.yml @@ -21,13 +21,7 @@ jobs: - run: name: Bootstrap Carthage command: > - set -euo pipefail - xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX) - trap 'rm -f "$xcconfig"' INT TERM HUP EXIT - echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig - echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig - export XCODE_XCCONFIG_FILE="$xcconfig" - carthage update --no-use-binaries + carthage update --no-use-binaries - save_cache: key: v1-dep-{{ .Branch }}-{{ epoch }} paths: @@ -91,7 +85,7 @@ jobs: - store_artifacts: path: /tmp/xcode-test-results workflows: - version: 2 + version: 2.1 build: jobs: - "RxCoreLocation Tests": From 5d99aef38008ad2bd3da02a4a91d75b19eed77e5 Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 3 Jan 2021 21:47:39 +0100 Subject: [PATCH 05/14] Updated Carthage bootstrap settings --- circle.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index 6d3357d..099c98f 100644 --- a/circle.yml +++ b/circle.yml @@ -20,8 +20,7 @@ jobs: - v1-dep- - run: name: Bootstrap Carthage - command: > - carthage update --no-use-binaries + command: carthage update --no-use-binaries - save_cache: key: v1-dep-{{ .Branch }}-{{ epoch }} paths: @@ -85,7 +84,7 @@ jobs: - store_artifacts: path: /tmp/xcode-test-results workflows: - version: 2.1 + version: 2 build: jobs: - "RxCoreLocation Tests": From 52b77b3881c537e8e993fbfa2dbe065be8cb81a6 Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 3 Jan 2021 21:59:26 +0100 Subject: [PATCH 06/14] Added tmp XCODE_XCCONFIG_FILE --- circle.yml | 3 +++ tmp.xcconfig | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 tmp.xcconfig diff --git a/circle.yml b/circle.yml index 099c98f..532aceb 100644 --- a/circle.yml +++ b/circle.yml @@ -18,6 +18,9 @@ jobs: - v1-dep-{{ .Branch }}- - v1-dep-master- - v1-dep- + - run: + name: export XCODE_XCCONFIG_FILE + command: export XCODE_XCCONFIG_FILE=$PWD/tmp.xcconfig - run: name: Bootstrap Carthage command: carthage update --no-use-binaries diff --git a/tmp.xcconfig b/tmp.xcconfig new file mode 100644 index 0000000..5f89f79 --- /dev/null +++ b/tmp.xcconfig @@ -0,0 +1,2 @@ +EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64=arm64 arm64e armv7 armv7s armv6 armv8 +EXCLUDED_ARCHS=$(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)) From 8559bf6677cb71a511fb68cf17b6b5a4889230fd Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 3 Jan 2021 22:40:14 +0100 Subject: [PATCH 07/14] Configured circle.yml to use xcode 11.4.0 --- circle.yml | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/circle.yml b/circle.yml index 532aceb..07f5c93 100644 --- a/circle.yml +++ b/circle.yml @@ -9,7 +9,7 @@ jobs: XCODE_TEST_REPORTS: /tmp/xcode-test-results LANG: en_US.UTF-8 macos: - xcode: '12.3.0' + xcode: '11.4.0' steps: - checkout - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS $XCODE_TEST_REPORTS @@ -18,9 +18,6 @@ jobs: - v1-dep-{{ .Branch }}- - v1-dep-master- - v1-dep- - - run: - name: export XCODE_XCCONFIG_FILE - command: export XCODE_XCCONFIG_FILE=$PWD/tmp.xcconfig - run: name: Bootstrap Carthage command: carthage update --no-use-binaries @@ -35,13 +32,6 @@ jobs: -workspace RxCoreLocation.xcworkspace -scheme 'RxCoreLocation-iOS' -sdk iphonesimulator -destination "name=iPhone 11" | xcpretty -c --test - - run: - name: Run Tests (Swift 5.3) - command: > - set -o pipefail && xcodebuild test SWIFT_VERSION=5.3 - -workspace RxCoreLocation.xcworkspace - -scheme 'RxCoreLocation-iOS' -sdk iphonesimulator - -destination "name=iPhone 11" | xcpretty -c --test - run: name: Build watchOS (Swift 5.2) command: > @@ -49,13 +39,6 @@ jobs: -workspace RxCoreLocation.xcworkspace -scheme RxCoreLocation-watchOS -sdk watchsimulator -destination "name=Apple Watch Series 5 - 44mm" | xcpretty -c - - run: - name: Build watchOS (Swift 5.3) - command: > - set -o pipefail && xcodebuild build SWIFT_VERSION=5.3 - -workspace RxCoreLocation.xcworkspace - -scheme RxCoreLocation-watchOS -sdk watchsimulator - -destination "name=Apple Watch Series 5 - 44mm" | xcpretty -c - run: name: Build macOS (Swift 5.2) command: > @@ -63,13 +46,6 @@ jobs: -workspace RxCoreLocation.xcworkspace -scheme RxCoreLocation-macOS -sdk macosx -destination "arch=x86_64" | xcpretty -c - - run: - name: Build macOS (Swift 5.3) - command: > - set -o pipefail && xcodebuild build SWIFT_VERSION=5.3 - -workspace RxCoreLocation.xcworkspace - -scheme RxCoreLocation-macOS -sdk macosx - -destination "arch=x86_64" | xcpretty -c - run: name: Build tvOS (Swift 5.2) command: > @@ -77,13 +53,6 @@ jobs: -workspace RxCoreLocation.xcworkspace -scheme RxCoreLocation-tvOS -sdk appletvsimulator -destination "name=Apple TV 4K (at 1080p)" | xcpretty -c - - run: - name: Build tvOS (Swift 5.3) - command: > - set -o pipefail && xcodebuild build SWIFT_VERSION=5.3 - -workspace RxCoreLocation.xcworkspace - -scheme RxCoreLocation-tvOS -sdk appletvsimulator - -destination "name=Apple TV 4K (at 1080p)" | xcpretty -c - store_artifacts: path: /tmp/xcode-test-results workflows: From c61dd3029b366c426ed95bddcdcc9fab4bd8abf6 Mon Sep 17 00:00:00 2001 From: Bob Date: Tue, 23 Feb 2021 17:57:23 +0100 Subject: [PATCH 08/14] Initial introduction of didLocationManagerDidChangeAuthorization Added selector to map CLLocationManagerDelegate.locationManagerDidChangeAuthorization delegate method --- Sources/RxSelectors.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Sources/RxSelectors.swift b/Sources/RxSelectors.swift index b572f16..be31042 100644 --- a/Sources/RxSelectors.swift +++ b/Sources/RxSelectors.swift @@ -9,6 +9,8 @@ import CoreLocation.CLLocationManagerDelegate extension Selector { + @available(iOS 14.0, OSX 14.0, watchOSApplicationExtension 7.0, tvOS 14.0, *) + static let didLocationManagerDidChangeAuthorization = #selector(CLLocationManagerDelegate.locationManagerDidChangeAuthorization(_:)) static let didChangeAuthorization = #selector(CLLocationManagerDelegate.locationManager(_:didChangeAuthorization:)) static let didUpdateLocations = #selector(CLLocationManagerDelegate.locationManager(_:didUpdateLocations:)) static let didFailWithError = #selector(CLLocationManagerDelegate.locationManager(_:didFailWithError:)) From 6d37ec2c3a46c1eb05f2f7b0abacc71b368e4590 Mon Sep 17 00:00:00 2001 From: Bob Date: Tue, 23 Feb 2021 18:00:47 +0100 Subject: [PATCH 09/14] Introducing CLLocationManagerDidChangeAuthorizationEvent Added CLLocationManagerDidChangeAuthorizationEvent to helper class --- Sources/Helpers.swift | 5 +++++ Sources/RxEventTypealias.swift | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/Sources/Helpers.swift b/Sources/Helpers.swift index 5a08bf5..e8af528 100644 --- a/Sources/Helpers.swift +++ b/Sources/Helpers.swift @@ -27,6 +27,11 @@ func clAuthorizationStatus(_ args: [Any]) throws -> CLAuthorizationEvent { return (manager, status) } +func clChangeAuthorizationStatus(_ args: [Any]) throws -> CLLocationManagerDidChangeAuthorizationEvent { + let manager = try castOrThrow(CLLocationManager.self, args[0]) + return (manager) +} + func clLocationsEvent(_ args: [Any]) throws -> CLLocationsEvent { let manager = try castOrThrow(CLLocationManager.self, args[0]) let locations = try castOrThrow(Array.self, args[1]) diff --git a/Sources/RxEventTypealias.swift b/Sources/RxEventTypealias.swift index c027cb2..36bd748 100644 --- a/Sources/RxEventTypealias.swift +++ b/Sources/RxEventTypealias.swift @@ -8,6 +8,12 @@ import CoreLocation.CLLocationManagerDelegate +/// locationManagerDidChangeAuthorization +/// +/// Discussion: +/// Invoked when the authorization status changes for this application. +public typealias CLLocationManagerDidChangeAuthorizationEvent = (CLLocationManager) + /// locationManager:didChangeAuthorizationStatus: /// /// Discussion: From dd68a9514fbb69f7321496a7d7817a3454d4d3d5 Mon Sep 17 00:00:00 2001 From: Bob Date: Tue, 23 Feb 2021 18:04:49 +0100 Subject: [PATCH 10/14] Exposing `accuracyAuthorization` and `authorizationStatus` Added implementation for `accuracyAuthorization` and `authorizationStatus` --- .../CLLocationManagerDelegateEvents+Rx.swift | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Sources/CLLocationManagerDelegateEvents+Rx.swift b/Sources/CLLocationManagerDelegateEvents+Rx.swift index 32c81de..3e53ab1 100644 --- a/Sources/CLLocationManagerDelegateEvents+Rx.swift +++ b/Sources/CLLocationManagerDelegateEvents+Rx.swift @@ -21,6 +21,7 @@ extension Reactive where Base: CLLocationManager { } /// Reactive wrapper for `func locationManager(_ manager: CLLocationManager, didChangeAuthorization status: CLAuthorizationStatus)` + @available(iOS, introduced: 4.2, deprecated: 14.0, message: "Use didUpdateAuthorization from iOS 14") public var didChangeAuthorization: ControlEvent { let source: Observable = delegate .methodInvoked(.didChangeAuthorization) @@ -28,6 +29,26 @@ extension Reactive where Base: CLLocationManager { return ControlEvent(events: source) } + @available(iOS 14.0, OSX 14.0, watchOSApplicationExtension 7.0, tvOS 14.0, *) + public var didLocationManagerDidChangeAuthorization: ControlEvent { + let source: Observable = delegate + .methodInvoked(.didLocationManagerDidChangeAuthorization) + .map(clChangeAuthorizationStatus) + + return ControlEvent(events: source) + } + + @available(iOS 14.0, OSX 14.0, watchOSApplicationExtension 7.0, tvOS 14.0, *) + public var accuracyAuthorization: Observable { + return self.didLocationManagerDidChangeAuthorization + .map({$0.accuracyAuthorization}) + } + + @available(iOS 14.0, OSX 14.0, watchOSApplicationExtension 7.0, tvOS 14.0, *) + public var authorizationStatus: Observable { + return self.didLocationManagerDidChangeAuthorization + .map({$0.authorizationStatus}) + } /// Reactive wrapper for `func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation])` public var didUpdateLocations: ControlEvent { let source: Observable = delegate From 68a1330ee435c4966536f66f5f7ef800f326cc41 Mon Sep 17 00:00:00 2001 From: Bob Date: Tue, 23 Feb 2021 18:05:32 +0100 Subject: [PATCH 11/14] Added usage example for `accuracyAuthorization` and `authorizationStatus` --- RxCoreLocationExample/ViewController.swift | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/RxCoreLocationExample/ViewController.swift b/RxCoreLocationExample/ViewController.swift index f078a57..4d269bd 100644 --- a/RxCoreLocationExample/ViewController.swift +++ b/RxCoreLocationExample/ViewController.swift @@ -40,6 +40,24 @@ class ViewController: UIViewController { .subscribe(onNext: { _ in }) .disposed(by: bag) + if #available(iOS 14, *) { + manager.rx + .authorizationStatus + .debug("authorizationStatus") + .subscribe(onNext: { value in + print("authorizationStatus \(value)") + }) + .disposed(by: bag) + + manager.rx + .accuracyAuthorization + .debug("accuracyAuthorization") + .subscribe(onNext: { value in + print("accuracyAuthorization \(value)") + }) + .disposed(by: bag) + } + /// Subscribe to placemark manager.rx .placemark From 22575a358d35bd88ad976fa03e62efc5efb8df77 Mon Sep 17 00:00:00 2001 From: Bob Date: Tue, 23 Feb 2021 18:06:45 +0100 Subject: [PATCH 12/14] Update project settings to make example project build again --- RxCoreLocation.xcodeproj/project.pbxproj | 8 -------- 1 file changed, 8 deletions(-) diff --git a/RxCoreLocation.xcodeproj/project.pbxproj b/RxCoreLocation.xcodeproj/project.pbxproj index 0762e0d..0c77bcf 100644 --- a/RxCoreLocation.xcodeproj/project.pbxproj +++ b/RxCoreLocation.xcodeproj/project.pbxproj @@ -21,15 +21,11 @@ C44FC28A1FB59FC00051CCA2 /* HasEventsBehavior.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44FC2891FB59FC00051CCA2 /* HasEventsBehavior.swift */; }; C4A5FBBB25A25E4100B9A09D /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB425A25E4000B9A09D /* RxSwift.framework */; }; C4A5FBBC25A25E4100B9A09D /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB425A25E4000B9A09D /* RxSwift.framework */; }; - C4A5FBBD25A25E4100B9A09D /* RxBlocking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB525A25E4000B9A09D /* RxBlocking.framework */; }; C4A5FBBE25A25E4100B9A09D /* RxBlocking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB525A25E4000B9A09D /* RxBlocking.framework */; }; - C4A5FBBF25A25E4100B9A09D /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB625A25E4000B9A09D /* Quick.framework */; }; C4A5FBC025A25E4100B9A09D /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB625A25E4000B9A09D /* Quick.framework */; }; - C4A5FBC125A25E4100B9A09D /* RxTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB725A25E4000B9A09D /* RxTest.framework */; }; C4A5FBC225A25E4100B9A09D /* RxTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB725A25E4000B9A09D /* RxTest.framework */; }; C4A5FBC325A25E4100B9A09D /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB825A25E4000B9A09D /* RxCocoa.framework */; }; C4A5FBC425A25E4100B9A09D /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB825A25E4000B9A09D /* RxCocoa.framework */; }; - C4A5FBC525A25E4100B9A09D /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB925A25E4000B9A09D /* Nimble.framework */; }; C4A5FBC625A25E4100B9A09D /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBB925A25E4000B9A09D /* Nimble.framework */; }; C4A5FBC725A25E4100B9A09D /* RxRelay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBBA25A25E4100B9A09D /* RxRelay.framework */; }; C4A5FBC825A25E4100B9A09D /* RxRelay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4A5FBBA25A25E4100B9A09D /* RxRelay.framework */; }; @@ -156,12 +152,8 @@ buildActionMask = 2147483647; files = ( C4A5FBBB25A25E4100B9A09D /* RxSwift.framework in Frameworks */, - C4A5FBBD25A25E4100B9A09D /* RxBlocking.framework in Frameworks */, - C4A5FBC125A25E4100B9A09D /* RxTest.framework in Frameworks */, - C4A5FBC525A25E4100B9A09D /* Nimble.framework in Frameworks */, C4A5FBC725A25E4100B9A09D /* RxRelay.framework in Frameworks */, C4A5FBC325A25E4100B9A09D /* RxCocoa.framework in Frameworks */, - C4A5FBBF25A25E4100B9A09D /* Quick.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; From 956bdde209ac31449fe6a6549bcfa39650088dfb Mon Sep 17 00:00:00 2001 From: Bob Date: Tue, 23 Feb 2021 18:08:06 +0100 Subject: [PATCH 13/14] Fix carthage build on xcode 12.5 --- carthage-build.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 carthage-build.sh diff --git a/carthage-build.sh b/carthage-build.sh new file mode 100644 index 0000000..7dff0a9 --- /dev/null +++ b/carthage-build.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +# carthage.sh +# Usage example: ./carthage-build.sh build --platform iOS + +set -euo pipefail + +xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX) +trap 'rm -f "$xcconfig"' INT TERM HUP EXIT + +# For Xcode 12 make sure EXCLUDED_ARCHS is set to arm architectures otherwise +# the build will fail on lipo due to duplicate architectures. +echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig +echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig + +export XCODE_XCCONFIG_FILE="$xcconfig" +carthage "$@" From 77a2e04284d6fa53e47167c89a22e8c9b278c32d Mon Sep 17 00:00:00 2001 From: Bob Date: Tue, 23 Feb 2021 18:13:07 +0100 Subject: [PATCH 14/14] Updating project settings inline with Xcode 12 --- RxCoreLocation.xcodeproj/project.pbxproj | 12 +++++++----- .../xcschemes/RxCoreLocation-iOS.xcscheme | 2 +- .../xcschemes/RxCoreLocation-macOS.xcscheme | 2 +- .../xcschemes/RxCoreLocation-tvOS.xcscheme | 2 +- .../xcschemes/RxCoreLocation-watchOS.xcscheme | 2 +- RxCoreLocationExample.xcodeproj/project.pbxproj | 12 +++++++----- .../xcschemes/RxCoreLocationExample.xcscheme | 2 +- 7 files changed, 19 insertions(+), 15 deletions(-) diff --git a/RxCoreLocation.xcodeproj/project.pbxproj b/RxCoreLocation.xcodeproj/project.pbxproj index 0c77bcf..5dfcbbb 100644 --- a/RxCoreLocation.xcodeproj/project.pbxproj +++ b/RxCoreLocation.xcodeproj/project.pbxproj @@ -458,7 +458,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0800; - LastUpgradeCheck = 1100; + LastUpgradeCheck = 1240; ORGANIZATIONNAME = RxCoreLocation; TargetAttributes = { 3549BB201DA389CD00C63030 = { @@ -652,6 +652,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; @@ -677,7 +678,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 = 12.0; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -717,6 +718,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; @@ -736,7 +738,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 = 12.0; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; @@ -933,7 +935,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -960,7 +962,7 @@ SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = Default; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/RxCoreLocation.xcodeproj/xcshareddata/xcschemes/RxCoreLocation-iOS.xcscheme b/RxCoreLocation.xcodeproj/xcshareddata/xcschemes/RxCoreLocation-iOS.xcscheme index e2d311b..b3dce84 100644 --- a/RxCoreLocation.xcodeproj/xcshareddata/xcschemes/RxCoreLocation-iOS.xcscheme +++ b/RxCoreLocation.xcodeproj/xcshareddata/xcschemes/RxCoreLocation-iOS.xcscheme @@ -1,6 +1,6 @@