diff --git a/Package.resolved b/Package.resolved index 13e10b5..a11d588 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,70 +1,41 @@ { - "object": { - "pins": [ - { - "package": "combine-schedulers", - "repositoryURL": "https://github.com/pointfreeco/combine-schedulers", - "state": { - "branch": null, - "revision": "aa3e575929f2bcc5bad012bd2575eae716cbcdf7", - "version": "0.8.0" - } - }, - { - "package": "swift-case-paths", - "repositoryURL": "https://github.com/pointfreeco/swift-case-paths", - "state": { - "branch": null, - "revision": "a09839348486db8866f85a727b8550be1d671c50", - "version": "0.9.1" - } - }, - { - "package": "swift-collections", - "repositoryURL": "https://github.com/apple/swift-collections", - "state": { - "branch": null, - "revision": "48254824bb4248676bf7ce56014ff57b142b77eb", - "version": "1.0.2" - } - }, - { - "package": "swift-composable-architecture", - "repositoryURL": "https://github.com/pointfreeco/swift-composable-architecture", - "state": { - "branch": null, - "revision": "5bd450a8ac6a802f82d485bac219cbfacffa69fb", - "version": "0.43.0" - } - }, - { - "package": "swift-custom-dump", - "repositoryURL": "https://github.com/pointfreeco/swift-custom-dump", - "state": { - "branch": null, - "revision": "21ec1d717c07cea5a026979cb0471dd95c7087e7", - "version": "0.5.0" - } - }, - { - "package": "swift-identified-collections", - "repositoryURL": "https://github.com/pointfreeco/swift-identified-collections", - "state": { - "branch": null, - "revision": "2d6b7ffcc67afd9077fac5e5a29bcd6d39b71076", - "version": "0.4.0" - } - }, - { - "package": "xctest-dynamic-overlay", - "repositoryURL": "https://github.com/pointfreeco/xctest-dynamic-overlay", - "state": { - "branch": null, - "revision": "38bc9242e4388b80bd23ddfdf3071428859e3260", - "version": "0.4.0" - } + "pins" : [ + { + "identity" : "combine-schedulers", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pointfreeco/combine-schedulers", + "state" : { + "revision" : "aa3e575929f2bcc5bad012bd2575eae716cbcdf7", + "version" : "0.8.0" } - ] - }, - "version": 1 + }, + { + "identity" : "swift-clocks", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pointfreeco/swift-clocks", + "state" : { + "revision" : "20b25ca0dd88ebfb9111ec937814ddc5a8880172", + "version" : "0.2.0" + } + }, + { + "identity" : "swift-dependencies", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pointfreeco/swift-dependencies", + "state" : { + "revision" : "8282b0c59662eb38946afe30eb403663fc2ecf76", + "version" : "0.1.4" + } + }, + { + "identity" : "xctest-dynamic-overlay", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay", + "state" : { + "revision" : "62041e6016a30f56952f5d7d3f12a3fd7029e1cd", + "version" : "0.8.3" + } + } + ], + "version" : 2 } diff --git a/Package.swift b/Package.swift index ab479a9..aa5fe05 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.6 +// swift-tools-version:5.7 import PackageDescription @@ -17,16 +17,13 @@ let package = Package( ) ], dependencies: [ - .package( - url: "https://github.com/pointfreeco/swift-composable-architecture", - .upToNextMajor(from: "0.43.0")) + .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "0.1.2") ], targets: [ .target( name: "ComposableCoreLocation", dependencies: [ - .product(name: "Dependencies", package: "swift-composable-architecture"), - .product(name: "ComposableArchitecture", package: "swift-composable-architecture") + .product(name: "Dependencies", package: "swift-dependencies") ] ), .testTarget( diff --git a/Sources/ComposableCoreLocation/Failing.swift b/Sources/ComposableCoreLocation/Failing.swift index f488822..6c875ef 100644 --- a/Sources/ComposableCoreLocation/Failing.swift +++ b/Sources/ComposableCoreLocation/Failing.swift @@ -1,4 +1,3 @@ -import ComposableArchitecture import CoreLocation import XCTestDynamicOverlay diff --git a/Sources/ComposableCoreLocation/Interface.swift b/Sources/ComposableCoreLocation/Interface.swift index 6649cad..4ff35e6 100644 --- a/Sources/ComposableCoreLocation/Interface.swift +++ b/Sources/ComposableCoreLocation/Interface.swift @@ -1,5 +1,4 @@ import Combine -import ComposableArchitecture import CoreLocation /// A wrapper around Core Location's `CLLocationManager` that exposes its functionality through diff --git a/Sources/ComposableCoreLocation/Internal/Deprecations.swift b/Sources/ComposableCoreLocation/Internal/Deprecations.swift index d978812..3115bf4 100644 --- a/Sources/ComposableCoreLocation/Internal/Deprecations.swift +++ b/Sources/ComposableCoreLocation/Internal/Deprecations.swift @@ -1,89 +1,6 @@ // NB: Deprecated after 0.1.0: #if DEBUG - extension LocationManager { - - @available(*, unavailable, message: "Use 'LocationManager.failing', instead") - public static func unimplemented( - accuracyAuthorization: @escaping (AnyHashable) -> AccuracyAuthorization? = { _ in - _unimplemented("accuracyAuthorization") - }, - authorizationStatus: @escaping () -> CLAuthorizationStatus = { - _unimplemented("authorizationStatus") - }, - create: @escaping (_ id: AnyHashable) -> Effect = { _ in - _unimplemented("create") - }, - destroy: @escaping (AnyHashable) -> Effect = { _ in _unimplemented("destroy") }, - dismissHeadingCalibrationDisplay: @escaping (AnyHashable) -> Effect = { _ in - _unimplemented("dismissHeadingCalibrationDisplay") - }, - heading: @escaping (AnyHashable) -> Heading? = { _ in _unimplemented("heading") }, - headingAvailable: @escaping () -> Bool = { _unimplemented("headingAvailable") }, - isRangingAvailable: @escaping () -> Bool = { _unimplemented("isRangingAvailable") }, - location: @escaping (AnyHashable) -> Location? = { _ in _unimplemented("location") }, - locationServicesEnabled: @escaping () -> Bool = { _unimplemented("locationServicesEnabled") }, - maximumRegionMonitoringDistance: @escaping (AnyHashable) -> CLLocationDistance = { _ in - _unimplemented("maximumRegionMonitoringDistance") - }, - monitoredRegions: @escaping (AnyHashable) -> Set = { _ in - _unimplemented("monitoredRegions") - }, - requestAlwaysAuthorization: @escaping (AnyHashable) -> Effect = { _ in - _unimplemented("requestAlwaysAuthorization") - }, - requestLocation: @escaping (AnyHashable) -> Effect = { _ in - _unimplemented("requestLocation") - }, - requestWhenInUseAuthorization: @escaping (AnyHashable) -> Effect = { _ in - _unimplemented("requestWhenInUseAuthorization") - }, - requestTemporaryFullAccuracyAuthorization: @escaping (AnyHashable, String) -> Effect< - Never, Never - > = { _, _ in - _unimplemented("requestTemporaryFullAccuracyAuthorization") - }, - set: @escaping (_ id: AnyHashable, _ properties: Properties) -> Effect = { - _, _ in _unimplemented("set") - }, - significantLocationChangeMonitoringAvailable: @escaping () -> Bool = { - _unimplemented("significantLocationChangeMonitoringAvailable") - }, - startMonitoringSignificantLocationChanges: @escaping (AnyHashable) -> Effect = { - _ in _unimplemented("startMonitoringSignificantLocationChanges") - }, - startMonitoringForRegion: @escaping (AnyHashable, Region) -> Effect = { _, _ in - _unimplemented("startMonitoringForRegion") - }, - startMonitoringVisits: @escaping (AnyHashable) -> Effect = { _ in - _unimplemented("startMonitoringVisits") - }, - startUpdatingLocation: @escaping (AnyHashable) -> Effect = { _ in - _unimplemented("startUpdatingLocation") - }, - stopMonitoringSignificantLocationChanges: @escaping (AnyHashable) -> Effect = { - _ in _unimplemented("stopMonitoringSignificantLocationChanges") - }, - stopMonitoringForRegion: @escaping (AnyHashable, Region) -> Effect = { _, _ in - _unimplemented("stopMonitoringForRegion") - }, - stopMonitoringVisits: @escaping (AnyHashable) -> Effect = { _ in - _unimplemented("stopMonitoringVisits") - }, - startUpdatingHeading: @escaping (AnyHashable) -> Effect = { _ in - _unimplemented("startUpdatingHeading") - }, - stopUpdatingHeading: @escaping (AnyHashable) -> Effect = { _ in - _unimplemented("stopUpdatingHeading") - }, - stopUpdatingLocation: @escaping (AnyHashable) -> Effect = { _ in - _unimplemented("stopUpdatingLocation") - } - ) -> Self { - fatalError() - } - } - public func _unimplemented( _ function: StaticString, file: StaticString = #file, line: UInt = #line ) -> Never { diff --git a/Sources/ComposableCoreLocation/Internal/Exports.swift b/Sources/ComposableCoreLocation/Internal/Exports.swift index 09dced9..7bcd9b1 100644 --- a/Sources/ComposableCoreLocation/Internal/Exports.swift +++ b/Sources/ComposableCoreLocation/Internal/Exports.swift @@ -1,2 +1 @@ -@_exported import ComposableArchitecture @_exported import CoreLocation diff --git a/Sources/ComposableCoreLocation/Live.swift b/Sources/ComposableCoreLocation/Live.swift index c28ca4f..09bfbca 100644 --- a/Sources/ComposableCoreLocation/Live.swift +++ b/Sources/ComposableCoreLocation/Live.swift @@ -1,5 +1,4 @@ import Combine -import ComposableArchitecture import CoreLocation extension LocationManager {