Skip to content

Commit 5c68811

Browse files
authored
Fix Privacy Manifests, Add To Xcode Targets (Alamofire#3831)
### Goals ⚽ The privacy manifest implementation from Alamofire#3792 was incorrect (thought I had checked it) and breaks the package. This fixes the packages and adds the manifest to the raw framework targets as well.
1 parent 7eb1842 commit 5c68811

File tree

5 files changed

+26
-6
lines changed

5 files changed

+26
-6
lines changed

Alamofire.xcodeproj/project.pbxproj

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 63;
6+
objectVersion = 56;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -414,6 +414,11 @@
414414
31BADE4E2439A8D1007D2AB9 /* CombineTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31BADE4D2439A8D1007D2AB9 /* CombineTests.swift */; };
415415
31BADE4F2439A8D1007D2AB9 /* CombineTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31BADE4D2439A8D1007D2AB9 /* CombineTests.swift */; };
416416
31BADE502439A8D1007D2AB9 /* CombineTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31BADE4D2439A8D1007D2AB9 /* CombineTests.swift */; };
417+
31BC5E7B2B7E9D520069BDEF /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 0AEC95C92AF5419400CD241A /* PrivacyInfo.xcprivacy */; };
418+
31BC5E7C2B7E9D5F0069BDEF /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 0AEC95C92AF5419400CD241A /* PrivacyInfo.xcprivacy */; };
419+
31BC5E7D2B7E9D660069BDEF /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 0AEC95C92AF5419400CD241A /* PrivacyInfo.xcprivacy */; };
420+
31BC5E7E2B7E9D6D0069BDEF /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 0AEC95C92AF5419400CD241A /* PrivacyInfo.xcprivacy */; };
421+
31BC5E7F2B7E9D730069BDEF /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 0AEC95C92AF5419400CD241A /* PrivacyInfo.xcprivacy */; };
417422
31C2B0EA20B271040089BA7C /* CacheTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C341BB91B1A865A00C1B34D /* CacheTests.swift */; };
418423
31C2B0EB20B271050089BA7C /* CacheTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C341BB91B1A865A00C1B34D /* CacheTests.swift */; };
419424
31C2B0EC20B271060089BA7C /* CacheTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C341BB91B1A865A00C1B34D /* CacheTests.swift */; };
@@ -691,6 +696,7 @@
691696
31B3DE4E25C120D800760641 /* ConcurrencyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConcurrencyTests.swift; sourceTree = "<group>"; };
692697
31B51E8B2434FECB005356DB /* RequestModifierTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestModifierTests.swift; sourceTree = "<group>"; };
693698
31BADE4D2439A8D1007D2AB9 /* CombineTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CombineTests.swift; sourceTree = "<group>"; };
699+
31BC5E792B7E75770069BDEF /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "[email protected]"; sourceTree = "<group>"; };
694700
31D83FCD20D5C29300D93E47 /* URLConvertible+URLRequestConvertible.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URLConvertible+URLRequestConvertible.swift"; sourceTree = "<group>"; };
695701
31DADDFA224811ED0051390F /* AlamofireExtended.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlamofireExtended.swift; sourceTree = "<group>"; };
696702
31ED52E61D73889D00199085 /* AFError+AlamofireTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "AFError+AlamofireTests.swift"; sourceTree = "<group>"; };
@@ -983,6 +989,14 @@
983989
path = Features;
984990
sourceTree = "<group>";
985991
};
992+
31BC5E782B7E75760069BDEF /* Frameworks */ = {
993+
isa = PBXGroup;
994+
children = (
995+
31BC5E792B7E75770069BDEF /* [email protected] */,
996+
);
997+
name = Frameworks;
998+
sourceTree = "<group>";
999+
};
9861000
31EF4BF4279646000048A19D /* Test Plans */ = {
9871001
isa = PBXGroup;
9881002
children = (
@@ -1161,6 +1175,7 @@
11611175
F8111E3519A95C8B0040E7D1 /* Source */,
11621176
F8111E3F19A95C8B0040E7D1 /* Tests */,
11631177
F8111E3419A95C8B0040E7D1 /* Products */,
1178+
31BC5E782B7E75760069BDEF /* Frameworks */,
11641179
);
11651180
indentWidth = 4;
11661181
sourceTree = "<group>";
@@ -1468,7 +1483,6 @@
14681483
Base,
14691484
);
14701485
mainGroup = F8111E2919A95C8B0040E7D1;
1471-
minimizedProjectReferenceProxies = 1;
14721486
productRefGroup = F8111E3419A95C8B0040E7D1 /* Products */;
14731487
projectDirPath = "";
14741488
projectRoot = "";
@@ -1530,6 +1544,7 @@
15301544
isa = PBXResourcesBuildPhase;
15311545
buildActionMask = 2147483647;
15321546
files = (
1547+
31BC5E7F2B7E9D730069BDEF /* PrivacyInfo.xcprivacy in Resources */,
15331548
);
15341549
runOnlyForDeploymentPostprocessing = 0;
15351550
};
@@ -1575,6 +1590,7 @@
15751590
isa = PBXResourcesBuildPhase;
15761591
buildActionMask = 2147483647;
15771592
files = (
1593+
31BC5E7D2B7E9D660069BDEF /* PrivacyInfo.xcprivacy in Resources */,
15781594
);
15791595
runOnlyForDeploymentPostprocessing = 0;
15801596
};
@@ -1620,20 +1636,23 @@
16201636
isa = PBXResourcesBuildPhase;
16211637
buildActionMask = 2147483647;
16221638
files = (
1639+
31BC5E7C2B7E9D5F0069BDEF /* PrivacyInfo.xcprivacy in Resources */,
16231640
);
16241641
runOnlyForDeploymentPostprocessing = 0;
16251642
};
16261643
E4202FDC1B667AA100C997FB /* Resources */ = {
16271644
isa = PBXResourcesBuildPhase;
16281645
buildActionMask = 2147483647;
16291646
files = (
1647+
31BC5E7E2B7E9D6D0069BDEF /* PrivacyInfo.xcprivacy in Resources */,
16301648
);
16311649
runOnlyForDeploymentPostprocessing = 0;
16321650
};
16331651
F8111E3119A95C8B0040E7D1 /* Resources */ = {
16341652
isa = PBXResourcesBuildPhase;
16351653
buildActionMask = 2147483647;
16361654
files = (
1655+
31BC5E7B2B7E9D520069BDEF /* PrivacyInfo.xcprivacy in Resources */,
16371656
);
16381657
runOnlyForDeploymentPostprocessing = 0;
16391658
};

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ let package = Package(name: "Alamofire",
3737
targets: [.target(name: "Alamofire",
3838
path: "Source",
3939
exclude: ["Info.plist"],
40+
resources: [.copy("PrivacyInfo.xcprivacy")],
4041
linkerSettings: [.linkedFramework("CFNetwork",
4142
.when(platforms: [.iOS,
4243
.macOS,
4344
.tvOS,
44-
.watchOS]))]
45-
resources: [.copy("PrivacyInfo.xcprivacy")]),
45+
.watchOS]))]),
4646
.testTarget(name: "AlamofireTests",
4747
dependencies: ["Alamofire"],
4848
path: "Tests",

[email protected]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ let package = Package(name: "Alamofire",
3636
],
3737
targets: [.target(name: "Alamofire",
3838
path: "Source",
39-
exclude: ["Info.plist"],
39+
exclude: ["Info.plist", "PrivacyInfo.xcprivacy"],
4040
linkerSettings: [.linkedFramework("CFNetwork",
4141
.when(platforms: [.iOS,
4242
.macOS,

[email protected]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ let package = Package(name: "Alamofire",
3636
],
3737
targets: [.target(name: "Alamofire",
3838
path: "Source",
39-
exclude: ["Info.plist"],
39+
exclude: ["Info.plist", "PrivacyInfo.xcprivacy"],
4040
linkerSettings: [.linkedFramework("CFNetwork",
4141
.when(platforms: [.iOS,
4242
.macOS,

[email protected]

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ let package = Package(name: "Alamofire",
3737
targets: [.target(name: "Alamofire",
3838
path: "Source",
3939
exclude: ["Info.plist"],
40+
resources: [.copy("PrivacyInfo.xcprivacy")],
4041
linkerSettings: [.linkedFramework("CFNetwork",
4142
.when(platforms: [.iOS,
4243
.macOS,

0 commit comments

Comments
 (0)