RUM-3291 Fix resource bundle collision

DataDog · Mar 15, 2024 · 1cad71f · 1cad71f
1 parent 2847390
commit 1cad71f
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 5 deletions.
diff --git a/DatadogCore.podspec b/DatadogCore.podspec
@@ -24,7 +24,7 @@ Pod::Spec.new do |s|
                     "DatadogCore/Private/**/*.{h,m}"]
 
   s.resource_bundle = {
-    "DatadogPrivacyInfo" => "DatadogCore/Resources/PrivacyInfo.xcprivacy"
+    "DatadogCore" => "DatadogCore/Resources/PrivacyInfo.xcprivacy"
   }
 
   s.dependency 'DatadogInternal', s.version.to_s

diff --git a/DatadogCrashReporting.podspec b/DatadogCrashReporting.podspec
@@ -26,6 +26,6 @@ Pod::Spec.new do |s|
   s.dependency 'PLCrashReporter', '~> 1.11.1'
 
   s.resource_bundle = {
-    "DatadogPrivacyInfo" => "DatadogCrashReporting/Resources/PrivacyInfo.xcprivacy"
+    "DatadogCrashReporting" => "DatadogCrashReporting/Resources/PrivacyInfo.xcprivacy"
   }
 end
diff --git a/DatadogRUM.podspec b/DatadogRUM.podspec
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
   s.source_files = ["DatadogRUM/Sources/**/*.swift"]
 
   s.resource_bundle = {
-    "DatadogPrivacyInfo" => "DatadogRUM/Resources/PrivacyInfo.xcprivacy"
+    "DatadogRUM" => "DatadogRUM/Resources/PrivacyInfo.xcprivacy"
   }
 
   s.dependency 'DatadogInternal', s.version.to_s

diff --git a/DatadogSDKCrashReporting.podspec b/DatadogSDKCrashReporting.podspec
@@ -29,6 +29,6 @@ Pod::Spec.new do |s|
   s.dependency 'PLCrashReporter', '~> 1.11.1'
 
   s.resource_bundle = {
-    "DatadogPrivacyInfo" => "DatadogCrashReporting/Resources/PrivacyInfo.xcprivacy"
+    "DatadogCrashReporting" => "DatadogCrashReporting/Resources/PrivacyInfo.xcprivacy"
   }
 end
diff --git a/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj b/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj
@@ -447,6 +447,7 @@
 				61B8C30026E0E278006EDF53 /* Frameworks */,
 				61B8C30126E0E278006EDF53 /* Resources */,
 				31384BB2056A865F3ED23F38 /* [CP] Embed Pods Frameworks */,
+				A242A29C234C1DB8379AA6B1 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -539,6 +540,7 @@
 				D245424827C8D3200039E0A6 /* Frameworks */,
 				D245424A27C8D3200039E0A6 /* Resources */,
 				D245424D27C8D3200039E0A6 /* [CP] Embed Pods Frameworks */,
+				3BA7B0D961097BC82E5E9018 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -787,6 +789,23 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Common-App Dynamic iOS/Pods-Common-App Dynamic iOS-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		3BA7B0D961097BC82E5E9018 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Common-App Dynamic tvOS/Pods-Common-App Dynamic tvOS-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Common-App Dynamic tvOS/Pods-Common-App Dynamic tvOS-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Common-App Dynamic tvOS/Pods-Common-App Dynamic tvOS-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		5645FD027BB938478818FE88 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -848,6 +867,23 @@
 			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";
 			showEnvVarsInLog = 0;
 		};
+		A242A29C234C1DB8379AA6B1 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Common-App Dynamic iOS/Pods-Common-App Dynamic iOS-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Common-App Dynamic iOS/Pods-Common-App Dynamic iOS-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Common-App Dynamic iOS/Pods-Common-App Dynamic iOS-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		CC86EE069424642723D0C2E2 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

diff --git a/dependency-manager-tests/spm/Makefile b/dependency-manager-tests/spm/Makefile
@@ -24,5 +24,5 @@ create-src-from-xcodeproj:
 		rm -rf SPMProject.xcodeproj.src
 		cp -r SPMProject.xcodeproj SPMProject.xcodeproj.src
 		rm SPMProject.xcodeproj.src/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
-		sed "s|\"${GIT_REFERENCE}\"|GIT_REFERENCE|g" SPMProject.xcodeproj/project.pbxproj > SPMProject.xcodeproj.src/project.pbxproj
+		sed "s|${GIT_REFERENCE}|GIT_REFERENCE|g" SPMProject.xcodeproj/project.pbxproj > SPMProject.xcodeproj.src/project.pbxproj
 		@echo "OK 👌"