pod-builder 4.4.0 → 4.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9251bdb4914c0a4974426de85c7e66fbdd8f614db41ae376834b1fed4bdb6565
-  data.tar.gz: 04126b48df0bcfcc10269bd33ff0ea1731cbeb1b12fcdef306dad4fd59efcd49
+  metadata.gz: 1ce4f8ed01f414eae4049301ada8917ab64473de0100f57687e6a6b091ee10f6
+  data.tar.gz: db1a4206f1eb68e3281bb896cfac29e5e5c9217cf430f507e89bda6fb936af41
 SHA512:
-  metadata.gz: f985c18756f4c1bf0fe71b1f1d039a7f0ecfe2032648f3d2f2437d5139e9b9001dfd07d63dbf9cfdb56005267c49547bcd8faf28fdc6b1f5a2e15819ec368699
-  data.tar.gz: 3bffc37c735676923ec3649580503413423f4acb0f9bcc0c460cb7484efde64756531a6d2cc7d6361466fee78586c2a87465fc5db68fb569a088e3b2c52b065f
+  metadata.gz: e9347b71f5502f7a4969e583e5074eacbf7ae57feadb9d832f23fd6f5eb405087f11c0e308d72b78258a22026ba15a282cd6e3b549727b31eb202a1d2f5480d4
+  data.tar.gz: 8803048b4c022e71dfd129325f22ad8d8f49a698f831fe3ec1af9224a630f50f3dbc3cba308a20a6ec764c2da23be23a3b24c870498d0b0a510d98392926419e

data/README.md

@@ -71,6 +71,7 @@ PodBuilder comes with a rich set of commands:
 - `restore_all`: rebuilts all pods declared in the Restore-Podfile file
 - `install_sources`: installs sources of pods to debug into prebuild frameworks
 - `switch`: switch between prebuilt, development or standard pod in the Application-Podfile
+- `switch_all`: switch all pods between prebuilt, development or standard in the Application-Podfile
 - `clean`: removes unused prebuilt frameworks, dSYMs and source files added by install_sources
 - `sync_podfile`: updates the Application-Podfile with all pods declared in the PodBuilder-Podfile file
 - `info`: outputs json-formatted information reflecting the current status of prebuilt pods
@@ -158,6 +159,10 @@ To support development pods you should specify the path(s) that contain the pods
 
 PodBuilder will automatically determine the proper path when switching a particular pod.
 
+#### `switch_all` command
+
+As `switch` but will switch all pods defined in PodBuilder-Podfile.
+
 #### `clean` command
 
 Deletes all unused files by PodBuilder, including .frameworks, .dSYMs and _Source_ repos.

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/command/switch.rb

@@ -9,7 +9,22 @@ module PodBuilder
         PodBuilder::prepare_basepath
         
         argument_pods = ARGV.dup
-        
+        switch_all = argument_pods.first == "*"
+
+        if switch_all
+          pods = []
+          podspecs = Dir.glob("#{PodBuilder::prebuiltpath}/**/*.podspec")
+          podspecs.each do |podspec|
+            spec = Pod::Specification.from_file(podspec)
+            podname = spec.attributes_hash["name"]
+            pods.push(podname)
+          end
+          argument_pods = pods
+          if OPTIONS[:switch_mode] == "development"
+              argument_pods.reject! { |pod_name| self.find_podspec(pod_name).nil? }
+          end
+        end
+
         unless argument_pods.count > 0 
           return -1
         end
@@ -235,7 +250,7 @@ module PodBuilder
           if Pathname.new(path).relative?
             path = PodBuilder::basepath(path)
           end
-          podspec_paths = Dir.glob(File.expand_path("#{path}/**/#{podname}*.podspec*"))
+          podspec_paths = Dir.glob(File.expand_path("#{path}/**/#{podname}.podspec"))
           podspec_paths.select! { |t| !t.include?("/Local Podspecs/") }
           podspec_paths.select! { |t| Dir.glob(File.join(File.dirname(t), "*")).count > 1 } # exclude podspec folder (which has one file per folder)
           if podspec_paths.count > 1

data/lib/pod_builder/command/switch_all.rb

@@ -0,0 +1,15 @@
+require 'pod_builder/core'
+
+module PodBuilder
+  module Command
+    class SwitchAll
+      def self.call
+        Configuration.check_inited
+        PodBuilder::prepare_basepath
+
+        ARGV << "*"
+        return Command::Switch::call
+      end
+    end
+  end
+end

data/lib/pod_builder/command.rb

@@ -9,6 +9,7 @@ require 'pod_builder/command/deintegrate'
 require 'pod_builder/command/generate_podspec'
 require 'pod_builder/command/install_sources'
 require 'pod_builder/command/switch'
+require 'pod_builder/command/switch_all'
 require 'pod_builder/command/sync_podfile'
 require 'pod_builder/command/info'
 require 'pod_builder/command/generate_lldbinit'

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
@@ -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/version.rb

@@ -1,3 +1,3 @@
 module PodBuilder
-  VERSION = "4.4.0"
+  VERSION = "4.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.3
 platform: ruby
 authors:
 - Tomas Camin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2022-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -197,6 +197,7 @@ files:
 - lib/pod_builder/command/none.rb
 - lib/pod_builder/command/restore_all.rb
 - lib/pod_builder/command/switch.rb
+- lib/pod_builder/command/switch_all.rb
 - lib/pod_builder/command/sync_podfile.rb
 - lib/pod_builder/command/update.rb
 - lib/pod_builder/configuration.rb