fixup! fix(apple): use JS-based Xcode project generator

Author: tido64

ios/pod_helpers.rb

@@ -50,11 +50,6 @@ def new_architecture_enabled?(options, react_native_version)
   ENV.fetch('RCT_NEW_ARCH_ENABLED', options[:fabric_enabled] ? '1' : '0') != '0'
 end
 
-def package_version(package_path)
-  package_json = JSON.parse(File.read(File.join(package_path, 'package.json')))
-  Gem::Version.new(package_json['version'])
-end
-
 def resolve_module(request, start_dir = Pod::Config.instance.installation_root)
   @module_cache ||= {}
   return @module_cache[request] if @module_cache.key?(request)

ios/test_app.rb

@@ -115,10 +115,7 @@ def resources_pod(project_root, target_platform, platforms)
   Pathname.new(app_dir).relative_path_from(project_root).to_s
 end
 
-def use_react_native!(project_root, react_native, options)
-  version = package_version(react_native.to_s).segments
-  version = v(version[0], version[1], version[2])
-
+def use_react_native!(project_root, react_native, version, options)
   require_relative(react_native_pods(version))
 
   include_react_native!(**options,
@@ -154,7 +151,7 @@ def make_project!(project_root, target_platform, options)
       end
     when 'ReactTestAppTests'
       target.build_configurations.each do |config|
-        project['uitestsBuildSettings'].each do |setting, value|
+        project['testsBuildSettings'].each do |setting, value|
           config.build_settings[setting] = value
         end
       end
@@ -192,17 +189,17 @@ def use_test_app_internal!(target_platform, options)
   xcodeproj = 'ReactTestApp.xcodeproj'
   project_root = Pod::Config.instance.installation_root
   project_target = make_project!(project_root, target_platform, options)
-  xcodeproj_dst, platforms = project_target.values_at(:xcodeproj_path, :platforms)
+  xcodeproj_dst, platforms, react_native_path, react_native_version = project_target.values_at(
+    :xcodeproj_path, :platforms, :react_native_path, :react_native_version
+  )
 
-  if project_target[:use_new_arch] || project_target[:react_native_version] >= v(0, 73, 0)
+  if project_target[:use_new_arch] || react_native_version >= v(0, 73, 0)
     install! 'cocoapods', :deterministic_uuids => false
   end
 
   # As of 0.75, we should use `use_native_modules!` from `react-native` instead
-  if project_target[:react_native_version] < v(0, 75, 0)
-    require_relative(autolink_script_path(project_root,
-                                          project_target[:react_native_path],
-                                          project_target[:react_native_version]))
+  if react_native_version < v(0, 75, 0)
+    require_relative(autolink_script_path(project_root, react_native_path, react_native_version))
   end
 
   begin
@@ -218,7 +215,9 @@ def use_test_app_internal!(target_platform, options)
   react_native_post_install = nil
 
   target 'ReactTestApp' do
-    react_native_post_install = use_react_native!(project_root, project_target[:react_native_path],
+    react_native_post_install = use_react_native!(project_root,
+                                                  react_native_path,
+                                                  react_native_version,
                                                   options)
 
     pod 'ReactNativeHost', :path => resolve_module_relative('@rnx-kit/react-native-host')

test/test_pod_helpers.rb

@@ -77,16 +77,6 @@ def test_new_architecture_enabled?
     ENV.delete('RCT_NEW_ARCH_ENABLED')
   end
 
-  def test_package_version
-    react_native = fixture_path('test_app', 'node_modules', 'react-native')
-
-    assert_equal(Gem::Version.new('1000.0.0'), package_version(react_native))
-
-    cli = fixture_path('test_app', 'node_modules', '@react-native-community', 'cli-platform-ios')
-
-    assert_equal(Gem::Version.new('4.10.1'), package_version(cli))
-  end
-
   def test_use_hermes?
     options = { path: '../node_modules/react-native' }