pod-builder 4.3.0 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e63869c0a451bb9da5d5ecb974125bb7bc7e30a959d4f76f513734dc4cff8d10
-  data.tar.gz: be4e23baac9d74eadc8ef402b6fbc388598dedaaab2bae2f4fdeebe9e96c79f1
+  metadata.gz: f7a2abe8fcb659b07c1a6819579093c791eca94d882888098e65c75c7ea9b260
+  data.tar.gz: f709a74f3bceee3acc9e57817706165c32693fbdc32b777b403c2257f9712889
 SHA512:
-  metadata.gz: 93cee03862ea2a53db8a181b2a37e245618e4c0945322f4bca4e37e1db377daab61cc18ef9057d85ce61f59749f85e33cd14f50fa2438d676b7f842910f4f908
-  data.tar.gz: 8279100eacb50a378422e64595437dc1246d83ac62b49f3bdb5f92e325aa76b1a5220795271880a8b9b5ccf7720d5cd67ccb99d2f0f6d3a882e69962eb3b8baa
+  metadata.gz: cc2172d216372bf012494106b70f93a6aaee0001e493a890067b7206020cb4340015766575f90b5e91ef736e1884dc16f93cd22749ae0cb6e82dce51a8d4fb53
+  data.tar.gz: baea42573bb858669fb0e91b1fc798301e88fee53808baab62247e89e89bdd068f2d11c65d8a5f8f6a64fbd029649fb9c6e93661618ea911851165d4155f0d66

data/lib/pod_builder/command/init.rb

@@ -65,6 +65,10 @@ module PodBuilder
                        source_path_rel_path,
                        development_pods_config_rel_path]
         
+        if Configuration.react_native_project
+          git_ignores.push("build/")
+        end
+        
         File.write("#{OPTIONS[:prebuild_path]}/.gitignore", git_ignores.join("\n"))
       end
 
@@ -141,7 +145,7 @@ module PodBuilder
         expected_header_search_path_prefix = "\"HEADER_SEARCH_PATHS\" => \""
         raise "\n\nExpected header search path entry not found\n".red unless content.include?(expected_header_search_path_prefix)
 
-        content.sub!(expected_header_search_path_prefix, "#{expected_header_search_path_prefix}\\\"$(PODS_ROOT)/Headers/Public/Flipper-Folly\\\" ")
+        content.sub!(expected_header_search_path_prefix, "#{expected_header_search_path_prefix}\\\"$(PODS_ROOT)/Headers/Public/Flipper-Folly\\\" \\\"$(PODS_ROOT)/../build/generated/ios\\\" ")
         File.write(paths[0], content)
       end
     end

data/lib/pod_builder/core.rb

@@ -176,6 +176,9 @@ module PodBuilder
     end
 
     PodBuilder::safe_rm_rf(basepath("Pods"))
+    if Configuration.react_native_project
+      PodBuilder::safe_rm_rf(basepath("build"))
+    end
   end
 
   def self.system_swift_version

data/lib/pod_builder/install.rb

@@ -198,8 +198,6 @@ module PodBuilder
       gitignored_files = PodBuilder::gitignoredfiles
       
       swift_version = PodBuilder::system_swift_version
-
-      write_prebuilt_info_filename_gitattributes
       
       ret = Hash.new
       root_names = podfile_items.reject(&:is_prebuilt).map(&:root_name).uniq
@@ -406,7 +404,7 @@ module PodBuilder
 
       # Now copy
       non_prebuilt_items.each do |item|
-        source_path = PodBuilder::buildpath_prebuiltpath(item.module_name)
+        source_path = PodBuilder::buildpath_prebuiltpath(item.root_name)
 
         unless File.directory?(source_path)
           puts "Prebuilt items for #{item.root_name} not found".blue
@@ -441,14 +439,6 @@ module PodBuilder
         FileUtils.cp_r(PodBuilder::buildpath_dsympath, PodBuilder::basepath)
       end
     end
-
-    def self.write_prebuilt_info_filename_gitattributes
-      gitattributes_path = PodBuilder::basepath(".gitattributes")
-      expected_attributes = ["#{Configuration.configuration_filename} binary"].join
-      unless File.exists?(gitattributes_path) && File.read(gitattributes_path).include?(expected_attributes)
-        File.write(gitattributes_path, expected_attributes, mode: 'a')
-      end
-    end
         
     def self.build_folder_hash_in_prebuilt_info_file(podfile_item)
       prebuilt_info_path = PodBuilder::prebuiltpath(File.join(podfile_item.root_name, Configuration.prebuilt_info_filename))

data/lib/pod_builder/podfile.rb

@@ -727,6 +727,15 @@ module PodBuilder
 
     def self.prepare_react_native_compilation_workarounds(podfile_content)
       return  podfile_content + """
+
+def prepare_rn_react_codegen
+  # Beginning with version 0.68.0 react native project compilation relies on some autogenerated files
+  # that are added to the React-Codegen target
+  source_path = \"#{PodBuilder::project_path}/build/generated/ios/.\"
+  destination_path = \"#{PodBuilder::basepath}/build/generated/ios\"
+  FileUtils.cp_r(source_path, destination_path)
+end
+
 def prepare_rn_compilation_libevent
   path = \"Pods/libevent/include/event.h\"
   replace(path, \"#include <evutil.h>\", \"// #include <evutil.h>\")
@@ -745,11 +754,46 @@ def replace(path, find, replace)
     content = File.read(path).gsub(find, replace)
     File.write(path, content)
   end
-end      
+end  
+
+pre_install do |installer|
+  require 'json'
+
+  pods_path = \"#{PodBuilder::project_path}/Pods\"
+  j = JSON.parse(File.read(\"\#{pods_path}/Local Podspecs/FBReactNativeSpec.podspec.json\"))  
+  
+  output_files = j.dig(\"script_phases\", \"output_files\")
+
+  script_lines = j.dig(\"script_phases\", \"script\").split(\"\\n\")
+  script_lines.insert(0, \"export SCRIPT_OUTPUT_FILE_0=\\\"\#{output_files[0]}\\\"\")
+  script_lines.insert(0, \"export DERIVED_FILE_DIR=/tmp\")
+  script_lines.insert(0, \"export PODS_TARGET_SRCROOT=\\\"#{PodBuilder::project_path}/../node_modules/react-native/React/FBReactNativeSpec\\\"\")
+  script_lines.insert(0, \"export PODS_ROOT=\\\"\#{pods_path}\\\"\")
+  
+  Dir.chdir(pods_path) do
+    cmd = script_lines.reject(&:blank?).join(\";\\n\")
+    system(cmd)
+  end
+end
 
 post_install do |installer|
   prepare_rn_compilation_libevent()
   prepare_rn_flipper_module_redefinition()
+  prepare_rn_react_codegen()
+
+  installer.pods_project.targets.each do |target|
+      target.build_configurations.each do |config|
+          if target.name == 'React-Codegen'
+            config.build_settings['HEADER_SEARCH_PATHS'] = config.build_settings.fetch('HEADER_SEARCH_PATHS', []) + ['$(inherited)', '${PODS_ROOT}/Flipper-Folly', '${PODS_ROOT}/React-Core/ReactCommon', '$(PODS_ROOT)/React-Core/ReactCommon/react/renderer/graphics/platform/cxx', '$(PODS_ROOT)/React-Codegen/build/generated/ios']
+          end
+          if target.name == 'React-Core'
+            config.build_settings['HEADER_SEARCH_PATHS'] = config.build_settings.fetch('HEADER_SEARCH_PATHS', []) + ['$(inherited)', '${PODS_ROOT}/Flipper-Folly']
+          end
+          if target.name == 'React-CoreModules'
+            config.build_settings['HEADER_SEARCH_PATHS'] = config.build_settings.fetch('HEADER_SEARCH_PATHS', []) + ['$(inherited)', '${PODS_ROOT}/Flipper-Folly', '$(PODS_ROOT)/../build/generated/ios']
+          end
+      end
+  end
 end
       """
     end

data/lib/pod_builder/podfile_item.rb

@@ -375,12 +375,13 @@ module PodBuilder
     def entry(include_version = true, include_pb_entry = true)
       e = "pod '#{@name}'"
 
+      e_suffix = ""
       if !is_prebuilt && inhibit_warnings
-        e += ", :inhibit_warnings => true"
+        e_suffix = ", :inhibit_warnings => true"
       end
 
       unless include_version
-        return e
+        return e + e_suffix
       end
 
       if is_external
@@ -406,6 +407,8 @@ module PodBuilder
         e += ", '=#{@version}'"  
       end
 
+      e += e_suffix
+
       if include_pb_entry && !is_prebuilt
         prebuilt_info_path = PodBuilder::prebuiltpath("#{root_name}/#{Configuration::prebuilt_info_filename}")
         if File.exist?(prebuilt_info_path)

data/lib/pod_builder/rome/post_install.rb

@@ -360,6 +360,7 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
 
     built_items = Dir.glob("#{build_dir}/#{xcodebuild_settings[0].platform_name}.xcarchive/Products/Library/Frameworks/*").reject { |t| File.basename(t, ".*") == "Pods_DummyTarget" }
 
+    specs = installer_context.umbrella_targets.map(&:specs).flatten
     built_items.each do |built_item|      
       built_item_paths = [built_item]
       xcodebuild_settings.drop(1).each do |xcodebuild_setting|
@@ -374,8 +375,12 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
 
       next if built_item_paths.count == 0
 
-      framework_name = File.basename(built_item_paths.first, ".*")
-      xcframework_path = "#{base_destination}/#{framework_name}/#{framework_name}.xcframework"
+      module_name = File.basename(built_item_paths.first, ".*")
+      spec = specs.detect { |t| t.module_name == module_name }
+
+      next if spec.nil?
+
+      xcframework_path = "#{base_destination}/#{spec.name}/#{module_name}.xcframework"
       framework_params = built_item_paths.map { |t| "-framework '#{t}'"}.join(" ")
       raise "\n\nFailed packing xcframework!\n".red if !system("xcodebuild -create-xcframework #{framework_params} -output '#{xcframework_path}' > /dev/null 2>&1")      
 
@@ -383,7 +388,7 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
         xcodebuild_settings.each do |xcodebuild_setting|
           dsym_source = "#{build_dir}/#{xcodebuild_setting.platform_name}.xcarchive/dSYMs/"
           if File.directory?(dsym_source)
-            destination = sandbox_root.parent + "dSYMs"
+            destination = PodBuilder::buildpath_dsympath
             FileUtils.mkdir_p(destination)
             FileUtils.mv(dsym_source, destination)
             FileUtils.mv("#{destination}/dSYMs", "#{destination}/#{xcodebuild_setting.platform_name}")
@@ -438,7 +443,7 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
     if enable_dsym
       dsym_source = "#{build_dir}/dSYM"
       if File.directory?(dsym_source)
-        FileUtils.mv(dsym_source, sandbox_root.parent)
+        FileUtils.mv(dsym_source, PodBuilder::buildpath_dsympath)
       end
     else
       raise "\n\nNot implemented\n".red

data/lib/pod_builder/version.rb

@@ -1,3 +1,3 @@
 module PodBuilder
-  VERSION = "4.3.0"
+  VERSION = "4.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.2
 platform: ruby
 authors:
 - Tomas Camin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-01 00:00:00.000000000 Z
+date: 2022-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler