react-native 0.72.14 → 0.72.17

package/Libraries/Core/ReactNativeVersion.js

@@ -12,6 +12,6 @@
 exports.version = {
   major: 0,
   minor: 72,
-  patch: 14,
+  patch: 17,
   prerelease: null,
 };

package/React/Base/RCTVersion.m

@@ -23,7 +23,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
     __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(72),
-                  RCTVersionPatch: @(14),
+                  RCTVersionPatch: @(17),
                   RCTVersionPrerelease: [NSNull null],
                   };
   });

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.72.14
+VERSION_NAME=0.72.17
 GROUP=com.facebook.react
 
 # JVM Versions

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -17,6 +17,6 @@ public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
       "minor", 72,
-      "patch", 14,
+      "patch", 17,
       "prerelease", null);
 }

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -17,7 +17,7 @@ namespace facebook::react {
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 72;
-  int32_t Patch = 14;
+  int32_t Patch = 17;
   std::string_view Prerelease = "";
 } ReactNativeVersion;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.72.14",
+  "version": "0.72.17",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",

package/scripts/cocoapods/privacy_manifest_utils.rb

@@ -0,0 +1,170 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+module PrivacyManifestUtils
+    def self.add_aggregated_privacy_manifest(installer)
+        user_project = get_user_project_from(installer)
+        targets = get_application_targets(user_project)
+        file_path = get_privacyinfo_file_path(user_project, targets)
+
+        privacy_info = read_privacyinfo_file(file_path) || {
+            "NSPrivacyCollectedDataTypes" => [],
+            "NSPrivacyTracking" => false
+        }
+
+        # Get all required reason APIs defined in current pods
+        required_reason_apis = get_used_required_reason_apis(installer)
+
+        # Add the Required Reason APIs from React Native core
+        get_core_accessed_apis.each do |accessed_api|
+            api_type = accessed_api["NSPrivacyAccessedAPIType"]
+            reasons = accessed_api["NSPrivacyAccessedAPITypeReasons"]
+            required_reason_apis[api_type] ||= []
+            required_reason_apis[api_type] += reasons
+        end
+
+        # Merge the Required Reason APIs from pods with the ones from the existing PrivacyInfo file
+        (privacy_info["NSPrivacyAccessedAPITypes"] || []).each do |accessed_api|
+            api_type = accessed_api["NSPrivacyAccessedAPIType"]
+            reasons = accessed_api["NSPrivacyAccessedAPITypeReasons"]
+            # Add reasons from existing PrivacyInfo file to the ones from pods
+            required_reason_apis[api_type] ||= []
+            required_reason_apis[api_type] += reasons
+        end
+
+        # Update the existing PrivacyInfo file with the new aggregated data
+        privacy_info["NSPrivacyAccessedAPITypes"] = required_reason_apis.map { |api_type, reasons|
+            {
+            "NSPrivacyAccessedAPIType" => api_type,
+            "NSPrivacyAccessedAPITypeReasons" => reasons.uniq
+            }
+        }
+
+        Xcodeproj::Plist.write_to_path(privacy_info, file_path)
+
+        targets.each do |target|
+            ensure_reference(file_path, user_project, target)
+        end
+    end
+
+    def self.get_application_targets(user_project)
+        return user_project.targets.filter { |t| t.symbol_type == :application }
+    end
+
+    def self.read_privacyinfo_file(file_path)
+        # Maybe add missing default NSPrivacyTracking, NSPrivacyTrackingDomains, NSPrivacyCollectedDataTypes, but this works without those keys
+        source_data = nil
+        # Try to read an existing PrivacyInfo.xcprivacy file
+        begin
+            source_data = Xcodeproj::Plist.read_from_path(file_path)
+            Pod::UI.puts "[Privacy Manifest Aggregation] Appending aggregated reasons to existing PrivacyInfo.xcprivacy file."
+        rescue => e
+            Pod::UI.puts "[Privacy Manifest Aggregation] No existing PrivacyInfo.xcprivacy file found, creating a new one."
+        end
+        return source_data
+    end
+
+    def self.ensure_reference(file_path, user_project, target)
+        reference_exists = target.resources_build_phase.files_references.any? { |file_ref| file_ref.path&.end_with? "PrivacyInfo.xcprivacy" }
+        unless reference_exists
+            # We try to find the main group, but if it doesn't exist, we default to adding the file to the project root – both work
+            file_root = user_project.root_object.main_group.children.first { |group| group.name == target.name } || user_project
+            file_ref = file_root.new_file(file_path)
+            build_file = target.resources_build_phase.add_file_reference(file_ref, true)
+        end
+    end
+
+    def self.get_privacyinfo_file_path(user_project, targets)
+        file_refs = targets.flat_map { |target| target.resources_build_phase.files_references }
+        existing_file = file_refs.find { |file_ref| file_ref.path&.end_with? "PrivacyInfo.xcprivacy" }
+        if existing_file
+            return existing_file.real_path
+        end
+        # We try to find a file we know exists in the project to get the path to the main group directory
+        info_plist_path = user_project.files.find { |file_ref| file_ref.name == "Info.plist" }
+        if info_plist_path.nil?
+            # return path that is sibling to .xcodeproj
+            path = user_project.path
+            return File.join(File.dirname(path), "PrivacyInfo.xcprivacy")
+        end
+        return File.join(File.dirname(info_plist_path.real_path),"PrivacyInfo.xcprivacy")
+    end
+
+    def self.get_used_required_reason_apis(installer)
+        # A dictionary with keys of type string (NSPrivacyAccessedAPIType) and values of type string[] (NSPrivacyAccessedAPITypeReasons[])
+        used_apis = {}
+        Pod::UI.puts "[Privacy Manifest Aggregation] Reading .xcprivacy files to aggregate all used Required Reason APIs."
+        installer.pod_targets.each do |pod_target|
+            # puts pod_target
+            pod_target.file_accessors.each do |file_accessor|
+            file_accessor.resource_bundles.each do |bundle_name, bundle_files|
+                bundle_files.each do |file_path|
+                # This needs to be named like that due to apple requirements
+                if File.basename(file_path) == 'PrivacyInfo.xcprivacy'
+                    content = Xcodeproj::Plist.read_from_path(file_path)
+                    accessed_api_types = content["NSPrivacyAccessedAPITypes"]
+                    accessed_api_types&.each do |accessed_api|
+                      api_type = accessed_api["NSPrivacyAccessedAPIType"]
+                      reasons = accessed_api["NSPrivacyAccessedAPITypeReasons"]
+                      next unless api_type
+                      used_apis[api_type] ||= []
+                      used_apis[api_type] += reasons
+                    end
+                end
+                end
+            end
+            end
+        end
+        return used_apis
+    end
+
+    def self.get_privacy_manifest_paths_from(user_project)
+        privacy_manifests = user_project
+            .files
+            .select { |p|
+                p.path&.end_with?('PrivacyInfo.xcprivacy')
+            }
+        return privacy_manifests
+    end
+
+    def self.get_core_accessed_apis()
+        file_timestamp_accessed_api = {
+            "NSPrivacyAccessedAPIType" => "NSPrivacyAccessedAPICategoryFileTimestamp",
+            "NSPrivacyAccessedAPITypeReasons" => ["C617.1"],
+        }
+        user_defaults_accessed_api = {
+            "NSPrivacyAccessedAPIType" => "NSPrivacyAccessedAPICategoryUserDefaults",
+            "NSPrivacyAccessedAPITypeReasons" => ["CA92.1"],
+        }
+        boot_time_accessed_api = {
+            "NSPrivacyAccessedAPIType" => "NSPrivacyAccessedAPICategorySystemBootTime",
+            "NSPrivacyAccessedAPITypeReasons" => ["35F9.1"],
+        }
+        return [file_timestamp_accessed_api, user_defaults_accessed_api, boot_time_accessed_api]
+    end
+
+
+    def self.get_user_project_from(installer)
+        user_project = installer.aggregate_targets
+                    .map{ |t| t.user_project }
+                    .first
+        return user_project
+    end
+
+    def self.add_privacy_manifest_if_needed(installer)
+        user_project = get_user_project_from(installer)
+        privacy_manifest = self.get_privacy_manifest_paths_from(user_project).first
+        if privacy_manifest.nil?
+            privacy_manifest = {
+                "NSPrivacyCollectedDataTypes" => [],
+                "NSPrivacyTracking" => false,
+                "NSPrivacyAccessedAPITypes" => get_core_accessed_apis
+            }
+            path = File.join(user_project.path.parent, "PrivacyInfo.xcprivacy")
+            Xcodeproj::Plist.write_to_path(privacy_manifest, path)
+            Pod::UI.puts "Your app does not have a privacy manifest! A template has been generated containing Required Reasons API usage in the core React Native library. Please add the PrivacyInfo.xcprivacy file to your project and complete data use, tracking and any additional required reasons your app is using according to Apple's guidance: https://developer.apple.com/documentation/bundleresources/privacy_manifest_files. Then, you will need to manually add this file to your project in Xcode.".red
+        end
+    end
+end

package/scripts/cocoapods/utils.rb

@@ -505,44 +505,6 @@ class ReactNativePodsUtils
         ])
     end
 
-    def self.get_privacy_manifest_paths_from(user_project)
-        privacy_manifests = user_project
-            .files
-            .select { |p|
-                p.path&.end_with?('PrivacyInfo.xcprivacy')
-            }
-        return privacy_manifests
-    end
-
-    def self.add_privacy_manifest_if_needed(installer)
-        user_project = installer.aggregate_targets
-                    .map{ |t| t.user_project }
-                    .first
-        privacy_manifest = self.get_privacy_manifest_paths_from(user_project).first
-        if privacy_manifest.nil?
-            file_timestamp_reason = {
-                "NSPrivacyAccessedAPIType" => "NSPrivacyAccessedAPICategoryFileTimestamp",
-                "NSPrivacyAccessedAPITypeReasons" => ["C617.1"],
-            }
-            user_defaults_reason = {
-                "NSPrivacyAccessedAPIType" => "NSPrivacyAccessedAPICategoryUserDefaults",
-                "NSPrivacyAccessedAPITypeReasons" => ["CA92.1"],
-            }
-            boot_time_reason = {
-                "NSPrivacyAccessedAPIType" => "NSPrivacyAccessedAPICategorySystemBootTime",
-                "NSPrivacyAccessedAPITypeReasons" => ["35F9.1"],
-            }
-            privacy_manifest = {
-                "NSPrivacyCollectedDataTypes" => [],
-                "NSPrivacyTracking" => false,
-                "NSPrivacyAccessedAPITypes" => [file_timestamp_reason, user_defaults_reason, boot_time_reason]
-            }
-            path = File.join(user_project.path.parent, "PrivacyInfo.xcprivacy")
-            Xcodeproj::Plist.write_to_path(privacy_manifest, path)
-            Pod::UI.puts "Your app does not have a privacy manifest! A template has been generated containing Required Reasons API usage in the core React Native library. Please add the PrivacyInfo.xcprivacy file to your project and complete data use, tracking and any additional required reasons your app is using according to Apple's guidance: https://developer.apple.com/.../privacy_manifest_files. Then, you will need to manually add this file to your project in Xcode.".red
-        end
-    end
-
     def self.react_native_pods
         return [
             "DoubleConversion",

package/scripts/react_native_pods.rb

@@ -16,6 +16,7 @@ require_relative './cocoapods/utils.rb'
 require_relative './cocoapods/new_architecture.rb'
 require_relative './cocoapods/local_podspec_patch.rb'
 require_relative './cocoapods/helpers.rb'
+require_relative './cocoapods/privacy_manifest_utils.rb'
 
 $CODEGEN_OUTPUT_DIR = 'build/generated/ios'
 $CODEGEN_COMPONENT_DIR = 'react/renderer/components'
@@ -74,7 +75,8 @@ def use_react_native! (
   flipper_configuration: FlipperConfiguration.disabled,
   app_path: '..',
   config_file_dir: '',
-  ios_folder: 'ios'
+  ios_folder: 'ios',
+  privacy_file_aggregation_enabled: true
 )
 
   # Set the app_path as env variable so the podspecs can access it.
@@ -93,6 +95,7 @@ def use_react_native! (
   fabric_enabled = fabric_enabled || new_arch_enabled
   ENV['RCT_FABRIC_ENABLED'] = fabric_enabled ? "1" : "0"
   ENV['USE_HERMES'] = hermes_enabled ? "1" : "0"
+  ENV['RCT_AGGREGATE_PRIVACY_FILES'] = privacy_file_aggregation_enabled ? "1" : "0"
 
   prefix = path
 
@@ -238,6 +241,8 @@ def react_native_post_install(
   if ReactNativePodsUtils.has_pod(installer, 'Flipper')
     flipper_post_install(installer)
   end
+  
+  privacy_file_aggregation_enabled = ENV['RCT_AGGREGATE_PRIVACY_FILES'] == '1'
 
   fabric_enabled = ReactNativePodsUtils.has_pod(installer, 'React-Fabric')
 
@@ -249,7 +254,12 @@ def react_native_post_install(
   ReactNativePodsUtils.apply_xcode_15_patch(installer)
   ReactNativePodsUtils.updateIphoneOSDeploymentTarget(installer)
   ReactNativePodsUtils.fix_flipper_for_xcode_15_3(installer)
-  ReactNativePodsUtils.add_privacy_manifest_if_needed(installer)
+
+  if privacy_file_aggregation_enabled
+    PrivacyManifestUtils.add_aggregated_privacy_manifest(installer)
+  else
+    PrivacyManifestUtils.add_privacy_manifest_if_needed(installer)
+  end
 
   NewArchitectureHelper.set_clang_cxx_language_standard_if_needed(installer)
   is_new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == "1"

package/template/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "react": "18.2.0",
-    "react-native": "0.72.14"
+    "react-native": "0.72.17"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",