pod-builder 5.1.1 → 5.1.2

data/lib/pod_builder/command/build_swiftmodules.rb

@@ -0,0 +1,123 @@
+require "pod_builder/core"
+require "json"
+
+module PodBuilder
+  module Command
+    class CompileSwiftModules
+      def self.call
+        Configuration.check_inited
+
+        Podfile.sanity_check()
+
+        puts "Loading Podfile".yellow
+
+        quiet = OPTIONS.fetch(:quiet, false)
+
+        install_update_repo = OPTIONS.fetch(:update_repos, true)
+        installer, analyzer = Analyze.installer_at(PodBuilder::basepath, install_update_repo)
+
+        all_buildable_items = Analyze.podfile_items(installer, analyzer)
+
+        iphoneos_sdk_path = `xcrun --sdk iphoneos --show-sdk-path`.strip
+        sim_sdk_path = `xcrun --sdk iphonesimulator --show-sdk-path`.strip
+
+        swiftinterfaces_paths = Dir.glob("#{PodBuilder::git_rootpath}/**/*.framework/**/*.swiftinterface").reject { |t| t.include?(".private.") }
+        frameworks_paths = Dir.glob("#{PodBuilder::git_rootpath}/**/*.framework")
+        swiftinterfaces_paths = filter_unexpected_pods_locations(swiftinterfaces_paths)
+        frameworks_paths = filter_unexpected_pods_locations(frameworks_paths)
+
+        all_buildable_items.uniq(&:root_name).map(&:root_name).each do |name|
+          items = all_buildable_items.select { |t| t.root_name == name }
+          module_name = items.first.module_name
+
+          vendored_frameworks = items.map(&:vendored_frameworks).flatten
+
+          deps = items.map { |t| t.recursive_dependencies(all_buildable_items) }.flatten
+          vendored_frameworks += deps.map(&:vendored_frameworks).flatten
+          deps.uniq! { |t| t.root_name }
+
+          swiftinterfaces_and_arch_for_module(module_name, swiftinterfaces_paths).each do |dep_swiftinterface_path, arch|
+            swiftmodule_dest = "#{File.dirname(dep_swiftinterface_path)}/#{arch}.swiftmodule"
+            if File.exist?(swiftmodule_dest) && !OPTIONS.has_key?(:force_rebuild)
+              puts "Swiftmodule exists, skipping #{dep_swiftinterface_path}".magenta if !quiet
+              next
+            end
+
+            puts "Processing #{dep_swiftinterface_path}".yellow if !quiet
+
+            frameworks_search_paths = []
+            deps.each do |dep|
+              frameworks_search_paths << framework_path_for_module_name(dep.module_name, arch, swiftinterfaces_paths, frameworks_paths)
+            end
+            vendored_frameworks.each do |vendored_framework|
+              frameworks_search_paths << framework_path_for_module_name(File.basename(vendored_framework, ".*"), arch, swiftinterfaces_paths, frameworks_paths)
+            end
+            frameworks_search_paths_arg = frameworks_search_paths.compact.map { |t| "-F '#{File.dirname(t)}'" }.join(" ")
+
+            sdk_path = arch.include?("simulator") ? sim_sdk_path : iphoneos_sdk_path
+            cmd = "" "swiftc -frontend \
+                      -compile-module-from-interface \
+                      -enable-library-evolution \
+                      -import-underlying-module \
+                      -sdk '#{sdk_path}' \
+                      -Fsystem '#{sdk_path}/System/Library/Frameworks/' \
+                      -module-name #{module_name} \
+                      #{frameworks_search_paths_arg} \
+                      -o '#{swiftmodule_dest}'  \
+                      '#{dep_swiftinterface_path}'
+                      " ""
+
+            unless system(cmd)
+              puts "Failed generating swiftmodules for #{module_name} and arch #{arch}".red
+            end
+          end
+        end
+
+        puts "\n\n🎉 done!\n".green
+        return 0
+      end
+
+      def self.swiftinterfaces_and_arch_for_module(module_name, swiftinterfaces_paths)
+        swiftinterfaces_paths.select { |t| t.include?("/#{module_name}.xcframework") }.map { |t| [t, File.basename(t, ".*")] }
+      end
+
+      def self.framework_path_for_module_name(module_name, arch, swiftinterfaces_paths, frameworks_paths)
+        quiet = OPTIONS.fetch(:quiet, false)
+
+        if (path = swiftinterfaces_paths.detect { |t| t.include?("/#{module_name}.framework/Modules/#{module_name}.swiftmodule/#{arch}") }) &&
+           (match = path.match(/(.*#{module_name}.framework)/)) && match&.size == 2
+          return match[1]
+        end
+
+        archs = arch.split("-").reject { |t| ["apple", "ios"].include?(t) }
+        frameworks_paths = frameworks_paths.select { |t| t.include?("#{module_name}.framework") }
+
+        frameworks_paths.select! { |t| t.include?("-simulator/") == arch.include?("simulator") }
+        frameworks_paths.select! { |t| t.include?("/ios-") } # currently we support only iOS xcframeworks
+        frameworks_paths.reject! { |t| t.include?("maccatalyst/") } # currently we do not support catalyst xcframeworks
+
+        frameworks_paths.select! { |t| archs.any? { |u| t.include?(u) } }
+
+        if frameworks_paths.count == 1
+          return frameworks_paths[0]
+        end
+
+        puts "Failed determining framework for #{module_name}" unless quiet
+        return nil
+      end
+
+      def self.filter_unexpected_pods_locations(paths)
+        # A project might contain multiple /Pods/ folders in subprojects. We should extract only those related to the PodBuilder project
+        paths.reject { |t| t.include?("/Pods/") && !t.include?(PodBuilder::project_path) }
+      end
+    end
+  end
+end
+
+class Pod::Specification
+  public
+
+  def defined_in_folder
+    File.dirname(defined_in_file)
+  end
+end

data/lib/pod_builder/command/init.rb

@@ -1,4 +1,4 @@
-require 'pod_builder/core'
+require "pod_builder/core"
 
 module PodBuilder
   module Command
@@ -11,7 +11,7 @@ module PodBuilder
         raise "\n\nToo many xcworkspaces found in current folder\n#{xcworkspace}\n".red if xcworkspace.count > 1
 
         Configuration.project_name = File.basename(xcworkspace.first, ".*")
-        
+
         OPTIONS[:prebuild_path] ||= Configuration.base_path
 
         if File.expand_path(OPTIONS[:prebuild_path]) != OPTIONS[:prebuild_path] # if not absolute
@@ -30,8 +30,8 @@ module PodBuilder
         FileUtils.cp(project_podfile_path, prebuilt_podfile_path)
 
         podfile_content = File.read(prebuilt_podfile_path)
-        
-        podfile_content = Podfile.add_configuration_load_block(podfile_content)        
+
+        podfile_content = Podfile.add_configuration_load_block(podfile_content)
         podfile_content = Podfile.add_install_block(podfile_content)
         podfile_content = Podfile.update_path_entries(podfile_content, Init.method(:podfile_path_transform))
         podfile_content = Podfile.update_project_entries(podfile_content, Init.method(:podfile_path_transform))
@@ -52,7 +52,7 @@ module PodBuilder
         return 0
       end
 
-      private 
+      private
 
       def self.write_gitignore
         source_path_rel_path = "Sources"
@@ -65,17 +65,17 @@ module PodBuilder
                        Configuration.lldbinit_name,
                        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
 
       def self.write_gitattributes
         git_attributes = ["#{Configuration.prebuilt_info_filename} binary"]
-        
+
         File.write("#{OPTIONS[:prebuild_path]}/.gitattributes", git_attributes.join("\n"))
       end
 
@@ -85,15 +85,15 @@ module PodBuilder
         original_basepath = PodBuilder::project_path
 
         podfile_base_path = Pathname.new(File.dirname(podfile_path))
-  
+
         original_path = Pathname.new(File.join(original_basepath, path))
         replace_path = original_path.relative_path_from(podfile_base_path)
         if use_absolute_paths
           replace_path = replace_path.expand_path(podfile_base_path)
         end
-  
+
         return replace_path
-      end   
+      end
 
       def self.update_gemfile
         gemfile_path = File.join(PodBuilder::home, "Gemfile")
@@ -112,10 +112,10 @@ module PodBuilder
 
         gemfile_lines.insert(0, source_line)
         gemfile_lines.push(podbuilder_line)
-     
+
         File.write(gemfile_path, gemfile_lines.join("\n"))
 
-        Dir.chdir(PodBuilder::home) do 
+        Dir.chdir(PodBuilder::home) do
           system("bundle")
         end
       end
@@ -131,11 +131,11 @@ module PodBuilder
         raise "\n\nUnexpected number of #{file} found\n".red if paths.count != 1
 
         content = File.read(paths[0])
-        expected_header_search_path_prefix = "s.pod_target_xcconfig    = { \"HEADER_SEARCH_PATHS\" => \""
+        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\\\" ")
-        File.write(paths[0], content)        
+        content.sub!(expected_header_search_path_prefix, "#{expected_header_search_path_prefix}\n  \"$(PODS_ROOT)/Headers/Public/Flipper-Folly\",")
+        File.write(paths[0], content)
 
         # React-CoreModules.podspec
         file = "React-CoreModules.podspec"

data/lib/pod_builder/command.rb

@@ -1,15 +1,16 @@
-require 'pod_builder/command/none'
-require 'pod_builder/command/build'
-require 'pod_builder/command/build_all'
-require 'pod_builder/command/update'
-require 'pod_builder/command/restore_all'
-require 'pod_builder/command/init'
-require 'pod_builder/command/clean'
-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'
+require "pod_builder/command/none"
+require "pod_builder/command/build"
+require "pod_builder/command/build_all"
+require "pod_builder/command/update"
+require "pod_builder/command/restore_all"
+require "pod_builder/command/init"
+require "pod_builder/command/clean"
+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"
+require "pod_builder/command/build_swiftmodules"

data/lib/pod_builder/configuration.rb

@@ -1,8 +1,8 @@
-require 'json'
-require 'tmpdir'
+require "json"
+require "tmpdir"
 
-module PodBuilder  
-  class Configuration  
+module PodBuilder
+  class Configuration
     # Remember to update README.md accordingly
     DEFAULT_BUILD_SETTINGS = {
       "ENABLE_BITCODE" => "NO",
@@ -12,46 +12,46 @@ module PodBuilder
       "CODE_SIGN_IDENTITY" => "",
       "CODE_SIGNING_REQUIRED" => "NO",
       "CODE_SIGN_ENTITLEMENTS" => "",
-      "CODE_SIGNING_ALLOWED" => "NO"
+      "CODE_SIGNING_ALLOWED" => "NO",
     }.freeze
     DEFAULT_SPEC_OVERRIDE = {
       "Google-Mobile-Ads-SDK" => {
-        "module_name": "GoogleMobileAds"
+        "module_name": "GoogleMobileAds",
       },
       "glog" => {
-        "pod_target_xcconfig": { "DEFINES_MODULE": "NO" }
+        "pod_target_xcconfig": { "DEFINES_MODULE": "NO" },
       },
       "DoubleConversion" => {
-        "pod_target_xcconfig": { "DEFINES_MODULE": "NO" }
+        "pod_target_xcconfig": { "DEFINES_MODULE": "NO" },
       },
       "Folly" => {
-        "pod_target_xcconfig": { "DEFINES_MODULE": "NO" }
+        "pod_target_xcconfig": { "DEFINES_MODULE": "NO" },
       },
       "Flipper-DoubleConversion" => {
-        "pod_target_xcconfig": { "DEFINES_MODULE": "NO" }
+        "pod_target_xcconfig": { "DEFINES_MODULE": "NO" },
       },
       "Flipper-Folly" => {
-        "pod_target_xcconfig": { "DEFINES_MODULE": "NO" }
-      }
+        "pod_target_xcconfig": { "DEFINES_MODULE": "NO" },
+      },
     }.freeze
     DEFAULT_BUILD_SETTINGS_OVERRIDES = {
       "SBTUITestTunnelClient" => {
-        "ENABLE_BITCODE": "NO"
-      }
+        "ENABLE_BITCODE": "NO",
+      },
     }.freeze
-    
+
     private_constant :DEFAULT_BUILD_SETTINGS
     private_constant :DEFAULT_BUILD_SETTINGS_OVERRIDES
     private_constant :DEFAULT_SPEC_OVERRIDE
-    
-    class <<self      
+
+    class << self
       attr_accessor :allow_building_development_pods
       attr_accessor :build_settings
       attr_accessor :build_settings_overrides
       attr_accessor :build_system
       attr_accessor :library_evolution_support
       attr_accessor :base_path
-      attr_accessor :spec_overrides      
+      attr_accessor :spec_overrides
       attr_accessor :skip_licenses
       attr_accessor :skip_pods
       attr_accessor :force_prebuild_pods
@@ -75,6 +75,7 @@ module PodBuilder
       attr_accessor :build_xcframeworks_all
       attr_accessor :build_xcframeworks_include
       attr_accessor :build_xcframeworks_exclude
+      attr_accessor :keep_swiftmodules
       attr_accessor :pre_actions
       attr_accessor :post_actions
       attr_accessor :development_team
@@ -116,27 +117,29 @@ module PodBuilder
     @build_xcframeworks_include = []
     @build_xcframeworks_exclude = []
 
+    @keep_swiftmodules = false
+
     @pre_actions = {}
     @post_actions = {}
 
     @development_team = ""
     @development_language = nil
-    
+
     def self.check_inited
       raise "\n\nNot inited, run `pod_builder init`\n".red if podbuilder_path.nil?
     end
-    
+
     def self.exists
       return !config_path.nil? && File.exist?(config_path)
     end
-    
+
     def self.load
       unless podbuilder_path
         return
       end
-      
+
       Configuration.base_path = podbuilder_path
-      
+
       if exists
         begin
           json = JSON.parse(File.read(config_path))
@@ -239,6 +242,11 @@ module PodBuilder
             Configuration.build_xcframeworks_exclude = value
           end
         end
+        if value = json["keep_swiftmodules"]
+          if [TrueClass, FalseClass].include?(value.class)
+            Configuration.keep_swiftmodules = value
+          end
+        end
         if value = json["pre_actions"]
           if value.is_a?(Hash)
             Configuration.pre_actions = PodBuilder::Actions.load(value)
@@ -263,12 +271,12 @@ module PodBuilder
 
         sanity_check()
       end
-      
+
       dev_pods_configuration_path = File.join(Configuration.base_path, Configuration.dev_pods_configuration_filename)
-      
+
       if File.exist?(dev_pods_configuration_path)
         begin
-          json = JSON.parse(File.read(dev_pods_configuration_path))  
+          json = JSON.parse(File.read(dev_pods_configuration_path))
         rescue => exception
           raise "\n\n#{File.basename(dev_pods_configuration_path)} is an invalid JSON\n".red
         end
@@ -282,10 +290,10 @@ module PodBuilder
         lockfile_path = File.join(PodBuilder::home, lockfile_name)
       end
     end
-    
+
     def self.write
       config = {}
-      
+
       config["project_name"] = Configuration.project_name
       config["spec_overrides"] = Configuration.spec_overrides
       config["skip_licenses"] = Configuration.skip_licenses
@@ -304,11 +312,11 @@ module PodBuilder
       config["react_native_project"] = Configuration.react_native_project
       config["development_team"] = Configuration.development_team
       config["development_language"] = Configuration.development_language || "en"
-      
+
       File.write(config_path, JSON.pretty_generate(config))
     end
-    
-    private 
+
+    private
 
     def self.sanity_check
       Configuration.skip_pods.each do |pod|
@@ -322,12 +330,12 @@ module PodBuilder
         raise "\n\nInvalid PodBuilder.json configuration: 'build_xcframeworks_all' is false and 'build_xcframeworks_exclude' is not empty\n".red if Configuration.build_xcframeworks_exclude.count > 0
       end
     end
-    
+
     def self.config_path
       unless path = podbuilder_path
         return nil
       end
-      
+
       return File.join(path, Configuration.configuration_filename)
     end
 
@@ -346,5 +354,5 @@ module PodBuilder
 
       return path
     end
-  end  
+  end
 end