From 3759d33c863051dc0832b92433d2952aa1b2b04f Mon Sep 17 00:00:00 2001 From: jwmcdougall Date: Tue, 7 Jan 2025 14:14:26 -0600 Subject: [PATCH] Updated MatomoTracker from Pods to SPM --- Marlin/Marlin.xcodeproj/project.pbxproj | 17 +++++++++++++++++ Marlin/Podfile | 1 - Marlin/Podfile.lock | 8 +------- .../Settings.bundle/Acknowledgements.plist | 14 -------------- 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/Marlin/Marlin.xcodeproj/project.pbxproj b/Marlin/Marlin.xcodeproj/project.pbxproj index 6cc75415..4a2ba498 100644 --- a/Marlin/Marlin.xcodeproj/project.pbxproj +++ b/Marlin/Marlin.xcodeproj/project.pbxproj @@ -8,6 +8,7 @@ /* Begin PBXBuildFile section */ 7982FB9B536447055E423E94 /* libPods-Marlin.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B0F14076A8393C9747AD1FE /* libPods-Marlin.a */; }; + A8075BDB2D2DC20E000A5418 /* MatomoTracker in Frameworks */ = {isa = PBXBuildFile; productRef = A8075BDA2D2DC20E000A5418 /* MatomoTracker */; }; A8B2A4352D2DB4F40092E9F8 /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = A8B2A4342D2DB4F40092E9F8 /* Alamofire */; }; A8E6E61E2D2DB65400A331F8 /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = A8E6E61D2D2DB65400A331F8 /* Kingfisher */; }; D6353EA32B68376100444D24 /* SearchProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6353EA22B68376100444D24 /* SearchProvider.swift */; }; @@ -1401,6 +1402,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + A8075BDB2D2DC20E000A5418 /* MatomoTracker in Frameworks */, F730DFC42A99000D0051775C /* GeoJSON in Frameworks */, A8B2A4352D2DB4F40092E9F8 /* Alamofire in Frameworks */, 7982FB9B536447055E423E94 /* libPods-Marlin.a in Frameworks */, @@ -3461,6 +3463,7 @@ F730DFC32A99000D0051775C /* GeoJSON */, A8B2A4342D2DB4F40092E9F8 /* Alamofire */, A8E6E61D2D2DB65400A331F8 /* Kingfisher */, + A8075BDA2D2DC20E000A5418 /* MatomoTracker */, ); productName = "Marlin (iOS)"; productReference = F7A54CB22848149700E5F565 /* Marlin.app */; @@ -3522,6 +3525,7 @@ F730DFC22A99000D0051775C /* XCRemoteSwiftPackageReference "GeoJSON" */, A8B2A4332D2DB4E30092E9F8 /* XCRemoteSwiftPackageReference "Alamofire" */, A8E6E61C2D2DB60D00A331F8 /* XCRemoteSwiftPackageReference "Kingfisher" */, + A8075BD92D2DC202000A5418 /* XCRemoteSwiftPackageReference "matomo-sdk-ios" */, ); productRefGroup = F7A54CB32848149700E5F565 /* Products */; projectDirPath = ""; @@ -4717,6 +4721,14 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ + A8075BD92D2DC202000A5418 /* XCRemoteSwiftPackageReference "matomo-sdk-ios" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/matomo-org/matomo-sdk-ios.git"; + requirement = { + branch = develop; + kind = branch; + }; + }; A8B2A4332D2DB4E30092E9F8 /* XCRemoteSwiftPackageReference "Alamofire" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/Alamofire/Alamofire.git"; @@ -4752,6 +4764,11 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + A8075BDA2D2DC20E000A5418 /* MatomoTracker */ = { + isa = XCSwiftPackageProductDependency; + package = A8075BD92D2DC202000A5418 /* XCRemoteSwiftPackageReference "matomo-sdk-ios" */; + productName = MatomoTracker; + }; A8B2A4342D2DB4F40092E9F8 /* Alamofire */ = { isa = XCSwiftPackageProductDependency; package = A8B2A4332D2DB4E30092E9F8 /* XCRemoteSwiftPackageReference "Alamofire" */; diff --git a/Marlin/Podfile b/Marlin/Podfile index 65e7e06f..837a83a8 100644 --- a/Marlin/Podfile +++ b/Marlin/Podfile @@ -8,7 +8,6 @@ def common_pods pod 'geopackage-ios' pod 'mgrs-ios' pod 'gars-ios' - pod 'MatomoTracker', '~> 7.5' pod 'SWXMLHash', '~> 7' pod 'SwiftLint' pod 'SwiftUIIntrospect' diff --git a/Marlin/Podfile.lock b/Marlin/Podfile.lock index f6d4177a..25cdc025 100644 --- a/Marlin/Podfile.lock +++ b/Marlin/Podfile.lock @@ -16,9 +16,6 @@ PODS: - KIF (3.9.0): - KIF/Core (= 3.9.0) - KIF/Core (3.9.0) - - MatomoTracker (7.7.0): - - MatomoTracker/Core (= 7.7.0) - - MatomoTracker/Core (7.7.0) - mgrs-ios (1.1.6): - grid-ios (~> 1.0.7) - ogc-api-features-json-ios (4.2.5): @@ -63,7 +60,6 @@ DEPENDENCIES: - gars-ios - geopackage-ios - KIF (from `https://github.com/kif-framework/KIF.git`, branch `jmartin/collection-view-cell-enumeration-assert`) - - MatomoTracker (~> 7.5) - mgrs-ios - OHHTTPStubs - OHHTTPStubs/Swift @@ -78,7 +74,6 @@ SPEC REPOS: - gars-ios - geopackage-ios - grid-ios - - MatomoTracker - mgrs-ios - ogc-api-features-json-ios - OHHTTPStubs @@ -112,7 +107,6 @@ SPEC CHECKSUMS: geopackage-ios: 8a61864c1f6e7433ddcd00854a27e23f78267b20 grid-ios: 4aa398fd164bb8acac9d587cf61016cc6523defb KIF: 2bd28f6c15e5b448d578668586acc8c3fe603f06 - MatomoTracker: 0cba5ef15cfa1fc84b26a8635590cc9d4bfa5494 mgrs-ios: ab6bc20f8c8d34f182a25bfb164e97a19a7492da ogc-api-features-json-ios: b53280f9036da5a7dc1699ea3a6cd90cdff0bfc9 OHHTTPStubs: 90eac6d8f2c18317baeca36698523dc67c513831 @@ -129,6 +123,6 @@ SPEC CHECKSUMS: SWXMLHash: dd733a457e9c4fe93b1538654057aefae4acb382 tiff-ios: 1ad6750cd8bb3db75bd2977e40145813389786b9 -PODFILE CHECKSUM: c881ed42289b9a0fb361c6cb95d1810b7d0cb43d +PODFILE CHECKSUM: 2e8aaa797c4616c95ade6938862095dfaa7ade5e COCOAPODS: 1.16.2 diff --git a/Marlin/Resources/Settings.bundle/Acknowledgements.plist b/Marlin/Resources/Settings.bundle/Acknowledgements.plist index 357f85c3..b786390c 100644 --- a/Marlin/Resources/Settings.bundle/Acknowledgements.plist +++ b/Marlin/Resources/Settings.bundle/Acknowledgements.plist @@ -12,20 +12,6 @@ Type PSGroupSpecifier - - FooterText - Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - License - MIT - Title - MatomoTracker - Type - PSGroupSpecifier - FooterText