pod-builder 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09cbb24dc2fb49946058f0459990c762afd54e93dfe280289203348162272611'
-  data.tar.gz: 87fc03146c5a8a7fbe2adcc895e8a45c8b24b517b00c557236245902df543267
+  metadata.gz: e0cdcd16503f8c363779e6b63a2a7c7ff66cc867a2092c65fb3a8bcb66758cfb
+  data.tar.gz: 199fc74359e90c198cac6e8c5c1ea1e172ae93ffe584ccccf5c8d324cda0f761
 SHA512:
-  metadata.gz: 221ccda81fbd9b41d4439ebaa6a8ea3776e4c1d91ea3b24d268fa54203e67e757160ad0e42595527e0e610845ec1faf546aa9d480463f808aae28c94df4710e4
-  data.tar.gz: ef65cce139a54a6ae93e5262e480a3608e9b268a51cf413da58e314d29568c6981f5b198dc1061d93d102ec112935dc890d7e5b009fabd0cc4cc88cce52e9650
+  metadata.gz: 42587bceee70997a3a91ab5428945e9e98094500ceafca8a7de957fb60784e9e2bc84d9f823fa7c00866c5910e651aa48ad7b200924163a1d9879df241fcd541
+  data.tar.gz: 60f520d51741fbff7d7216d018266182f4786a5b77c7eec21495d5199752edd850dbafaecd9644217d5bfb7643e41cce88d94b09c271372af2602846cd19db5a

data/README.md

@@ -324,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
 

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

@@ -147,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
@@ -154,7 +156,38 @@ 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_all

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/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)

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)

data/lib/pod_builder/command/switch.rb

@@ -195,9 +195,14 @@ module PodBuilder
           File.write(podfile_path, lines.join)
         end
         
-        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;")  
+        end
+
+        Configuration.post_actions[:switch]&.execute()
+
+        puts "\n\n🎉 done!\n".green
 
         return 0
       end

data/lib/pod_builder/command/sync_podfile.rb

@@ -12,17 +12,17 @@ module PodBuilder
 
         all_buildable_items = Analyze.podfile_items(installer, analyzer)
 
-        Dir.chdir(PodBuilder::project_path)
-
-        previous_podfile_content = File.read("Podfile")
-        Podfile::write_prebuilt(all_buildable_items, analyzer)        
-        updated_podfile_content = File.read("Podfile")
-
-        Licenses::write([], all_buildable_items)
-
-        if previous_podfile_content != updated_podfile_content
-          bundler_prefix = Configuration.use_bundler ? "bundle exec " : ""
-          system("#{bundler_prefix}pod install;")
+        Dir.chdir(PodBuilder::project_path) do
+          previous_podfile_content = File.read("Podfile")
+          Podfile::write_prebuilt(all_buildable_items, analyzer)        
+          updated_podfile_content = File.read("Podfile")
+  
+          Licenses::write([], all_buildable_items)
+  
+          if previous_podfile_content != updated_podfile_content
+            bundler_prefix = Configuration.use_bundler ? "bundle exec " : ""
+            system("#{bundler_prefix}pod install;")
+          end  
         end
         
         puts "\n\n🎉 done!\n".green

data/lib/pod_builder/configuration.rb

@@ -75,6 +75,7 @@ module PodBuilder
       attr_accessor :build_xcframeworks_all
       attr_accessor :build_xcframeworks_include
       attr_accessor :build_xcframeworks_exclude
+      attr_accessor :post_actions
     end
 
     @build_settings = DEFAULT_BUILD_SETTINGS
@@ -111,6 +112,8 @@ module PodBuilder
     @build_xcframeworks_all = false
     @build_xcframeworks_include = []
     @build_xcframeworks_exclude = []
+
+    @post_actions = {}
     
     def self.check_inited
       raise "\n\nNot inited, run `pod_builder init`\n".red if podbuilder_path.nil?
@@ -229,6 +232,11 @@ module PodBuilder
             Configuration.build_xcframeworks_exclude = value
           end
         end
+        if value = json["post_actions"]
+          if value.is_a?(Hash)
+            Configuration.post_actions = PodBuilder::PostActions.load(value)
+          end
+        end
 
         Configuration.build_settings.freeze
 

data/lib/pod_builder/core.rb

@@ -12,6 +12,7 @@ require 'pod_builder/info'
 require 'pod_builder/configuration'
 require 'pod_builder/podspec'
 require 'pod_builder/licenses'
+require 'pod_builder/post_actions'
 
 require 'core_ext/string'
 

data/lib/pod_builder/install.rb

@@ -424,6 +424,13 @@ module PodBuilder
           end
         end
 
+        # Cleanup unneeded files (see https://github.com/bazelbuild/rules_apple/pull/1113)
+        ignore_files = Dir.glob(["#{source_path}/**/Modules/**/*.swiftmodule/*.swiftdoc", "#{source_path}/**/Modules/**/*.swiftmodule/**/*.swiftsourceinfo"])
+        ignore_files.each { |t| PodBuilder::safe_rm_rf(t) }
+
+        project_folder = Dir.glob("#{source_path}/**/Modules/**/*.swiftmodule/Project")
+        project_folder.select { |t| File.directory?(t) && Dir.empty?(t) }.each { |t| PodBuilder::safe_rm_rf(t) }
+
         unless Dir.glob("#{source_path}/**/*").select { |t| File.file?(t) }.empty?
           destination_folder = PodBuilder::prebuiltpath(root_name)
           FileUtils.mkdir_p(destination_folder)
@@ -447,11 +454,9 @@ module PodBuilder
     end
     
     def self.init_git(path)
-      current_dir = Dir.pwd
-      
-      Dir.chdir(path)
-      system("git init")
-      Dir.chdir(current_dir)
+      Dir.chdir(path) do 
+        system("git init")
+      end
     end
     
     def self.build_folder_hash_in_prebuilt_info_file(podfile_item)

data/lib/pod_builder/podfile.rb

@@ -34,7 +34,7 @@ module PodBuilder
       items.each do |item|
         build_settings = Configuration.build_settings.dup
 
-        item_build_settings = Configuration.build_settings_overrides[item.name] || {}
+        item_build_settings = Configuration.build_settings_overrides[item.name].dup || {}
         
         # These settings need to be set as is to properly build frameworks
         build_settings["SWIFT_COMPILATION_MODE"] = "wholemodule"
@@ -46,10 +46,6 @@ module PodBuilder
 
         build_settings["IPHONEOS_DEPLOYMENT_TARGET"] = platform.deployment_target.version # Fix compilation warnings on Xcode 12
 
-        # Don't store .pcm info in binary, see https://forums.swift.org/t/swift-behavior-of-gmodules-and-dsyms/23211/3
-        build_settings["CLANG_ENABLE_MODULE_DEBUGGING"] = "NO"
-        build_settings["OTHER_SWIFT_FLAGS"] = "$(inherited) -Xfrontend -no-clang-module-breadcrumbs"
-
         # Ignore deprecation warnings
         build_settings["GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS"] = "NO"
 
@@ -70,10 +66,20 @@ module PodBuilder
           build_settings["BITCODE_GENERATION_MODE"] = "bitcode"
         end
 
+        # Don't store .pcm info in binary, see https://forums.swift.org/t/swift-behavior-of-gmodules-and-dsyms/23211/3
+        build_settings["CLANG_ENABLE_MODULE_DEBUGGING"] = "NO"
+        other_swift_flags_override = " $(inherited) -Xfrontend -no-clang-module-breadcrumbs"
+
         item_build_settings.each do |k, v|
-          build_settings[k] = v
+          # Do not allow to override above settings which are mandatory for a correct compilation
+          if build_settings[k].nil?
+            build_settings[k] = v
+          end
         end
 
+        # All the below settings should be merged with global (Configuration.build_settings) or per pod build_settings (Configuration.build_settings_overrides)
+        build_settings["OTHER_SWIFT_FLAGS"] = build_settings.fetch("OTHER_SWIFT_FLAGS", "") + other_swift_flags_override        
+
         podfile_build_settings += "set_build_settings(\"#{item.root_name}\", #{build_settings.to_s}, installer)\n  "
 
         dependency_names = item.dependency_names.map { |x|

data/lib/pod_builder/post_actions.rb

@@ -0,0 +1,46 @@
+require 'pod_builder/core'
+require 'json'
+
+module PodBuilder
+  module PostActions
+    def self.load(hash)
+      actions = {}
+      if json = hash["switch"]
+        actions[:switch] = Item.new("switch", json)
+      end
+      if json = hash["build"]
+        actions[:build] = Item.new("build", json)
+      end
+      
+      return actions
+    end
+
+    class Item
+      attr_reader :path
+      attr_reader :quiet
+      attr_reader :name
+            
+      def initialize(name, hash)
+        @name = name
+        @path = hash.fetch("path", "") 
+        @quiet = hash.fetch("quiet", false) 
+
+        raise "\n\nEmpty or missing post #{name} action path\n".red if @path.empty?()
+      end     
+      
+      def execute()
+        cmd = PodBuilder::basepath(path)
+        unless File.exist?(cmd)
+          raise "\n\nPost #{name} action path '#{cmd}' does not exists!\n".red
+        end
+
+        if @quiet
+          cmd += " > /dev/null 2>&1"
+        end
+
+        puts "Executing post #{name} action".yellow
+        `#{cmd}`
+      end
+    end
+  end  
+end

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "3.2.0"
+  VERSION = "3.3.0"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -208,6 +208,7 @@ files:
 - lib/pod_builder/podfile_cp.rb
 - lib/pod_builder/podfile_item.rb
 - lib/pod_builder/podspec.rb
+- lib/pod_builder/post_actions.rb
 - lib/pod_builder/rome/post_install.rb
 - lib/pod_builder/rome/pre_install.rb
 - lib/pod_builder/templates/build_podfile.template