Skip to content
This repository was archived by the owner on Jul 10, 2025. It is now read-only.

Commit f04764e

Browse files
jwmcdougalljwmcdougall
committed
Removed AlamoFire, KingFisher, MatomoTracker and OHTTPSubs Cocoapods and replaced them with SPM
1 parent 6987a95 commit f04764e

5 files changed

Lines changed: 118 additions & 119 deletions

File tree

‎Marlin/Marlin.xcodeproj/project.pbxproj‎

Lines changed: 80 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
/* Begin PBXBuildFile section */
1010
7982FB9B536447055E423E94 /* libPods-Marlin.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B0F14076A8393C9747AD1FE /* libPods-Marlin.a */; };
1111
A802E4EC2DA6D09C00DF213F /* ExceptionCatcher in Frameworks */ = {isa = PBXBuildFile; productRef = A802E4EB2DA6D09C00DF213F /* ExceptionCatcher */; };
12+
A88BF6C82DC11A1300C548F2 /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = A88BF6C72DC11A1300C548F2 /* Alamofire */; };
13+
A88BF6CB2DC11A2100C548F2 /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = A88BF6CA2DC11A2100C548F2 /* Kingfisher */; };
14+
A88BF6CE2DC11A4300C548F2 /* MatomoTracker in Frameworks */ = {isa = PBXBuildFile; productRef = A88BF6CD2DC11A4300C548F2 /* MatomoTracker */; };
15+
A88BF6D12DC11A6600C548F2 /* OHHTTPStubs in Frameworks */ = {isa = PBXBuildFile; productRef = A88BF6D02DC11A6600C548F2 /* OHHTTPStubs */; };
16+
A88BF6D32DC11A6600C548F2 /* OHHTTPStubsSwift in Frameworks */ = {isa = PBXBuildFile; productRef = A88BF6D22DC11A6600C548F2 /* OHHTTPStubsSwift */; };
1217
D6353EA32B68376100444D24 /* SearchProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6353EA22B68376100444D24 /* SearchProvider.swift */; };
1318
D6353EA52B683B9300444D24 /* NativeSearchProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6353EA42B683B9300444D24 /* NativeSearchProvider.swift */; };
1419
D6353EAA2B6955E200444D24 /* SearchProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6353EA92B6955E200444D24 /* SearchProviderTests.swift */; };
@@ -471,8 +476,8 @@
471476
F76EE1C02B928CBD001128EB /* DifferentialGPSStationCoreDataDataSourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F76EE1A92B928CBD001128EB /* DifferentialGPSStationCoreDataDataSourceTests.swift */; };
472477
F76EE1C12B928CBD001128EB /* DifferentialGPSStationRepositoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F76EE1AA2B928CBD001128EB /* DifferentialGPSStationRepositoryTests.swift */; };
473478
F76EE1C22B928CBD001128EB /* DifferentialGPSStationRemoteDataSourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F76EE1AB2B928CBD001128EB /* DifferentialGPSStationRemoteDataSourceTests.swift */; };
474-
F77671CB2B34D5930026DD50 /* (null) in Sources */ = {isa = PBXBuildFile; };
475-
F77671CD2B34D75A0026DD50 /* (null) in Sources */ = {isa = PBXBuildFile; };
479+
F77671CB2B34D5930026DD50 /* BuildFile in Sources */ = {isa = PBXBuildFile; };
480+
F77671CD2B34D75A0026DD50 /* BuildFile in Sources */ = {isa = PBXBuildFile; };
476481
F7830BFB2A8AB3FE008376F7 /* Route+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7830BFA2A8AB3FE008376F7 /* Route+CoreDataClass.swift */; };
477482
F7830BFD2A8AB6E1008376F7 /* RouteList.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7830BFC2A8AB6E1008376F7 /* RouteList.swift */; };
478483
F7830BFF2A8BC9F8008376F7 /* GeoPackageExportButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7830BFE2A8BC9F8008376F7 /* GeoPackageExportButton.swift */; };
@@ -1391,9 +1396,14 @@
13911396
isa = PBXFrameworksBuildPhase;
13921397
buildActionMask = 2147483647;
13931398
files = (
1399+
A88BF6CE2DC11A4300C548F2 /* MatomoTracker in Frameworks */,
13941400
F730DFC42A99000D0051775C /* GeoJSON in Frameworks */,
1401+
A88BF6C82DC11A1300C548F2 /* Alamofire in Frameworks */,
1402+
A88BF6D12DC11A6600C548F2 /* OHHTTPStubs in Frameworks */,
13951403
A802E4EC2DA6D09C00DF213F /* ExceptionCatcher in Frameworks */,
1404+
A88BF6D32DC11A6600C548F2 /* OHHTTPStubsSwift in Frameworks */,
13961405
7982FB9B536447055E423E94 /* libPods-Marlin.a in Frameworks */,
1406+
A88BF6CB2DC11A2100C548F2 /* Kingfisher in Frameworks */,
13971407
);
13981408
runOnlyForDeploymentPostprocessing = 0;
13991409
};
@@ -3439,6 +3449,11 @@
34393449
packageProductDependencies = (
34403450
F730DFC32A99000D0051775C /* GeoJSON */,
34413451
A802E4EB2DA6D09C00DF213F /* ExceptionCatcher */,
3452+
A88BF6C72DC11A1300C548F2 /* Alamofire */,
3453+
A88BF6CA2DC11A2100C548F2 /* Kingfisher */,
3454+
A88BF6CD2DC11A4300C548F2 /* MatomoTracker */,
3455+
A88BF6D02DC11A6600C548F2 /* OHHTTPStubs */,
3456+
A88BF6D22DC11A6600C548F2 /* OHHTTPStubsSwift */,
34423457
);
34433458
productName = "Marlin (iOS)";
34443459
productReference = F7A54CB22848149700E5F565 /* Marlin.app */;
@@ -3476,6 +3491,10 @@
34763491
packageReferences = (
34773492
F730DFC22A99000D0051775C /* XCRemoteSwiftPackageReference "GeoJSON" */,
34783493
A802E4EA2DA6D09C00DF213F /* XCRemoteSwiftPackageReference "ExceptionCatcher" */,
3494+
A88BF6C62DC11A1200C548F2 /* XCRemoteSwiftPackageReference "Alamofire" */,
3495+
A88BF6C92DC11A2100C548F2 /* XCRemoteSwiftPackageReference "Kingfisher" */,
3496+
A88BF6CC2DC11A4300C548F2 /* XCRemoteSwiftPackageReference "matomo-sdk-ios" */,
3497+
A88BF6CF2DC11A6600C548F2 /* XCRemoteSwiftPackageReference "OHHTTPStubs" */,
34793498
);
34803499
productRefGroup = F7A54CB32848149700E5F565 /* Products */;
34813500
projectDirPath = "";
@@ -3888,7 +3907,7 @@
38883907
F7D5C05B28A6B458000C2C29 /* StructureImage.swift in Sources */,
38893908
F7222FB82B6D7D2700C3E4F1 /* NoticeToMarinersRemoteDataSource.swift in Sources */,
38903909
F76EE0F32B9233E3001128EB /* ModuRouteSheetView.swift in Sources */,
3891-
F77671CB2B34D5930026DD50 /* (null) in Sources */,
3910+
F77671CB2B34D5930026DD50 /* BuildFile in Sources */,
38923911
F7830BFF2A8BC9F8008376F7 /* GeoPackageExportButton.swift in Sources */,
38933912
F76EE0E22B913F84001128EB /* CLLocationCoordinate2D+Validation.swift in Sources */,
38943913
F76EE14C2B928A69001128EB /* NavigationalWarningDataFetchOperation.swift in Sources */,
@@ -4195,7 +4214,7 @@
41954214
F7D8FA232924394900E7D0A1 /* NTMGraphics.swift in Sources */,
41964215
F7C7CB4D2B9F786B001BF8E0 /* SearchProviderDataDefinition.swift in Sources */,
41974216
F76EE0F82B923461001128EB /* PortRouteSheetView.swift in Sources */,
4198-
F77671CD2B34D75A0026DD50 /* (null) in Sources */,
4217+
F77671CD2B34D75A0026DD50 /* BuildFile in Sources */,
41994218
F715E30F2B766BF400752688 /* DGPSStationGeoPackageExportable.swift in Sources */,
42004219
F71F2B202ACF3CC700DFB5BA /* PublisherExtensions.swift in Sources */,
42014220
F71E3E3A28F49ABE002F2019 /* SearchResultsMap.swift in Sources */,
@@ -4625,6 +4644,38 @@
46254644
version = 2.1.0;
46264645
};
46274646
};
4647+
A88BF6C62DC11A1200C548F2 /* XCRemoteSwiftPackageReference "Alamofire" */ = {
4648+
isa = XCRemoteSwiftPackageReference;
4649+
repositoryURL = "https://github.com/Alamofire/Alamofire.git";
4650+
requirement = {
4651+
kind = upToNextMajorVersion;
4652+
minimumVersion = 5.10.2;
4653+
};
4654+
};
4655+
A88BF6C92DC11A2100C548F2 /* XCRemoteSwiftPackageReference "Kingfisher" */ = {
4656+
isa = XCRemoteSwiftPackageReference;
4657+
repositoryURL = "https://github.com/onevcat/Kingfisher.git";
4658+
requirement = {
4659+
kind = upToNextMajorVersion;
4660+
minimumVersion = 8.3.2;
4661+
};
4662+
};
4663+
A88BF6CC2DC11A4300C548F2 /* XCRemoteSwiftPackageReference "matomo-sdk-ios" */ = {
4664+
isa = XCRemoteSwiftPackageReference;
4665+
repositoryURL = "https://github.com/matomo-org/matomo-sdk-ios";
4666+
requirement = {
4667+
kind = exactVersion;
4668+
version = 7.7.0;
4669+
};
4670+
};
4671+
A88BF6CF2DC11A6600C548F2 /* XCRemoteSwiftPackageReference "OHHTTPStubs" */ = {
4672+
isa = XCRemoteSwiftPackageReference;
4673+
repositoryURL = "https://github.com/AliSoftware/OHHTTPStubs.git";
4674+
requirement = {
4675+
kind = upToNextMajorVersion;
4676+
minimumVersion = 9.1.0;
4677+
};
4678+
};
46284679
F730DFC22A99000D0051775C /* XCRemoteSwiftPackageReference "GeoJSON" */ = {
46294680
isa = XCRemoteSwiftPackageReference;
46304681
repositoryURL = "https://github.com/kiliankoe/GeoJSON.git";
@@ -4641,6 +4692,31 @@
46414692
package = A802E4EA2DA6D09C00DF213F /* XCRemoteSwiftPackageReference "ExceptionCatcher" */;
46424693
productName = ExceptionCatcher;
46434694
};
4695+
A88BF6C72DC11A1300C548F2 /* Alamofire */ = {
4696+
isa = XCSwiftPackageProductDependency;
4697+
package = A88BF6C62DC11A1200C548F2 /* XCRemoteSwiftPackageReference "Alamofire" */;
4698+
productName = Alamofire;
4699+
};
4700+
A88BF6CA2DC11A2100C548F2 /* Kingfisher */ = {
4701+
isa = XCSwiftPackageProductDependency;
4702+
package = A88BF6C92DC11A2100C548F2 /* XCRemoteSwiftPackageReference "Kingfisher" */;
4703+
productName = Kingfisher;
4704+
};
4705+
A88BF6CD2DC11A4300C548F2 /* MatomoTracker */ = {
4706+
isa = XCSwiftPackageProductDependency;
4707+
package = A88BF6CC2DC11A4300C548F2 /* XCRemoteSwiftPackageReference "matomo-sdk-ios" */;
4708+
productName = MatomoTracker;
4709+
};
4710+
A88BF6D02DC11A6600C548F2 /* OHHTTPStubs */ = {
4711+
isa = XCSwiftPackageProductDependency;
4712+
package = A88BF6CF2DC11A6600C548F2 /* XCRemoteSwiftPackageReference "OHHTTPStubs" */;
4713+
productName = OHHTTPStubs;
4714+
};
4715+
A88BF6D22DC11A6600C548F2 /* OHHTTPStubsSwift */ = {
4716+
isa = XCSwiftPackageProductDependency;
4717+
package = A88BF6CF2DC11A6600C548F2 /* XCRemoteSwiftPackageReference "OHHTTPStubs" */;
4718+
productName = OHHTTPStubsSwift;
4719+
};
46444720
F730DFC32A99000D0051775C /* GeoJSON */ = {
46454721
isa = XCSwiftPackageProductDependency;
46464722
package = F730DFC22A99000D0051775C /* XCRemoteSwiftPackageReference "GeoJSON" */;

‎Marlin/Marlin.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 37 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Marlin/Podfile‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@ workspace 'Marlin'
55
project 'Marlin.xcodeproj'
66

77
def common_pods
8-
pod "Alamofire"
9-
pod "Kingfisher"
108
pod 'geopackage-ios'
119
pod 'mgrs-ios'
1210
pod 'gars-ios'
1311
pod 'SwiftLint'
14-
pod 'MatomoTracker', '~> 7.5'
1512
pod 'SWXMLHash', '~> 7'
1613
pod 'SwiftUIIntrospect'
1714
end
@@ -21,8 +18,6 @@ target 'Marlin' do
2118
target 'MarlinTests' do
2219
inherit! :search_paths
2320
common_pods
24-
pod 'OHHTTPStubs'
25-
pod 'OHHTTPStubs/Swift'
2621
pod 'KIF', :modular_headers => true, :git => 'https://github.com/kif-framework/KIF.git', :branch => 'jmartin/collection-view-cell-enumeration-assert'
2722
end
2823
end

‎Marlin/Podfile.lock‎

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
PODS:
2-
- Alamofire (5.9.1)
32
- color-ios (1.0.2)
43
- crs-ios (1.0.5)
54
- gars-ios (1.1.5):
@@ -17,29 +16,10 @@ PODS:
1716
- KIF (3.9.0):
1817
- KIF/Core (= 3.9.0)
1918
- KIF/Core (3.9.0)
20-
- Kingfisher (7.12.0)
21-
- MatomoTracker (7.7.0):
22-
- MatomoTracker/Core (= 7.7.0)
23-
- MatomoTracker/Core (7.7.0)
2419
- mgrs-ios (1.1.6):
2520
- grid-ios (~> 1.0.7)
2621
- ogc-api-features-json-ios (4.2.5):
2722
- sf-geojson-ios (~> 4.2.5)
28-
- OHHTTPStubs (9.1.0):
29-
- OHHTTPStubs/Default (= 9.1.0)
30-
- OHHTTPStubs/Core (9.1.0)
31-
- OHHTTPStubs/Default (9.1.0):
32-
- OHHTTPStubs/Core
33-
- OHHTTPStubs/JSON
34-
- OHHTTPStubs/NSURLSession
35-
- OHHTTPStubs/OHPathHelpers
36-
- OHHTTPStubs/JSON (9.1.0):
37-
- OHHTTPStubs/Core
38-
- OHHTTPStubs/NSURLSession (9.1.0):
39-
- OHHTTPStubs/Core
40-
- OHHTTPStubs/OHPathHelpers (9.1.0)
41-
- OHHTTPStubs/Swift (9.1.0):
42-
- OHHTTPStubs/Default
4323
- PROJ (9.4.0):
4424
- PROJ-include (~> 9.4.0)
4525
- PROJ-include (9.4.0)
@@ -62,32 +42,23 @@ PODS:
6242
- tiff-ios (4.0.2)
6343

6444
DEPENDENCIES:
65-
- Alamofire
6645
- gars-ios
6746
- geopackage-ios
6847
- KIF (from `https://github.com/kif-framework/KIF.git`, branch `jmartin/collection-view-cell-enumeration-assert`)
69-
- Kingfisher
70-
- MatomoTracker (~> 7.5)
7148
- mgrs-ios
72-
- OHHTTPStubs
73-
- OHHTTPStubs/Swift
7449
- SwiftLint
7550
- SwiftUIIntrospect
7651
- SWXMLHash (~> 7)
7752

7853
SPEC REPOS:
7954
trunk:
80-
- Alamofire
8155
- color-ios
8256
- crs-ios
8357
- gars-ios
8458
- geopackage-ios
8559
- grid-ios
86-
- Kingfisher
87-
- MatomoTracker
8860
- mgrs-ios
8961
- ogc-api-features-json-ios
90-
- OHHTTPStubs
9162
- PROJ
9263
- PROJ-include
9364
- proj-ios
@@ -112,18 +83,14 @@ CHECKOUT OPTIONS:
11283
:git: https://github.com/kif-framework/KIF.git
11384

11485
SPEC CHECKSUMS:
115-
Alamofire: f36a35757af4587d8e4f4bfa223ad10be2422b8c
11686
color-ios: 77715f5f4c5944b3c85396e9263bfa17a1bf2cfd
11787
crs-ios: cd52ed8ad551387cf12bfd4903d503fa1dff48f9
11888
gars-ios: e0d3f6dd775864f42ef7869fef0b3a1b80038695
11989
geopackage-ios: 8a61864c1f6e7433ddcd00854a27e23f78267b20
12090
grid-ios: 4aa398fd164bb8acac9d587cf61016cc6523defb
12191
KIF: aa6be182c63bdee909858a2db9986fbb3847e5bd
122-
Kingfisher: 53a10ea35051a436b5fb626ca2dd8f3144d755e9
123-
MatomoTracker: 0cba5ef15cfa1fc84b26a8635590cc9d4bfa5494
12492
mgrs-ios: ab6bc20f8c8d34f182a25bfb164e97a19a7492da
12593
ogc-api-features-json-ios: b53280f9036da5a7dc1699ea3a6cd90cdff0bfc9
126-
OHHTTPStubs: 90eac6d8f2c18317baeca36698523dc67c513831
12794
PROJ: ca410c9aed8a01baf99746dad3d7c535a2dddaf0
12895
PROJ-include: e7438fba489ea7c636495dc05d197840cdac04da
12996
proj-ios: 2a8ea337e1b728e669bb0845a1bd12fabce6609d
@@ -137,6 +104,6 @@ SPEC CHECKSUMS:
137104
SWXMLHash: dd733a457e9c4fe93b1538654057aefae4acb382
138105
tiff-ios: 1ad6750cd8bb3db75bd2977e40145813389786b9
139106

140-
PODFILE CHECKSUM: 82c811c0ac9a9ce5d673bc6acf1daaa514d11ce1
107+
PODFILE CHECKSUM: 8c25975401b3193ce14558f68302ded9fc989511
141108

142109
COCOAPODS: 1.16.2

0 commit comments

Comments
 (0)