pod-builder 2.3.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bb2a7642ff281371f45e15c62966fd461fc47d79c573d553926e8ac37327b34
-  data.tar.gz: b4ea4ef42a12bdeb1b23a4824c07ecdf7f24d459e2c4ed00a39e3ab664961214
+  metadata.gz: e0cdcd16503f8c363779e6b63a2a7c7ff66cc867a2092c65fb3a8bcb66758cfb
+  data.tar.gz: 199fc74359e90c198cac6e8c5c1ea1e172ae93ffe584ccccf5c8d324cda0f761
 SHA512:
-  metadata.gz: 2b686f329d928e794cf6809eb6c51078692e6e9fdf8f522e345c6bedfc8a1f68fa883613c0e86f7faf202246eb278478a194c60155916996edf24c2b5d3619e2
-  data.tar.gz: 0df40657505a0d8fc5af1319d695929a883ba304acb79ece94caeaaebe454a7285f183f9a2fa9284915a315e1756f077b35f689d73f7b09aa1843b5c602594f8
+  metadata.gz: 42587bceee70997a3a91ab5428945e9e98094500ceafca8a7de957fb60784e9e2bc84d9f823fa7c00866c5910e651aa48ad7b200924163a1d9879df241fcd541
+  data.tar.gz: 60f520d51741fbff7d7216d018266182f4786a5b77c7eec21495d5199752edd850dbafaecd9644217d5bfb7643e41cce88d94b09c271372af2602846cd19db5a

data/README.md

@@ -216,7 +216,7 @@ As an example here we're setting `module_name` in Google's Advertising SDK:
 }
 ```
 
-### `skip_pods`
+#### `skip_pods`
 
 You may want to skip some pods to be prebuilt, you can do that as follows:
 
@@ -229,7 +229,7 @@ You may want to skip some pods to be prebuilt, you can do that as follows:
 ```
 
 
-### `force_prebuild_pods`
+#### `force_prebuild_pods`
 
 You may want to force some pods to be prebuilt, this might be the case for prebuilt ones (pods with a single vendored .framework) which are dependencies of othere pods
 
@@ -244,7 +244,9 @@ You may want to force some pods to be prebuilt, this might be the case for prebu
 
 #### `build_settings`
 
-Xcode build settings to use. You can override the default values which are:
+These settings allow you to specify the build settings to use when compiling prebuilt items. These values won't be reflected in your project once the pod has been built.
+
+You can override the default values which are:
 
 ```json
 {
@@ -280,9 +282,17 @@ Like `build_settings` but per pod. Pod name can also refer to subspec.
 
 Specify which build system to use to compile frameworks. Either `Legacy` (standard build system) or `Latest` (new build system). Default value: `Latest`.
 
-#### `build_xcframeworks`
+#### `build_xcframeworks_all`
+
+Specify if PodBuilder should build all pods as .xcframeworks. Will enable `library_evolution_support`. Default value: false
+
+#### `build_xcframeworks_exclude`
+
+Specify which pods PodBuilder should NOT be built as .xcframeworks when `build_xcframeworks_all` is true. Default value: []
 
-Specify if PodBuilder will build .xcframeworks. Will enable `library_evolution_support`. Default value: false
+#### `build_xcframeworks_include`
+
+Specify which pods PodBuilder should be built as .xcframeworks. Will enable `library_evolution_support`. Default value: []
 
 #### `library_evolution_support`
 
@@ -314,6 +324,22 @@ PodBuilder writes a plist and markdown license files of pods specified in the Po
 
 If you use bundler to pin the version of CocoaPods in your project set this to true. Default false.
 
+#### `post_actions`
+
+Post actions allow to execute custom scripts after a given command (`switch`, `build`) has been performed.
+
+You need to specify a `path` to the executable script which is relative to the _PodBuilder_ folder. Optionally you can also specify whether the command should or should not print the output to stdout/stderr by passing a bool to the `quiet` key (default: false).
+
+```json
+{
+    "post_actions": { 
+                        "switch" : { "path": "post_switch_action.rb", "quiet": true },
+                        "build" : { "path": "post_buil_action.rb", "quiet": false }
+                    }
+}
+```
+
+
 
 # Behind the scenes
 
@@ -327,11 +353,8 @@ The podspec of the Pod you're trying to build doesn't specify the swift_version
 
 ```json
 "spec_overrides": {
-    "Google-Mobile-Ads-SDK": {
-      "module_name": "GoogleMobileAds"
-    },
     "PodWithError": {
-      "swift_version": "5.0"
+      "swift_version": "5.3"
     }
 }
 ```
@@ -357,7 +380,7 @@ Please open an issue here. You may also add the name of the pod to the [`skip_po
 
 # Git LFS
 
-We high encourage to use PodBuilder in combination with Git LFS. Tacking PodBuilder/Prebuilt/**/*.framework/* and PodBuilder/Prebuilt/**/*.a and PodBuilder/dSYM/**/* will ensure that your repo size stays under control with all the benefits of having prebuilt dependencies ready to use.
+We high encourage to use PodBuilder in combination with Git LFS. Tacking `PodBuilder/Prebuilt/**/*.framework/*` and `PodBuilder/Prebuilt/**/*.a` and `PodBuilder/dSYM/**/*` will ensure that your repo size stays under control with all the benefits of having prebuilt dependencies ready to use.
 
 
 # Try it out!

data/exe/pod_builder

@@ -76,9 +76,6 @@ Options:
         opts.on("-w", "--allow-warnings", "Allow warnings") do |o|
           OPTIONS[:allow_warnings] = o
         end
-        opts.on("-r", "--parent-deps", "Include all pods that depend on the specified <PODNAME...>") do |o|
-          OPTIONS[:resolve_parent_dependencies] = true
-        end
         opts.on("-s", "--no-stdin", "Never request interaction with sdtin (e.g. in CI environment)") do |o|
           OPTIONS[:no_stdin_available] = o
         end

data/lib/pod_builder/analyze.rb

@@ -17,19 +17,18 @@ module PodBuilder
         CLAide::Command::PluginManager.loaded_plugins["cocoapods"].push(pluginspec)
       end
 
-      current_dir = Dir.pwd
-      Dir.chdir(path)
-
-      config = Pod::Config.new()
-      installer = Pod::Installer.new(config.sandbox, config.podfile, config.lockfile)
-      installer.repo_update = repo_update
-      installer.update = false 
-
-      installer.prepare
-
-      analyzer = installer.resolve_dependencies
-
-      Dir.chdir(current_dir)
+      installer = nil
+      analyzer = nil
+      Dir.chdir(path) do 
+        config = Pod::Config.new()
+        installer = Pod::Installer.new(config.sandbox, config.podfile, config.lockfile)
+        installer.repo_update = repo_update
+        installer.update = false 
+  
+        installer.prepare
+  
+        analyzer = installer.resolve_dependencies  
+      end
 
       return installer, analyzer
     end

data/lib/pod_builder/command/build.rb

@@ -32,8 +32,6 @@ module PodBuilder
           argument_pods = all_buildable_items.map(&:root_name).uniq
         else
           argument_pods = Podfile::resolve_pod_names(argument_pods, all_buildable_items)
-          deps = all_buildable_items.select { |t| argument_pods.include?(t.root_name) }.map(&:dependency_names).flatten.map { |t| t.split("/").first }
-          argument_pods += deps
           argument_pods.uniq!
         end
 
@@ -43,8 +41,6 @@ module PodBuilder
         }
         argument_pods = available_argument_pods.uniq
         
-        prebuilt_pods_to_install = prebuilt_items.select { |x| argument_pods.include?(x.root_name) }
-
         Podfile.restore_podfile_clean(all_buildable_items)
 
         restore_file_error = Podfile.restore_file_sanity_check
@@ -54,28 +50,53 @@ module PodBuilder
         pods_to_build = resolve_pods_to_build(argument_pods, buildable_items)
         buildable_items -= pods_to_build
 
-        # We need to split pods to build in 3 groups
+        argument_pods += pods_to_build.map(&:root_name)
+        argument_pods.uniq!
+
+        # We need to split pods to build in 4 groups
         # 1. pods to build in release
         # 2. pods to build in debug
+        # 3. pods to build in release as xcframeworks
+        # 4. pods to build in debug as xcframeworks
 
         check_not_building_development_pods(pods_to_build)
 
+        # We need to recursively add dependencies to properly split pods in groups.
+        # 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)
+        # 4. We need to add dependencies recursively so that PodB is is added to pods_to_build_release_xcframework
+        pods_to_build = pods_to_build.map { |t| t.recursive_dependencies(all_buildable_items) }.flatten.uniq
+
         pods_to_build_debug = pods_to_build.select { |x| x.build_configuration == "debug" }
         pods_to_build_release = pods_to_build - pods_to_build_debug
 
+        pods_to_build_debug_xcframework = pods_to_build_debug.select { |x| x.build_xcframework }
+        pods_to_build_debug -= pods_to_build_debug_xcframework
+
+        pods_to_build_release_xcframework = pods_to_build_release.select { |x| x.build_xcframework }
+        pods_to_build_release -= pods_to_build_release_xcframework
+
         check_dependencies_build_configurations(all_buildable_items)
 
-        podfiles_items = [pods_to_build_debug] + [pods_to_build_release]
+        # 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. 
+        # 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.
+        podfiles_items = [pods_to_build_debug] + [pods_to_build_release] + [pods_to_build_debug_xcframework] + [pods_to_build_release_xcframework]
 
         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")}".red 
+            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")}".red
+            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
         
@@ -84,11 +105,17 @@ module PodBuilder
         install_result = InstallResult.new
         podfiles_items.reject { |x| x.empty? }.each do |podfile_items|
           build_configuration = podfile_items.map(&:build_configuration).uniq.first
-          
+
+          # We need to recursively find dependencies again because some of the required dependencies might have been moved to a separate group
+          # Example:
+          # 1. PodA has a dep to PodB
+          # 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, Configuration.build_xcframeworks)
           
-          install_result += Install.podfile(podfile_content, podfile_items, podfile_items.first.build_configuration)          
+          podfile_content = Podfile.from_podfile_items(podfile_items, analyzer, build_configuration, install_using_frameworks, build_catalyst, podfile_items.first.build_xcframework)
+          
+          install_result += Install.podfile(podfile_content, podfile_items, argument_pods, podfile_items.first.build_configuration)          
           
           FileUtils.rm_f(PodBuilder::basepath("Podfile.lock"))
         end
@@ -106,6 +133,7 @@ module PodBuilder
         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_prebuilt(all_buildable_items, analyzer)
@@ -119,6 +147,8 @@ module PodBuilder
           puts "\n\n⚠️ Podfile.restore was found invalid and was overwritten. Error:\n #{restore_file_error}".red
         end
 
+        Configuration.post_actions[:build]&.execute()
+
         puts "\n\n🎉 done!\n".green
         return 0
       end
@@ -126,10 +156,41 @@ module PodBuilder
       private
 
       def self.should_build_catalyst(installer)
-        build_settings = installer.analysis_result.targets.map { |t| t.user_project.root_object.targets.map { |u| u.build_configuration_list.build_configurations.map { |v| v.build_settings } } }.flatten
+        integrate_targets = installer.podfile.installation_options.integrate_targets
+
+        # NOTE:
+        # 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: 
+        # https://github.com/Subito-it/PodBuilder/issues/39
+        #
+        if integrate_targets
+          build_settings = installer.analysis_result.targets.map { |t| t.user_project.root_object.targets.map { |u| u.build_configuration_list.build_configurations.map { |v| v.build_settings } } }.flatten
+        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
+            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
+
+          # 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
+
+          build_settings = user_projects_build_settings | root_project_build_setting
+        end
+        
         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
+        puts "\nTo support Catalyst you should enable 'build_xcframeworks' in PodBuilder.json\n".red if build_catalyst && !Configuration.build_xcframeworks_all
 
         return build_catalyst
       end
@@ -151,11 +212,11 @@ module PodBuilder
       end
 
       def self.check_pods_exists(pods, buildable_items)
-        raise "\n\nEmpty Podfile?".red if buildable_items.nil?
+        raise "\n\nEmpty Podfile?\n".red if buildable_items.nil?
 
         buildable_items = buildable_items.map(&:root_name)
         pods.each do |pod|
-          raise "\n\nPod `#{pod}` wasn't found in Podfile.\n\nFound:\n#{buildable_items.join("\n")}\n\n".red if !buildable_items.include?(pod)
+          raise "\n\nPod `#{pod}` wasn't found in Podfile.\n\nFound:\n#{buildable_items.join("\n")}\n".red if !buildable_items.include?(pod)
         end
       end
 
@@ -169,7 +230,7 @@ module PodBuilder
           pods_with_unaligned_build_configuration = pods_with_common_deps.select { |x| x.build_configuration != pod.build_configuration }
           pods_with_unaligned_build_configuration.map!(&:name)
 
-          raise "\n\nDependencies of `#{pod.name}` don't have the same build configuration (#{pod.build_configuration}) of `#{pods_with_unaligned_build_configuration.join(",")}`'s dependencies".red if pods_with_unaligned_build_configuration.count > 0
+          raise "\n\nDependencies of `#{pod.name}` don't have the same build configuration (#{pod.build_configuration}) of `#{pods_with_unaligned_build_configuration.join(",")}`'s dependencies\n".red if pods_with_unaligned_build_configuration.count > 0
         end
       end
 
@@ -200,7 +261,7 @@ module PodBuilder
           if OPTIONS[:allow_warnings]
             puts "\n\n#{warn_message}".yellow
           else
-            raise "\n\n#{warn_message}".red
+            raise "\n\n#{warn_message}\n".red
           end
         end
       end
@@ -211,15 +272,17 @@ module PodBuilder
         pods_to_build = buildable_items.select { |x| argument_pods.include?(x.root_name) }
         pods_to_build += other_subspecs(pods_to_build, buildable_items)
 
-        if OPTIONS[:resolve_parent_dependencies]
-          dependencies = []
-          buildable_items.each do |pod|
-            if !(pod.dependencies(buildable_items) & pods_to_build).empty?
-              dependencies.push(pod)
-            end
+        # Build all pods that depend on the those that were explictly passed by the user
+        dependencies = []
+        buildable_items.each do |pod|
+          if !(pod.dependencies(buildable_items) & pods_to_build).empty?
+            dependencies.push(pod)
           end
-          pods_to_build += dependencies
         end
+        log = dependencies.reject { |t| pods_to_build.map(&:root_name).include?(t.root_name) }.map(&:root_name)
+        puts "Adding inverse dependencies: #{log.join(", ")}".blue
+
+        pods_to_build += dependencies
 
         return pods_to_build.uniq
       end      

data/lib/pod_builder/command/deintegrate.rb

@@ -43,15 +43,16 @@ module PodBuilder
 
         PodBuilder::safe_rm_rf(Configuration.base_path)
 
-        Dir.chdir(PodBuilder::project_path)
-        bundler_prefix = Configuration.use_bundler ? "bundle exec " : ""
-        system("#{bundler_prefix}pod install;")
+        Dir.chdir(PodBuilder::project_path) do 
+          bundler_prefix = Configuration.use_bundler ? "bundle exec " : ""
+          system("#{bundler_prefix}pod install;")
 
-        license_base = PodBuilder::project_path(Configuration.license_filename)
-        FileUtils.rm_f("#{license_base}.plist")
-        FileUtils.rm_f("#{license_base}.md")
+          license_base = PodBuilder::project_path(Configuration.license_filename)
+          FileUtils.rm_f("#{license_base}.plist")
+          FileUtils.rm_f("#{license_base}.md")
 
-        update_gemfile
+          update_gemfile
+        end
 
         puts "\n\n🎉 done!\n".green
         return 0
@@ -89,8 +90,9 @@ module PodBuilder
         gemfile_lines.select! { |x| !trim_gemfile_line(x).include?(trim_gemfile_line(podbuilder_line)) }
         File.write(gemfile_path, gemfile_lines.join("\n"))
 
-        Dir.chdir(PodBuilder::home)
-        system("bundle")
+        Dir.chdir(PodBuilder::home) do 
+          system("bundle")
+        end
       end
 
       def self.trim_gemfile_line(line)

data/lib/pod_builder/command/generate_lldbinit.rb

@@ -19,7 +19,7 @@ module PodBuilder
           end
           source_path = File.expand_path(source_path)  
           
-          raise "\n\nSpecified path does not exists" unless File.directory?(source_path)
+          raise "\n\nSpecified path does not exists\n".red unless File.directory?(source_path)
         end
         
         base_path = PodBuilder::basepath

data/lib/pod_builder/command/init.rb

@@ -110,8 +110,9 @@ module PodBuilder
      
         File.write(gemfile_path, gemfile_lines.join("\n"))
 
-        Dir.chdir(PodBuilder::home)
-        system("bundle")
+        Dir.chdir(PodBuilder::home) do 
+          system("bundle")
+        end
       end
 
       def self.trim_gemfile_line(line)
@@ -122,11 +123,11 @@ module PodBuilder
         # React-Core.podspec
         file = "React-Core.podspec"
         paths = Dir.glob("#{PodBuilder::git_rootpath}/node_modules/**/#{file}")
-        raise "Unexpected number of #{file} found" if paths.count != 1
+        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\" => \""
-        raise "Expected header search path entry not found" unless content.include?(expected_header_search_path_prefix)
+        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)        
@@ -134,11 +135,11 @@ module PodBuilder
         # React-CoreModules.podspec
         file = "React-CoreModules.podspec"
         paths = Dir.glob("#{PodBuilder::git_rootpath}/node_modules/**/#{file}")
-        raise "Unexpected number of #{file} found" if paths.count != 1
+        raise "\n\nUnexpected number of #{file} found\n".red if paths.count != 1
 
         content = File.read(paths[0])
         expected_header_search_path_prefix = "\"HEADER_SEARCH_PATHS\" => \""
-        raise "Expected header search path entry not found" unless content.include?(expected_header_search_path_prefix)
+        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)

data/lib/pod_builder/command/install_sources.rb

@@ -45,19 +45,17 @@ module PodBuilder
         dest_path = PodBuilder::basepath("Sources")
         FileUtils.mkdir_p(dest_path)
 
-        current_dir = Dir.pwd
-        Dir.chdir(dest_path)
-
-        repo_dir = File.join(dest_path, spec.podspec_name)
-        if !File.directory?(repo_dir)
-          raise "\n\nFailed cloning #{spec.name}".red if !system("git clone #{spec.repo} #{spec.podspec_name}")
+        Dir.chdir(dest_path) do
+          repo_dir = File.join(dest_path, spec.podspec_name)
+          if !File.directory?(repo_dir)
+            raise "\n\nFailed cloning #{spec.name}".red if !system("git clone #{spec.repo} #{spec.podspec_name}")
+          end
         end
 
-        Dir.chdir(repo_dir)
-        puts "Checking out #{spec.podspec_name}".yellow
-        raise "\n\nFailed cheking out #{spec.name}".red if !system(git_hard_checkout_cmd(spec))
-
-        Dir.chdir(current_dir)
+        Dir.chdir(repo_dir) do
+          puts "Checking out #{spec.podspec_name}".yellow
+          raise "\n\nFailed cheking out #{spec.name}".red if !system(git_hard_checkout_cmd(spec))
+        end
       end
 
       def self.git_hard_checkout_cmd(spec)