Skip to content

Commit ace2907

Browse files
maxepmaxep
committed
RUM-3291 Fix resource bundle collision
1 parent 2847390 commit ace2907

File tree

10 files changed

+57
-9
lines changed

10 files changed

+57
-9
lines changed

‎DatadogCore.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Pod::Spec.new do |s|
2424
"DatadogCore/Private/**/*.{h,m}"]
2525

2626
s.resource_bundle = {
27-
"DatadogPrivacyInfo" => "DatadogCore/Resources/PrivacyInfo.xcprivacy"
27+
"DatadogCore" => "DatadogCore/Resources/PrivacyInfo.xcprivacy"
2828
}
2929

3030
s.dependency 'DatadogInternal', s.version.to_s

‎DatadogCrashReporting.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ Pod::Spec.new do |s|
2626
s.dependency 'PLCrashReporter', '~> 1.11.1'
2727

2828
s.resource_bundle = {
29-
"DatadogPrivacyInfo" => "DatadogCrashReporting/Resources/PrivacyInfo.xcprivacy"
29+
"DatadogCrashReporting" => "DatadogCrashReporting/Resources/PrivacyInfo.xcprivacy"
3030
}
3131
end

‎DatadogRUM.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
2323
s.source_files = ["DatadogRUM/Sources/**/*.swift"]
2424

2525
s.resource_bundle = {
26-
"DatadogPrivacyInfo" => "DatadogRUM/Resources/PrivacyInfo.xcprivacy"
26+
"DatadogRUM" => "DatadogRUM/Resources/PrivacyInfo.xcprivacy"
2727
}
2828

2929
s.dependency 'DatadogInternal', s.version.to_s

‎DatadogSDKCrashReporting.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ Pod::Spec.new do |s|
2929
s.dependency 'PLCrashReporter', '~> 1.11.1'
3030

3131
s.resource_bundle = {
32-
"DatadogPrivacyInfo" => "DatadogCrashReporting/Resources/PrivacyInfo.xcprivacy"
32+
"DatadogCrashReporting" => "DatadogCrashReporting/Resources/PrivacyInfo.xcprivacy"
3333
}
3434
end

‎dependency-manager-tests/carthage/App/PrivacyInfo.xcprivacy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
4-
<dict/>
4+
<dict>
5+
<key>NSPrivacyCollectedDataTypes</key>
6+
<array/>
7+
</dict>
58
</plist>

‎dependency-manager-tests/cocoapods/App/PrivacyInfo.xcprivacy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
4-
<dict/>
4+
<dict>
5+
<key>NSPrivacyCollectedDataTypes</key>
6+
<array/>
7+
</dict>
58
</plist>

‎dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,7 @@
447447
61B8C30026E0E278006EDF53 /* Frameworks */,
448448
61B8C30126E0E278006EDF53 /* Resources */,
449449
31384BB2056A865F3ED23F38 /* [CP] Embed Pods Frameworks */,
450+
A242A29C234C1DB8379AA6B1 /* [CP] Copy Pods Resources */,
450451
);
451452
buildRules = (
452453
);
@@ -539,6 +540,7 @@
539540
D245424827C8D3200039E0A6 /* Frameworks */,
540541
D245424A27C8D3200039E0A6 /* Resources */,
541542
D245424D27C8D3200039E0A6 /* [CP] Embed Pods Frameworks */,
543+
3BA7B0D961097BC82E5E9018 /* [CP] Copy Pods Resources */,
542544
);
543545
buildRules = (
544546
);
@@ -787,6 +789,23 @@
787789
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Common-App Dynamic iOS/Pods-Common-App Dynamic iOS-frameworks.sh\"\n";
788790
showEnvVarsInLog = 0;
789791
};
792+
3BA7B0D961097BC82E5E9018 /* [CP] Copy Pods Resources */ = {
793+
isa = PBXShellScriptBuildPhase;
794+
buildActionMask = 2147483647;
795+
files = (
796+
);
797+
inputFileListPaths = (
798+
"${PODS_ROOT}/Target Support Files/Pods-Common-App Dynamic tvOS/Pods-Common-App Dynamic tvOS-resources-${CONFIGURATION}-input-files.xcfilelist",
799+
);
800+
name = "[CP] Copy Pods Resources";
801+
outputFileListPaths = (
802+
"${PODS_ROOT}/Target Support Files/Pods-Common-App Dynamic tvOS/Pods-Common-App Dynamic tvOS-resources-${CONFIGURATION}-output-files.xcfilelist",
803+
);
804+
runOnlyForDeploymentPostprocessing = 0;
805+
shellPath = /bin/sh;
806+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Common-App Dynamic tvOS/Pods-Common-App Dynamic tvOS-resources.sh\"\n";
807+
showEnvVarsInLog = 0;
808+
};
790809
5645FD027BB938478818FE88 /* [CP] Check Pods Manifest.lock */ = {
791810
isa = PBXShellScriptBuildPhase;
792811
buildActionMask = 2147483647;
@@ -848,6 +867,23 @@
848867
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
849868
showEnvVarsInLog = 0;
850869
};
870+
A242A29C234C1DB8379AA6B1 /* [CP] Copy Pods Resources */ = {
871+
isa = PBXShellScriptBuildPhase;
872+
buildActionMask = 2147483647;
873+
files = (
874+
);
875+
inputFileListPaths = (
876+
"${PODS_ROOT}/Target Support Files/Pods-Common-App Dynamic iOS/Pods-Common-App Dynamic iOS-resources-${CONFIGURATION}-input-files.xcfilelist",
877+
);
878+
name = "[CP] Copy Pods Resources";
879+
outputFileListPaths = (
880+
"${PODS_ROOT}/Target Support Files/Pods-Common-App Dynamic iOS/Pods-Common-App Dynamic iOS-resources-${CONFIGURATION}-output-files.xcfilelist",
881+
);
882+
runOnlyForDeploymentPostprocessing = 0;
883+
shellPath = /bin/sh;
884+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Common-App Dynamic iOS/Pods-Common-App Dynamic iOS-resources.sh\"\n";
885+
showEnvVarsInLog = 0;
886+
};
851887
CC86EE069424642723D0C2E2 /* [CP] Copy Pods Resources */ = {
852888
isa = PBXShellScriptBuildPhase;
853889
buildActionMask = 2147483647;

‎dependency-manager-tests/spm/App/PrivacyInfo.xcprivacy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
4-
<dict/>
4+
<dict>
5+
<key>NSPrivacyCollectedDataTypes</key>
6+
<array/>
7+
</dict>
58
</plist>

‎dependency-manager-tests/spm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ create-src-from-xcodeproj:
2424
rm -rf SPMProject.xcodeproj.src
2525
cp -r SPMProject.xcodeproj SPMProject.xcodeproj.src
2626
rm SPMProject.xcodeproj.src/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
27-
sed "s|\"${GIT_REFERENCE}\"|GIT_REFERENCE|g" SPMProject.xcodeproj/project.pbxproj > SPMProject.xcodeproj.src/project.pbxproj
27+
sed "s|${GIT_REFERENCE}|GIT_REFERENCE|g" SPMProject.xcodeproj/project.pbxproj > SPMProject.xcodeproj.src/project.pbxproj
2828
@echo "OK 👌"

‎dependency-manager-tests/xcframeworks/App/PrivacyInfo.xcprivacy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
4-
<dict/>
4+
<dict>
5+
<key>NSPrivacyCollectedDataTypes</key>
6+
<array/>
7+
</dict>
58
</plist>

0 commit comments

Comments
 (0)