From 1a62a55fc3b1b59fef4804f0b0fd0279162c0fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Sch=C3=B6nig?= Date: Fri, 10 May 2024 17:59:09 +1000 Subject: [PATCH] CocoaPods update (#353) * Bump CocoaPods * Fix runtime crash of CocoaPodsTest due to missing asset * Cherry-pick: Remove `TKUIMapManager.showOverlayPolygon` (#352) * Remove Datadog and SPM updates * Fix GHA * Maybe not checking this in helps? --- .github/workflows/swift.yml | 36 ++- .gitignore | 2 + .../xcschemes/CocoaPodsTest.xcscheme | 78 ++++++ .../favorite-outline.imageset/Contents.json | 15 ++ .../favorite-outline.pdf | Bin 0 -> 4418 bytes .../favorite.imageset/Contents.json | 15 ++ .../favorite.imageset/favorite.pdf | Bin 0 -> 4374 bytes Examples/CocoaPodsTest/Podfile.lock | 24 +- .../helpers/TKRegionOverlayHelper.swift | 238 ------------------ .../cards/TKUILocationMapManager.swift | 1 - Sources/TripKitUI/cards/TKUIMapManager.swift | 45 ---- .../cards/TKUINearbyMapManager.swift | 1 - .../cards/TKUIRoutingResultsMapManager.swift | 1 - .../cards/TKUIServiceMapManager.swift | 1 - TripKit.xcodeproj/project.pbxproj | 25 +- .../xcshareddata/swiftpm/Package.resolved | 50 ---- .../xcschemes/TripKit-iOS.xcscheme | 65 ----- 17 files changed, 146 insertions(+), 451 deletions(-) create mode 100644 Examples/CocoaPodsTest/CocoaPodsTest.xcodeproj/xcshareddata/xcschemes/CocoaPodsTest.xcscheme create mode 100644 Examples/CocoaPodsTest/CocoaPodsTest/Assets.xcassets/favorite-outline.imageset/Contents.json create mode 100644 Examples/CocoaPodsTest/CocoaPodsTest/Assets.xcassets/favorite-outline.imageset/favorite-outline.pdf create mode 100644 Examples/CocoaPodsTest/CocoaPodsTest/Assets.xcassets/favorite.imageset/Contents.json create mode 100644 Examples/CocoaPodsTest/CocoaPodsTest/Assets.xcassets/favorite.imageset/favorite.pdf delete mode 100644 Sources/TripKit/helpers/TKRegionOverlayHelper.swift delete mode 100644 TripKit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 027530632..5d3553ced 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -8,21 +8,35 @@ on: jobs: build_spm: - runs-on: macos-12 + runs-on: macos-13 steps: - - uses: actions/checkout@v3 + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: latest-stable + - uses: actions/checkout@v4 - name: Build run: swift build --target TripKit - build_xcode: + build_spm_monterey: runs-on: macos-12 + steps: + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: 14.2 + - uses: actions/checkout@v4 + - name: Build + run: swift build --target TripKit + + build_xcode: + runs-on: macos-13 + steps: - uses: maxim-lobanov/setup-xcode@v1 with: xcode-version: latest-stable - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build TripKit Mac run: xcodebuild build -quiet -project TripKit.xcodeproj -scheme "TripKit-macOS" - name: Build TripKitUI iOS @@ -31,20 +45,16 @@ jobs: run: xcodebuild build -quiet -project TripKit.xcodeproj -scheme "TripKitInterApp-iOS" -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' test_xcode: - runs-on: macos-12 + runs-on: macos-13 steps: - uses: maxim-lobanov/setup-xcode@v1 with: xcode-version: latest-stable - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Run tests env: TRIPGO_API_KEY: ${{ secrets.TRIPGO_API_KEY }} - DATADOG_CLIENT_TOKEN: ${{ secrets.DATADOG_CLIENT_TOKEN }} - DD_TEST_RUNNER: 1 - DD_ENV: ci - DD_SERVICE: tripkit-ios run: | xcodebuild test -quiet -project TripKit.xcodeproj -scheme "TripKit-iOS" -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -resultBundlePath TestResults - uses: kishikawakatsumi/xcresulttool@v1.0.3 @@ -55,13 +65,13 @@ jobs: # even if the test fails in the previous step. examples: - runs-on: macos-12 + runs-on: macos-13 steps: - uses: maxim-lobanov/setup-xcode@v1 with: xcode-version: latest-stable - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build TripKitUIExample run: xcodebuild build -quiet -project TripKit.xcodeproj -scheme TripKitUIExample -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' - name: Build MiniMap @@ -73,4 +83,4 @@ jobs: run: | cd Examples/CocoaPodsTest pod install - xcodebuild build -workspace CocoaPodsTest.xcworkspace -scheme CocoaPodsTest -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' + xcodebuild build -workspace CocoaPodsTest.xcworkspace -scheme CocoaPodsTest -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO diff --git a/.gitignore b/.gitignore index 662f66d4c..9fe064877 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,8 @@ xcbaselines .swiftpm .build +# Xcode left-overs +TripKit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved # Examples /Examples/MiniMap/Pods diff --git a/Examples/CocoaPodsTest/CocoaPodsTest.xcodeproj/xcshareddata/xcschemes/CocoaPodsTest.xcscheme b/Examples/CocoaPodsTest/CocoaPodsTest.xcodeproj/xcshareddata/xcschemes/CocoaPodsTest.xcscheme new file mode 100644 index 000000000..118b45a21 --- /dev/null +++ b/Examples/CocoaPodsTest/CocoaPodsTest.xcodeproj/xcshareddata/xcschemes/CocoaPodsTest.xcscheme @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Examples/CocoaPodsTest/CocoaPodsTest/Assets.xcassets/favorite-outline.imageset/Contents.json b/Examples/CocoaPodsTest/CocoaPodsTest/Assets.xcassets/favorite-outline.imageset/Contents.json new file mode 100644 index 000000000..854057ef6 --- /dev/null +++ b/Examples/CocoaPodsTest/CocoaPodsTest/Assets.xcassets/favorite-outline.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "favorite-outline.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/Examples/CocoaPodsTest/CocoaPodsTest/Assets.xcassets/favorite-outline.imageset/favorite-outline.pdf b/Examples/CocoaPodsTest/CocoaPodsTest/Assets.xcassets/favorite-outline.imageset/favorite-outline.pdf new file mode 100644 index 0000000000000000000000000000000000000000..411eb90aab3b791c3f0b2efd8888f575935cb89c GIT binary patch literal 4418 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 F_#Yehd`|!X literal 0 HcmV?d00001 diff --git a/Examples/CocoaPodsTest/Podfile.lock b/Examples/CocoaPodsTest/Podfile.lock index f9249c469..4ff94afe5 100644 --- a/Examples/CocoaPodsTest/Podfile.lock +++ b/Examples/CocoaPodsTest/Podfile.lock @@ -1,12 +1,12 @@ PODS: - GeoMonitor (0.1.2) - - Kingfisher (7.8.1) - - RxCocoa (6.5.0): - - RxRelay (= 6.5.0) - - RxSwift (= 6.5.0) - - RxRelay (6.5.0): - - RxSwift (= 6.5.0) - - RxSwift (6.5.0) + - Kingfisher (7.11.0) + - RxCocoa (6.7.1): + - RxRelay (= 6.7.1) + - RxSwift (= 6.7.1) + - RxRelay (6.7.1): + - RxSwift (= 6.7.1) + - RxSwift (6.7.1) - TGCardViewController (2.2.10) - TripKit (4.6.0) - TripKitInterApp (4.6.0): @@ -43,10 +43,10 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: GeoMonitor: 3af6b577d3f55007c3570c05ed20d0b97b18267e - Kingfisher: 63f677311d36a3473f6b978584f8a3845d023dc5 - RxCocoa: 94f817b71c07517321eb4f9ad299112ca8af743b - RxRelay: 1de1523e604c72b6c68feadedd1af3b1b4d0ecbd - RxSwift: 5710a9e6b17f3c3d6e40d6e559b9fa1e813b2ef8 + Kingfisher: b9c985d864d43515f404f1ef4a8ce7d802ace3ac + RxCocoa: f5609cb4637587a7faa99c5d5787e3ad582b75a4 + RxRelay: 4151ba01152436b08271e08410135e099880eae5 + RxSwift: b9a93a26031785159e11abd40d1a55bcb8057e52 TGCardViewController: 5be5341ce00cb2275f9e6bd3c0b6aecb0735b845 TripKit: 04fc9f32955703999c1dafffaf70e5031a2fdab3 TripKitInterApp: 69721780f7e29880df93bc8f780a00abeb4ce742 @@ -54,4 +54,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: fd67bcba748ae215ff8d7ed6cf43555a3235bd4a -COCOAPODS: 1.12.1 +COCOAPODS: 1.15.2 diff --git a/Sources/TripKit/helpers/TKRegionOverlayHelper.swift b/Sources/TripKit/helpers/TKRegionOverlayHelper.swift deleted file mode 100644 index d0423ec26..000000000 --- a/Sources/TripKit/helpers/TKRegionOverlayHelper.swift +++ /dev/null @@ -1,238 +0,0 @@ -// -// TKRegionOverlayHelper.swift -// TripKit -// -// Created by Adrian Schönig on 19.06.18. -// Copyright © 2018 SkedGo Pty Ltd. All rights reserved. -// - -import Foundation -import MapKit - -@objc -public class TKRegionOverlayHelper: NSObject { - - @objc(sharedInstance) - public static let shared = TKRegionOverlayHelper() - - private var regionsOverlay: MKPolygon? - private var calculationToken: Int? - - private var callbacks = [(MKPolygon?) -> Void]() - - private override init() { - super.init() - } - - @objc(regionsPolygonForcingUpdate:completion:) - public func regionsPolygon(forceUpdate: Bool = false, completion: @escaping (MKPolygon?) -> Void) { - - if (forceUpdate) { - regionsOverlay = nil - TKRegionOverlayHelper.deleteCache() - } - - if let polygon = regionsOverlay { - if (polygon.pointCount > 0) { - completion(polygon) - } else { - callbacks.append(completion) - } - - } else if let cached = TKRegionOverlayHelper.loadPolygonsFromCacheFile(), !cached.isEmpty { - regionsOverlay = MKPolygon(rectangle: .world, interiorPolygons: cached) - completion(regionsOverlay) - - } else { - // generate it and put a placeholder here - regionsOverlay = MKPolygon(points: [], count: 0) - callbacks.append(completion) - - let polygons = TKRegionManager.shared.regions.map { $0.polygon } - let calculationToken = TKRegionManager.shared.regionsHash?.intValue - self.calculationToken = calculationToken - - MKPolygon.union(polygons) { result in - // Ignore callbacks for since outdated regions (e.g., switching servers quickly) - guard calculationToken == self.calculationToken else { return } - - switch result { - case .success(let regionPolygons): - // create outside polygon removing the regions (to show which area is covered) - let encodable = regionPolygons.map(EncodablePolygon.init) - TKRegionOverlayHelper.savePolygonsToCacheFile(encodable) - let overlay = MKPolygon(rectangle: .world, interiorPolygons: regionPolygons) - self.regionsOverlay = overlay - for callback in self.callbacks { - callback(overlay) - } - - case .failure(let error): - TKLog.warn("TKRegionOverlayHelper", text: "Polygon union failed: \(error)") - self.regionsOverlay = nil - for callback in self.callbacks { - callback(nil) - } - } - self.callbacks = [] - } - - } - - } - -} - -// MARK: - Helper - -extension MKPolygon { - - convenience init(rectangle: MKMapRect, interiorPolygons: [MKPolygon]? = nil) { - let points: [MKMapPoint] = [ - MKMapPoint(x: rectangle.minX, y: rectangle.minY), - MKMapPoint(x: rectangle.minX, y: rectangle.maxY), - MKMapPoint(x: rectangle.maxX, y: rectangle.maxY), - MKMapPoint(x: rectangle.maxX, y: rectangle.minY), - ] - self.init(points: points, count: points.count, interiorPolygons: interiorPolygons) - } - -} - -class EncodablePolygon: NSObject, NSSecureCoding { - let polygon: MKPolygon - - init(polygon: MKPolygon) { - self.polygon = polygon - super.init() - } - - @objc static var supportsSecureCoding: Bool { true } - - @objc - required init?(coder aDecoder: NSCoder) { - guard - let degrees = aDecoder.decodeObject(of: [NSNumber.self, NSArray.self], forKey: "degrees") as? [NSNumber] - else { return nil } - - let coordinates = (0..<(degrees.count / 2)) - .map { CLLocationCoordinate2D(latitude: degrees[2*$0].doubleValue, longitude: degrees[2*$0 + 1].doubleValue) } - - let interiorPolygons: [MKPolygon]? - if let interiors = aDecoder.decodeObject(of: [EncodablePolygon.self, NSArray.self], forKey: "interiors") as? [EncodablePolygon] { - interiorPolygons = interiors.map(\.polygon) - } else { - interiorPolygons = nil - } - - self.polygon = MKPolygon(coordinates: coordinates, count: coordinates.count, interiorPolygons: interiorPolygons) - } - - @objc(encodeWithCoder:) - func encode(with coder: NSCoder) { - var coordinates = [CLLocationCoordinate2D](repeating: kCLLocationCoordinate2DInvalid, count: polygon.pointCount) - let range = NSRange(location: 0, length: polygon.pointCount) - polygon.getCoordinates(&coordinates, range: range) - - let degrees = coordinates - .flatMap { [$0.latitude, $0.longitude] } - .map(NSNumber.init) - coder.encode(degrees, forKey: "degrees") - - if let interiors = polygon.interiorPolygons { - coder.encode(interiors.map(EncodablePolygon.init), forKey: "interiors") - } - } -} - -// MARK: - Caching on disk - -extension TKRegionOverlayHelper { - - public static let cacheURL: URL? = { - return FileManager.default - .urls(for: .cachesDirectory, in: .userDomainMask) - .first?.appendingPathComponent("regionOverlay.data") - }() - - private static func deleteCache() { - guard let cacheURL = TKRegionOverlayHelper.cacheURL else { return } - try? FileManager.default.removeItem(at: cacheURL) - } - - private static func loadPolygonsFromCacheFile() -> [MKPolygon]? { - guard - let cacheURL = TKRegionOverlayHelper.cacheURL, - let data = try? Data(contentsOf: cacheURL) - else { return nil } - - do { - let unarchiver = try NSKeyedUnarchiver(forReadingFrom: data) - unarchiver.requiresSecureCoding = false - - let regionsHash = unarchiver.decodeObject(of: NSNumber.self, forKey: "regionsHash") as NSNumber? - guard - let hash = regionsHash?.intValue, - hash == TKRegionManager.shared.regionsHash?.intValue - else { return nil } - - - let wrappedPolygons = unarchiver.decodeObject(of: [EncodablePolygon.self, NSArray.self], forKey: "polygons") as? [EncodablePolygon] - return wrappedPolygons.map { $0.map(\.polygon) } - - } catch { - assertionFailure("Unexpected error: \(error)") - return nil - } - } - - private static func savePolygonsToCacheFile(_ polygons: [EncodablePolygon]) { - guard - let cacheURL = TKRegionOverlayHelper.cacheURL, - !polygons.isEmpty, - let regionsHash = TKRegionManager.shared.regionsHash - else { return } - - do { - #if DEBUG - // Output GeoJSON, too. - let secondary = FileManager.default - .urls(for: .cachesDirectory, in: .userDomainMask) - .first!.appendingPathComponent("regionOverlay.geojson") - - let features = polygons.map { wrapper -> [String: Any] in - let polygon = wrapper.polygon - var coordinates = [CLLocationCoordinate2D](repeating: kCLLocationCoordinate2DInvalid, count: polygon.pointCount) - let range = NSRange(location: 0, length: polygon.pointCount) - polygon.getCoordinates(&coordinates, range: range) - - return [ - "type": "Feature", - "geometry": [ - "type": "Polygon", - "coordinates": [ - coordinates.map { - [$0.longitude, $0.latitude] - } - ] - ] as [String : Any] - ] - } - let geojson: [String: Any] = [ - "type": "FeatureCollection", - "features": features - ] - let geojsonData = try JSONSerialization.data(withJSONObject: geojson, options: []) - try geojsonData.write(to: secondary) - print("Saved GeoJSON to \(secondary)") - #endif - - let archiver = NSKeyedArchiver(requiringSecureCoding: false) - archiver.encode(polygons, forKey: "polygons") - archiver.encode(regionsHash, forKey: "regionsHash") - try archiver.encodedData.write(to: cacheURL) - } catch { - assertionFailure() - } - } -} diff --git a/Sources/TripKitUI/cards/TKUILocationMapManager.swift b/Sources/TripKitUI/cards/TKUILocationMapManager.swift index b79bff2ed..7a2c61b50 100644 --- a/Sources/TripKitUI/cards/TKUILocationMapManager.swift +++ b/Sources/TripKitUI/cards/TKUILocationMapManager.swift @@ -21,7 +21,6 @@ public class TKUILocationMapManager: TKUIMapManager { super.init() self.preferredZoomLevel = .road - self.showOverlayPolygon = true self.annotations = [coordinate] } diff --git a/Sources/TripKitUI/cards/TKUIMapManager.swift b/Sources/TripKitUI/cards/TKUIMapManager.swift index 70e8b6fc4..4d4d481c9 100644 --- a/Sources/TripKitUI/cards/TKUIMapManager.swift +++ b/Sources/TripKitUI/cards/TKUIMapManager.swift @@ -77,9 +77,6 @@ open class TKUIMapManager: TGMapManager { /// Callback that fires when attributions need to be displayed. In particular when using `tiles`. public var attributionDisplayer: (([TKAPI.DataAttribution], _ sender: UIView) -> Void)? = nil - /// Whether to show the coverage polygon which greys out areas outside the coverage - open var showOverlayPolygon = false - /// Tiles to use instead of Apple Maps tiles var tiles: TKUIMapTiles? = nil { didSet { @@ -146,14 +143,6 @@ open class TKUIMapManager: TGMapManager { /// *and* regular overlays better to set this to `.aboveLabels`. var overlayLevel: MKOverlayLevel = .aboveRoads - fileprivate var overlayPolygon: MKPolygon? { - didSet { - guard oldValue != overlayPolygon else { return } - removeOverlay(oldValue) - addOverlay() - } - } - /// Overlays on the map, which are typically routes in TripKit /// /// As soon as you set this, the routes will be added to the map. @@ -208,27 +197,9 @@ open class TKUIMapManager: TGMapManager { if let overlay = self.tileOverlay, let tiles = self.tiles { settingsToRestore = self.accommodateTileOverlay(overlay, sources: tiles.sources, on: mapView) } - - // Fetching and updating polygons which can be slow - if let _ = self.overlayPolygon { - addOverlay() - } - - let updateOverlay = { [weak self] (polygon: MKPolygon?) -> Void in - self?.overlayPolygon = polygon - } - TKRegionOverlayHelper.shared.regionsPolygon(completion: updateOverlay) - NotificationCenter.default.rx - .notification(.TKRegionManagerUpdatedRegions) - .subscribe(onNext: { _ in - TKRegionOverlayHelper.shared.regionsPolygon(forceUpdate: true, completion: updateOverlay) - }) - .disposed(by: disposeBag) } override open func cleanUp(_ mapView: MKMapView, animated: Bool) { - removeOverlay(overlayPolygon) - if let tileOverlay = self.tileOverlay { mapView.removeOverlay(tileOverlay) // When we have custom map title, we also add an attribution view. We need to @@ -259,22 +230,6 @@ open class TKUIMapManager: TGMapManager { } -// MARK: - Overlay polygon - -extension TKUIMapManager { - - private func addOverlay() { - guard let polygon = overlayPolygon, isActive, showOverlayPolygon else { return } - mapView?.addOverlay(polygon, level: .aboveLabels) - } - - private func removeOverlay(_ polygon: MKPolygon?) { - guard let polygon = polygon, isActive else { return } - mapView?.removeOverlay(polygon) - } - -} - // MARK: - Updating animated annotations extension TKUIMapManager { diff --git a/Sources/TripKitUI/cards/TKUINearbyMapManager.swift b/Sources/TripKitUI/cards/TKUINearbyMapManager.swift index 84f8dbbc0..099ff5f7a 100644 --- a/Sources/TripKitUI/cards/TKUINearbyMapManager.swift +++ b/Sources/TripKitUI/cards/TKUINearbyMapManager.swift @@ -26,7 +26,6 @@ public class TKUINearbyMapManager: TKUIMapManager { super.init() self.preferredZoomLevel = .road - self.showOverlayPolygon = true } let defaultMapRect: MKMapRect diff --git a/Sources/TripKitUI/cards/TKUIRoutingResultsMapManager.swift b/Sources/TripKitUI/cards/TKUIRoutingResultsMapManager.swift index 8a2cc8477..710f232aa 100644 --- a/Sources/TripKitUI/cards/TKUIRoutingResultsMapManager.swift +++ b/Sources/TripKitUI/cards/TKUIRoutingResultsMapManager.swift @@ -59,7 +59,6 @@ class TKUIRoutingResultsMapManager: TKUIMapManager, TKUIRoutingResultsMapManager self.destinationAnnotation = destination self.preferredZoomLevel = .road - self.showOverlayPolygon = true } private var dropPinRecognizer = UILongPressGestureRecognizer() diff --git a/Sources/TripKitUI/cards/TKUIServiceMapManager.swift b/Sources/TripKitUI/cards/TKUIServiceMapManager.swift index 03454c0b7..5417226a2 100644 --- a/Sources/TripKitUI/cards/TKUIServiceMapManager.swift +++ b/Sources/TripKitUI/cards/TKUIServiceMapManager.swift @@ -24,7 +24,6 @@ class TKUIServiceMapManager: TKUIMapManager { super.init() self.preferredZoomLevel = .road - self.showOverlayPolygon = false } private var embarkation: TKUISemaphoreDisplayable? diff --git a/TripKit.xcodeproj/project.pbxproj b/TripKit.xcodeproj/project.pbxproj index ad50ef314..3fab48e41 100644 --- a/TripKit.xcodeproj/project.pbxproj +++ b/TripKit.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -51,7 +51,6 @@ 3A9A4AC12978F3360084168A /* GeoMonitor in Frameworks */ = {isa = PBXBuildFile; productRef = 3A9A4AC02978F3360084168A /* GeoMonitor */; }; 3A9C6A8629B58AC4000D43B2 /* TKAPIParsingTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A9C6A8529B58AC4000D43B2 /* TKAPIParsingTest.swift */; }; 3AA1092126FABC6000C52879 /* TKReporter+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA1092026FABC6000C52879 /* TKReporter+Rx.swift */; }; - 3AB3A60826E84A7E006C2AD1 /* DatadogSDKTesting in Frameworks */ = {isa = PBXBuildFile; productRef = 3AB3A60726E84A7E006C2AD1 /* DatadogSDKTesting */; }; 3AB424DF2734F7D800AA0CF1 /* CLLocationCoordinate2D+EncodePolylineString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AB424DE2734F7D800AA0CF1 /* CLLocationCoordinate2D+EncodePolylineString.swift */; }; 3AB424E02734F7D800AA0CF1 /* CLLocationCoordinate2D+EncodePolylineString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AB424DE2734F7D800AA0CF1 /* CLLocationCoordinate2D+EncodePolylineString.swift */; }; 3AB4E58127584632006D2363 /* String+NonEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AB4E58027584632006D2363 /* String+NonEmpty.swift */; }; @@ -159,7 +158,6 @@ 3AFF285D26C697A3007809CD /* TKTripClassifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AFF26C826C6975F007809CD /* TKTripClassifier.swift */; }; 3AFF285E26C697A3007809CD /* TKModeHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AFF26CA26C6975F007809CD /* TKModeHelper.swift */; }; 3AFF285F26C697A3007809CD /* TripRequest+Classify.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AFF26C626C6975F007809CD /* TripRequest+Classify.swift */; }; - 3AFF286126C697A3007809CD /* TKRegionOverlayHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AFF26CD26C6975F007809CD /* TKRegionOverlayHelper.swift */; }; 3AFF286226C697A3007809CD /* TKImageBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AFF26D126C6975F007809CD /* TKImageBuilder.swift */; }; 3AFF286326C697A3007809CD /* TKJSONSanitizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AFF26D026C6975F007809CD /* TKJSONSanitizer.swift */; }; 3AFF286426C697A3007809CD /* TKRegion+RoutingMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AFF26D226C6975F007809CD /* TKRegion+RoutingMode.swift */; }; @@ -171,7 +169,6 @@ 3AFF286B26C697A3007809CD /* TKTripClassifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AFF26C826C6975F007809CD /* TKTripClassifier.swift */; }; 3AFF286C26C697A3007809CD /* TKModeHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AFF26CA26C6975F007809CD /* TKModeHelper.swift */; }; 3AFF286D26C697A3007809CD /* TripRequest+Classify.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AFF26C626C6975F007809CD /* TripRequest+Classify.swift */; }; - 3AFF286F26C697A3007809CD /* TKRegionOverlayHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AFF26CD26C6975F007809CD /* TKRegionOverlayHelper.swift */; }; 3AFF287026C697A3007809CD /* TKImageBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AFF26D126C6975F007809CD /* TKImageBuilder.swift */; }; 3AFF287126C697A3007809CD /* TKJSONSanitizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AFF26D026C6975F007809CD /* TKJSONSanitizer.swift */; }; 3AFF287226C697AA007809CD /* TKContactsManager+TKAutocompleting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AFF263526C6975F007809CD /* TKContactsManager+TKAutocompleting.swift */; }; @@ -1296,7 +1293,6 @@ 3AFF26C926C6975F007809CD /* DataAttachable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataAttachable.swift; sourceTree = ""; }; 3AFF26CA26C6975F007809CD /* TKModeHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TKModeHelper.swift; sourceTree = ""; }; 3AFF26CC26C6975F007809CD /* TKJSONCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TKJSONCache.swift; sourceTree = ""; }; - 3AFF26CD26C6975F007809CD /* TKRegionOverlayHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TKRegionOverlayHelper.swift; sourceTree = ""; }; 3AFF26CE26C6975F007809CD /* TKParserHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TKParserHelper.swift; sourceTree = ""; }; 3AFF26CF26C6975F007809CD /* API+ViewHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "API+ViewHelpers.swift"; sourceTree = ""; }; 3AFF26D026C6975F007809CD /* TKJSONSanitizer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TKJSONSanitizer.swift; sourceTree = ""; }; @@ -1724,7 +1720,6 @@ files = ( 3A1F744925C8F5AA00C72CEE /* TripKitUI.framework in Frameworks */, 3AB6C62B1D1CD0060089F687 /* TripKit.framework in Frameworks */, - 3AB3A60826E84A7E006C2AD1 /* DatadogSDKTesting in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2322,7 +2317,6 @@ 3AFF26CA26C6975F007809CD /* TKModeHelper.swift */, 3AFF26CE26C6975F007809CD /* TKParserHelper.swift */, 3AFF26D226C6975F007809CD /* TKRegion+RoutingMode.swift */, - 3AFF26CD26C6975F007809CD /* TKRegionOverlayHelper.swift */, ); path = helpers; sourceTree = ""; @@ -3233,7 +3227,6 @@ ); name = TripKitTests; packageProductDependencies = ( - 3AB3A60726E84A7E006C2AD1 /* DatadogSDKTesting */, ); productName = TripKitTests; productReference = 3AB6C62A1D1CD0060089F687 /* TripKitTests.xctest */; @@ -3329,7 +3322,6 @@ mainGroup = 3AB6C6161D1CD0060089F687; packageReferences = ( 3A1F72CF25C7E54800C72CEE /* XCRemoteSwiftPackageReference "RxSwift" */, - 3AB3A60626E84A7E006C2AD1 /* XCRemoteSwiftPackageReference "dd-sdk-swift-testing" */, 3A55D16426FC5C5800A3D6EB /* XCRemoteSwiftPackageReference "Kingfisher" */, 3AD3BA9127422A4C00E33015 /* XCRemoteSwiftPackageReference "TGCardViewController" */, F18615CC2973E07E00632FD4 /* XCRemoteSwiftPackageReference "GeoMonitor" */, @@ -3696,7 +3688,6 @@ 3AFF285326C6978A007809CD /* TKConfig.swift in Sources */, 3A89090927E473EE005A49B1 /* TKLocationProvider.swift in Sources */, 3AFF283D26C6977C007809CD /* TKShareURLProvider.swift in Sources */, - 3AFF286F26C697A3007809CD /* TKRegionOverlayHelper.swift in Sources */, 3AFF28E126C697D9007809CD /* TKLocalCost.swift in Sources */, 3AFF28BE26C697D9007809CD /* Alert+CoreDataClass.swift in Sources */, 3AFF288226C697CA007809CD /* LocationAPIModel.swift in Sources */, @@ -4173,7 +4164,6 @@ 3AFF28F826C697DA007809CD /* TKColoredRoute.swift in Sources */, 3AFF284A26C6978A007809CD /* TKConfig.swift in Sources */, 3AFF283526C6977B007809CD /* TKShareURLProvider.swift in Sources */, - 3AFF286126C697A3007809CD /* TKRegionOverlayHelper.swift in Sources */, 3AFF292026C697DA007809CD /* TKLocalCost.swift in Sources */, 3AFF28FD26C697DA007809CD /* Alert+CoreDataClass.swift in Sources */, 3AFF289426C697CB007809CD /* LocationAPIModel.swift in Sources */, @@ -4970,14 +4960,6 @@ minimumVersion = 7.0.0; }; }; - 3AB3A60626E84A7E006C2AD1 /* XCRemoteSwiftPackageReference "dd-sdk-swift-testing" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/DataDog/dd-sdk-swift-testing"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 1.0.0; - }; - }; 3AD3BA9127422A4C00E33015 /* XCRemoteSwiftPackageReference "TGCardViewController" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/skedgo/TGCardViewController.git"; @@ -5012,11 +4994,6 @@ package = F18615CC2973E07E00632FD4 /* XCRemoteSwiftPackageReference "GeoMonitor" */; productName = GeoMonitor; }; - 3AB3A60726E84A7E006C2AD1 /* DatadogSDKTesting */ = { - isa = XCSwiftPackageProductDependency; - package = 3AB3A60626E84A7E006C2AD1 /* XCRemoteSwiftPackageReference "dd-sdk-swift-testing" */; - productName = DatadogSDKTesting; - }; 3AD3BA9227422A4C00E33015 /* TGCardViewController */ = { isa = XCSwiftPackageProductDependency; package = 3AD3BA9127422A4C00E33015 /* XCRemoteSwiftPackageReference "TGCardViewController" */; diff --git a/TripKit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/TripKit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index fb935dd4d..000000000 --- a/TripKit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,50 +0,0 @@ -{ - "pins" : [ - { - "identity" : "dd-sdk-swift-testing", - "kind" : "remoteSourceControl", - "location" : "https://github.com/DataDog/dd-sdk-swift-testing", - "state" : { - "revision" : "9fb2d3087afbe7337b4876a63c77ce8dd0e66a23", - "version" : "1.1.1" - } - }, - { - "identity" : "geomonitor", - "kind" : "remoteSourceControl", - "location" : "https://github.com/skedgo/GeoMonitor", - "state" : { - "revision" : "6bd6092fb4e85727d483fe244a11b882c2997f63", - "version" : "0.2.0" - } - }, - { - "identity" : "kingfisher", - "kind" : "remoteSourceControl", - "location" : "https://github.com/onevcat/Kingfisher.git", - "state" : { - "revision" : "c1f60c63f356d364f4284ba82961acbe7de79bcc", - "version" : "7.8.1" - } - }, - { - "identity" : "rxswift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ReactiveX/RxSwift.git", - "state" : { - "revision" : "9dcaa4b333db437b0fbfaf453fad29069044a8b4", - "version" : "6.6.0" - } - }, - { - "identity" : "tgcardviewcontroller", - "kind" : "remoteSourceControl", - "location" : "https://github.com/skedgo/TGCardViewController.git", - "state" : { - "revision" : "b96668ef9bd28972f75ff9087b822fad8fb0ad84", - "version" : "2.2.10" - } - } - ], - "version" : 2 -} diff --git a/TripKit.xcodeproj/xcshareddata/xcschemes/TripKit-iOS.xcscheme b/TripKit.xcodeproj/xcshareddata/xcschemes/TripKit-iOS.xcscheme index 25af96472..ff72054bf 100644 --- a/TripKit.xcodeproj/xcshareddata/xcschemes/TripKit-iOS.xcscheme +++ b/TripKit.xcodeproj/xcshareddata/xcschemes/TripKit-iOS.xcscheme @@ -74,71 +74,6 @@ value = "$(TRIPGO_API_KEY)" isEnabled = "YES"> - - - - - - - - - - - - - - - - - - - - - - - - - -