pod-builder 5.1.1 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e761d8fa097790ad9ff4e292ba83ba8e9673b82c21eee69122a8e34063659f0
-  data.tar.gz: 5e31d711b5910b0a5ae1f2667a114f219f7f93614e819d19e255a9864ffa9fcd
+  metadata.gz: 4697670c51ee4a2f1318c9ef8e575fe86b2f231d4ad93447eceff7a42a3578b0
+  data.tar.gz: 8042c9575e6e1a624586fc260b4392a8056514b1060b45ad25307558391c5d83
 SHA512:
-  metadata.gz: 74f2b675929b005266ddb41c0809941dd984cec4f6f4148cdf615c54e6367f34d5d7431c6a140545431f9f6ef30e08eb77efcd4963133134fea6c2089badebc6
-  data.tar.gz: 944835d7249f5ff560af5668ad0798025d32f7172b0d0f40675b7b9b67ae96147ba06483f3ec1a7f061f4eb16e3694e874aeea9862e1717b5276b9e6556beef0
+  metadata.gz: a26bccfca5addf5d447703f28a920daa6f3fe06ce11c6ae96d26a2551d1f7545fd7f8e5737965d93670be9b2876c6a57f021ae33efd356df4cc619821d1b4fb6
+  data.tar.gz: 36c843a5ccbe92a4472272c45fef4f5c9c1d77eecef09831470d4189912e3456265b09307d23a40561b7de4292620502fa2adb59a41897c23d130c25c0b2ed15

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-ruby '3.0.3'
+ruby '3.1.2'
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 

data/exe/pod_builder

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'pod_builder/version'
+require "pod_builder/version"
 
 show_version = ARGV.include?("version") && ARGV.count == 1
 if show_version
@@ -14,14 +14,14 @@ if ENV["DEBUGGING"]
   $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 end
 
-require 'optparse'
-require 'pod_builder/core'
-require 'pod_builder/command'
+require "optparse"
+require "pod_builder/core"
+require "pod_builder/command"
 
-OPTIONS = {}  
+OPTIONS = {}
 
-def parse_commandline()  
-  subcommands = {  
+def parse_commandline()
+  subcommands = {
     "none" => {
       :opts => OptionParser.new do |opts|
         opts.banner = "
@@ -36,6 +36,7 @@ Command:
     + deintegrate                    Deintegrate prebuild folders
     + build                          Build a specific pod declared in the PodBuilder-Podfile
     + build_all                      Build all pods declared in the PodBuilder-Podfile
+    + build_swiftmodules             Rebuild swiftmodules from swiftinterface
     + update                         Rebuild items that are outdated
     + restore_all                    Rebuild all pods declared in the Restore-Podfile
     + install_sources                Install sources of pods to debug into prebuilt items
@@ -53,8 +54,8 @@ Options:
         end
       end,
       :call => [
-        PodBuilder::Command::None
-      ]  
+        PodBuilder::Command::None,
+      ],
     },
 
     "build" => {
@@ -67,7 +68,7 @@ Usage:
       Prebuild the specified CocoaPods pods.
         
 Options:
-"        
+"
         opts.on("-u", "--skip-repo-update", "Skip CocoaPods repo update") do |o|
           OPTIONS[:update_repos] = false
         end
@@ -85,11 +86,11 @@ Options:
         end
       end,
       :call => [
-        PodBuilder::Command::Build
-      ]
+        PodBuilder::Command::Build,
+      ],
     },
 
-    "build_all" => {            
+    "build_all" => {
       :opts => OptionParser.new do |opts|
         opts.banner = "
 Usage:
@@ -99,7 +100,7 @@ Usage:
       Prebuild all pods specified in the PodBuilder-Podfile.
         
 Options:
-"        
+"
         opts.on("-u", "--skip-repo-update", "Skip CocoaPods repo update") do |o|
           OPTIONS[:update_repos] = false
         end
@@ -117,11 +118,37 @@ Options:
         end
       end,
       :call => [
-        PodBuilder::Command::BuildAll
-      ]
+        PodBuilder::Command::BuildAll,
+      ],
     },
 
-    "update" => {            
+    "build_swiftmodules" => {
+      :opts => OptionParser.new do |opts|
+        opts.banner = "
+Usage:
+        
+    $ pod_builder build_swiftmodules [OPTIONS]
+
+      Rebuild swiftmodules from swiftinterfaces
+        
+Options:
+"
+        opts.on("-u", "--skip-repo-update", "Skip CocoaPods repo update") do |o|
+          OPTIONS[:update_repos] = false
+        end
+        opts.on("-f", "--force", "Rebuild swiftmodules even if they already exists") do |o|
+          OPTIONS[:force_rebuild] = true
+        end
+        opts.on("-q", "--quiet", "Reduce verbosity") do |o|
+          OPTIONS[:quiet] = o
+        end
+      end,
+      :call => [
+        PodBuilder::Command::CompileSwiftModules,
+      ],
+    },
+
+    "update" => {
       :opts => OptionParser.new do |opts|
         opts.banner = "
 Usage:
@@ -131,7 +158,7 @@ Usage:
       Rebuild items that are outdated
         
 Options:
-"        
+"
         opts.on("-u", "--skip-repo-update", "Skip CocoaPods repo update") do |o|
           OPTIONS[:update_repos] = false
         end
@@ -146,11 +173,11 @@ Options:
         end
       end,
       :call => [
-        PodBuilder::Command::Update
-      ]
+        PodBuilder::Command::Update,
+      ],
     },
 
-    "restore_all" => {         
+    "restore_all" => {
       :opts => OptionParser.new do |opts|
         opts.banner = "
 Usage:
@@ -160,7 +187,7 @@ Usage:
       Rebuilds all pods to the version specified in the Restore-Podfile.
         
 Options:
-"          
+"
         opts.on("-u", "--skip-repo-update", "Skip CocoaPods repo update") do |o|
           OPTIONS[:update_repos] = false
         end
@@ -169,11 +196,11 @@ Options:
         end
       end,
       :call => [
-        PodBuilder::Command::RestoreAll
-      ]
+        PodBuilder::Command::RestoreAll,
+      ],
     },
 
-    "init" => {            
+    "init" => {
       :opts => OptionParser.new do |opts|
         opts.banner = "
 Usage:
@@ -183,25 +210,25 @@ Usage:
       Initializes PodBuilder.
         
 Options:
-"         
+"
         opts.on("-d", "--destination path", "Prebuilt destination path (default: #{PodBuilder::Configuration.base_path})") do |o|
           OPTIONS[:prebuild_path] = o
         end
       end,
-      :call => [        
-        PodBuilder::Command::Init
-      ]
+      :call => [
+        PodBuilder::Command::Init,
+      ],
     },
 
     "generate_podspec" => {
       :opts => OptionParser.new do |opts|
       end,
-      :call => [        
-        PodBuilder::Command::GeneratePodspec
-      ]
+      :call => [
+        PodBuilder::Command::GeneratePodspec,
+      ],
     },
 
-    "deintegrate" => {           
+    "deintegrate" => {
       :opts => OptionParser.new do |opts|
         opts.banner = "
 Usage:
@@ -211,14 +238,14 @@ Usage:
       Remove PodBuilder from your project.
         
 Options:
-"          
+"
       end,
-      :call => [        
-        PodBuilder::Command::Deintegrate
-      ]
+      :call => [
+        PodBuilder::Command::Deintegrate,
+      ],
     },
 
-    "clean" => {      
+    "clean" => {
       :opts => OptionParser.new do |opts|
         opts.banner = "
 Usage:
@@ -228,17 +255,17 @@ Usage:
       Remove unused prebuild data, dSYM and source folders.
         
 Options:
-"         
+"
         opts.on("-u", "--skip-repo-update", "Skip CocoaPods repo update") do |o|
           OPTIONS[:update_repos] = false
         end
       end,
-      :call => [        
-        PodBuilder::Command::Clean
-      ]
+      :call => [
+        PodBuilder::Command::Clean,
+      ],
     },
 
-    "install_sources" => {         
+    "install_sources" => {
       :opts => OptionParser.new do |opts|
         opts.banner = "
 Usage:
@@ -248,7 +275,7 @@ Usage:
       Install source of prebuilt pods to be able to step into and debug prebuilt's code.
 
 Options:
-"       
+"
         opts.on("-a", "--all", "Install all available sources") do |o|
           OPTIONS[:all] = o
         end
@@ -256,12 +283,12 @@ Options:
           OPTIONS[:no_stdin_available] = o
         end
       end,
-      :call => [        
-        PodBuilder::Command::InstallSources
-      ]
+      :call => [
+        PodBuilder::Command::InstallSources,
+      ],
     },
 
-    "generate_lldbinit" => {         
+    "generate_lldbinit" => {
       :opts => OptionParser.new do |opts|
         opts.banner = "
 Usage:
@@ -277,12 +304,12 @@ Usage:
       source code dependencies to live in the project repo.
 "
       end,
-      :call => [        
-        PodBuilder::Command::UpdateLldbInit
-      ]
+      :call => [
+        PodBuilder::Command::UpdateLldbInit,
+      ],
     },
 
-    "switch" => {      
+    "switch" => {
       :opts => OptionParser.new do |opts|
         opts.banner = "
 Usage:
@@ -292,7 +319,7 @@ Usage:
       Switch integration between prebuilt/development/default pod version. Multiple space separated pods can be passed
         
 Options:
-"        
+"
         opts.on("-p", "--prebuilt", "Use prebuilt") do |o|
           OPTIONS[:switch_mode] = "prebuilt"
         end
@@ -312,12 +339,12 @@ Options:
           OPTIONS[:update_repos] = false
         end
       end,
-      :call => [        
-        PodBuilder::Command::Switch
-      ]
+      :call => [
+        PodBuilder::Command::Switch,
+      ],
     },
 
-    "switch_all" => {      
+    "switch_all" => {
       :opts => OptionParser.new do |opts|
         opts.banner = "
 Usage:
@@ -327,7 +354,7 @@ Usage:
       Switch all pods integration between prebuilt/development/default version.
         
 Options:
-"        
+"
         opts.on("-p", "--prebuilt", "Use prebuilt") do |o|
           OPTIONS[:switch_mode] = "prebuilt"
         end
@@ -347,12 +374,12 @@ Options:
           OPTIONS[:update_repos] = false
         end
       end,
-      :call => [        
-        PodBuilder::Command::SwitchAll
-      ]
+      :call => [
+        PodBuilder::Command::SwitchAll,
+      ],
     },
 
-    "sync_podfile" => {      
+    "sync_podfile" => {
       :opts => OptionParser.new do |opts|
         opts.banner = "
 Usage:
@@ -364,17 +391,17 @@ Usage:
       and you want to integrate it in the project without rebuilding it.
         
 Options:
-"       
+"
         opts.on("-u", "--skip-repo-update", "Skip CocoaPods repo update") do |o|
           OPTIONS[:update_repos] = false
         end
       end,
-      :call => [        
-        PodBuilder::Command::SyncPodfile
-      ]
+      :call => [
+        PodBuilder::Command::SyncPodfile,
+      ],
     },
-    
-    "info" => {      
+
+    "info" => {
       :opts => OptionParser.new do |opts|
         opts.banner = "
 Usage:
@@ -383,20 +410,21 @@ Usage:
 
       Output dependencies and prebuilt informations
         
-"      end,
-      :call => [        
-        PodBuilder::Command::Info
-      ]
-    }      
+"
+      end,
+      :call => [
+        PodBuilder::Command::Info,
+      ],
+    },
   }
-   
+
   argv = ARGV.dup
   if subcommand = subcommands[argv.first]
     ARGV.shift
   else
     subcommand = subcommands["none"]
   end
-   
+
   ret = -1
   show_help = argv.include?("--help") || argv.include?("-h") || argv.count == 0
   if show_help
@@ -406,13 +434,13 @@ Usage:
 
     PodBuilder::add_lockfile
 
-    subcommand[:opts].order!    
+    subcommand[:opts].order!
     subcommand[:call].each do |k|
       if (ret = k.call) && ret == -1
         puts subcommand[:opts].help
       end
     end
-  end    
+  end
 
   return ret
 end

data/lib/pod_builder/command/build.rb

@@ -1,15 +1,15 @@
-require 'pod_builder/core'
+require "pod_builder/core"
 
 module PodBuilder
   module Command
     class Build
-      def self.call 
+      def self.call
         Configuration.check_inited
         PodBuilder::prepare_basepath
 
         argument_pods = ARGV.dup
 
-        unless argument_pods.count > 0 
+        unless argument_pods.count > 0
           return -1
         end
 
@@ -35,16 +35,16 @@ module PodBuilder
           argument_pods.uniq!
         end
 
-        available_argument_pods = argument_pods.select { |x| all_buildable_items.map(&:root_name).include?(x) }     
+        available_argument_pods = argument_pods.select { |x| all_buildable_items.map(&:root_name).include?(x) }
         (argument_pods - available_argument_pods).each { |x|
           puts "'#{x}' not found, skipping".magenta
         }
         argument_pods = available_argument_pods.uniq
-        
+
         Podfile.restore_podfile_clean(all_buildable_items)
 
         restore_file_error = Podfile.restore_file_sanity_check
-  
+
         check_pods_exists(argument_pods, all_buildable_items)
 
         pods_to_build = resolve_pods_to_build(argument_pods, buildable_items)
@@ -62,7 +62,7 @@ module PodBuilder
         check_not_building_development_pods(pods_to_build)
 
         # We need to recursively add dependencies to properly split pods in groups.
-        # Example:        
+        # Example:
         # 1. PodA has a dep to PodB
         # 2. PodB is marked to be built as xcframework
         # 3. We rebuild PodA only (pods_to_build contains only PodA)
@@ -80,9 +80,9 @@ module PodBuilder
 
         check_dependencies_build_configurations(all_buildable_items)
 
-        # When building mixed framwork/xcframeworks pods xcframeworks should be built last 
+        # When building mixed framwork/xcframeworks pods xcframeworks should be built last
         # so that the .xcframework overwrite the .framwork if the same pod needs to be built
-        # in both ways. 
+        # in both ways.
         # For example we might have configured to build onlt PodA as xcframework, another pod
         # PodB has a dependency to PodA. When Building PodB, PodA gets rebuilt as .framework
         # but then PodA gets rebuilt again as .xcframework overwriting the .framework.
@@ -91,15 +91,15 @@ module PodBuilder
         install_using_frameworks = Podfile::install_using_frameworks(analyzer)
         if Configuration.react_native_project
           if install_using_frameworks
-            raise "\n\nOnly static library packaging currently supported for react native projects. Please remove 'use_frameworks!' in #{PodBuilder::basepath("Podfile")}\n".red 
-          end  
+            raise "\n\nOnly static library packaging currently supported for react native projects. Please remove 'use_frameworks!' in #{PodBuilder::basepath("Podfile")}\n".red
+          end
           prepare_defines_modules_override(all_buildable_items)
         else
           unless install_using_frameworks
             raise "\n\nOnly framework packaging currently supported. Please add 'use_frameworks!' at root level (not nested in targets) in #{PodBuilder::basepath("Podfile")}\n".red
-          end  
+          end
         end
-        
+
         build_catalyst = should_build_catalyst(installer)
 
         install_result = InstallResult.new
@@ -112,7 +112,7 @@ module PodBuilder
           # 2. PodB is marked to be built as xcframework -> PodB will be added to pods_to_build_release_xcframework and won't be present in
           # pods_to_build_release and therefore build will fail
           podfile_items = podfile_items.map { |t| t.recursive_dependencies(all_buildable_items) }.flatten.uniq
-          
+
           podfile_content = Podfile.from_podfile_items(podfile_items, analyzer, build_configuration, install_using_frameworks, build_catalyst, podfile_items.first.build_xcframework)
 
           PodBuilder::safe_rm_rf(Configuration.build_path)
@@ -121,9 +121,9 @@ module PodBuilder
           init_git(Configuration.build_path) # this is needed to be able to call safe_rm_rf
 
           Configuration.pre_actions[:build]&.execute()
-          
-          install_result += Install.podfile(podfile_content, podfile_items, argument_pods, podfile_items.first.build_configuration)          
-          
+
+          install_result += Install.podfile(podfile_content, podfile_items, argument_pods, podfile_items.first.build_configuration)
+
           FileUtils.rm_f(PodBuilder::basepath("Podfile.lock"))
 
           Configuration.post_actions[:build]&.execute()
@@ -138,13 +138,13 @@ module PodBuilder
         Podspec::generate(all_buildable_items, analyzer, install_using_frameworks)
 
         builded_pods = podfiles_items.flatten
-        
+
         builded_pods_and_deps = podfiles_items.flatten.map { |t| t.recursive_dependencies(all_buildable_items) }.flatten.uniq
         builded_pods_and_deps.select! { |x| !x.is_prebuilt }
-        
+
         prebuilt_pods_to_install = prebuilt_items.select { |x| argument_pods.include?(x.root_name) }
-        Podfile::write_restorable(builded_pods_and_deps + prebuilt_pods_to_install, all_buildable_items, analyzer)     
-        if !OPTIONS.has_key?(:skip_prebuild_update)   
+        Podfile::write_restorable(builded_pods_and_deps + prebuilt_pods_to_install, all_buildable_items, analyzer)
+        if !OPTIONS.has_key?(:skip_prebuild_update)
           Podfile::write_prebuilt(all_buildable_items, analyzer)
         end
 
@@ -152,7 +152,7 @@ module PodBuilder
 
         if (restore_file_error = restore_file_error) && Configuration.restore_enabled
           puts "\n\n⚠️ Podfile.restore was found invalid and was overwritten. Error:\n #{restore_file_error}".red
-        end        
+        end
 
         puts "\n\n🎉 done!\n".green
         return 0
@@ -161,19 +161,19 @@ module PodBuilder
       private
 
       def self.init_git(path)
-        Dir.chdir(path) do 
+        Dir.chdir(path) do
           system("git init")
         end
-      end  
+      end
 
       def self.should_build_catalyst(installer)
         integrate_targets = installer.podfile.installation_options.integrate_targets
 
         # NOTE:
-        # When `integrate_targets` is false, 
-        # `user_project` is nil and Build Settings cannot be collected, 
+        # When `integrate_targets` is false,
+        # `user_project` is nil and Build Settings cannot be collected,
         # so collect Build Settings from xcodeproj and root xcodeproj defined in the Podfile
-        # ref: 
+        # ref:
         # https://github.com/Subito-it/PodBuilder/issues/39
         #
         if integrate_targets
@@ -181,26 +181,26 @@ module PodBuilder
         else
           # Find all `xcodeproj` in Podfile
           user_projects_build_settings = installer.analysis_result.targets.map { |t|
-            user_project_path = PodBuilder.basepath + '/' + t.target_definition.user_project_path
+            user_project_path = PodBuilder.basepath + "/" + t.target_definition.user_project_path
             project = Xcodeproj::Project.open(user_project_path)
             project.root_object.targets.map { |u| u.build_configuration_list.build_configurations.map { |v| v.build_settings } }
           }
-          .flatten
-          .compact
+            .flatten
+            .compact
 
           # Find root `xcodeproj`
           project = Xcodeproj::Project.open(PodBuilder.find_xcodeproj)
           root_project_build_setting = project
-                                        .root_object
-                                        .targets
-                                        .map { |u| u.build_configuration_list.build_configurations.map { |v| v.build_settings } }
-                                        .flatten
+            .root_object
+            .targets
+            .map { |u| u.build_configuration_list.build_configurations.map { |v| v.build_settings } }
+            .flatten
 
           build_settings = user_projects_build_settings | root_project_build_setting
         end
-        
-        build_catalyst = build_settings.detect { |t| t["SUPPORTS_MACCATALYST"] == "YES" } != nil 
-        
+
+        build_catalyst = build_settings.detect { |t| t["SUPPORTS_MACCATALYST"] == "YES" } != nil
+
         puts "\nTo support Catalyst you should enable 'build_xcframeworks' in PodBuilder.json\n".red if build_catalyst && !Configuration.build_xcframeworks_all
 
         return build_catalyst
@@ -237,7 +237,7 @@ module PodBuilder
 
           remaining_pods = pods - [pod]
           pods_with_common_deps = remaining_pods.select { |x| x.dependency_names.any? { |y| pod_dependency_names.include?(y) && !x.has_common_spec(y) } }
-          
+
           pods_with_unaligned_build_configuration = pods_with_common_deps.select { |x| x.build_configuration != pod.build_configuration }
           pods_with_unaligned_build_configuration.map!(&:name)
 
@@ -246,7 +246,7 @@ module PodBuilder
       end
 
       def self.check_not_building_development_pods(pods)
-        if (development_pods = pods.select { |x| x.is_development_pod }) && development_pods.count > 0 && (OPTIONS[:allow_warnings].nil?  && Configuration.allow_building_development_pods == false && Configuration.react_native_project == false)
+        if (development_pods = pods.select { |x| x.is_development_pod }) && development_pods.count > 0 && (OPTIONS[:allow_warnings].nil? && Configuration.allow_building_development_pods == false && Configuration.react_native_project == false)
           pod_names = development_pods.map(&:name).join(", ")
           raise "\n\nThe following pods are in development mode: `#{pod_names}`, won't proceed building.\n\nYou can ignore this error by passing the `--allow-warnings` flag to the build command\n".red
         end
@@ -263,7 +263,7 @@ module PodBuilder
 
       def self.resolve_pods_to_build(argument_pods, buildable_items)
         pods_to_build = []
-        
+
         pods_to_build = buildable_items.select { |x| argument_pods.include?(x.root_name) }
         pods_to_build += other_subspecs(pods_to_build, buildable_items)
 
@@ -280,7 +280,7 @@ module PodBuilder
         pods_to_build += dependencies
 
         return pods_to_build.uniq
-      end      
+      end
     end
   end
 end