pod-builder 2.0.0.beta.29 → 2.0.0.beta.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54445e00ec8c44ad6d9223ec3da424542ba80a292d260832074c82bdee156001
-  data.tar.gz: c1f8a2743f149b5b93988ede26dc24ac310950337cbba6171dfe617a241840db
+  metadata.gz: d4cde0acf0b503aaa846162710c25456d306b0ae6e53492b717795e4540f5b9f
+  data.tar.gz: ddfc897b5dd2d280a2b5e636706d62c854d01bb34f605b813d70a48ace6fad75
 SHA512:
-  metadata.gz: e05523420cc3c9c0fb5ae88d18141d3df8d3db2526db282b5d5328e38dadd45da29a600668ef5fe2b71f0d21116e0544ce5c63dda47c3185570fd7643ef32e23
-  data.tar.gz: b4cf94efd2e57b77f4e5068a15fcdc85bd0f25cd69d85f4169feaebd1dee83f55c6fb4e208733ff5a0b7c33c7ebea751c48684e96c2e9fa4fb55e67c4747b336
+  metadata.gz: 5f468d84983dc689b5dceef947da7d3ce586bd2d34be76ec439a236ba45435a6865b54d154233fdae038352ff1582cb68fcfdc520e5a101ed4842d86cde3e973
+  data.tar.gz: f45e9377fd79dff65b9c72580a29308172cc3cf3410093c2a6d2a7c9245c7000bc732b4d78473dd58ef14a3712a7cb9697bf87e7cd8331f8b413e0f550c04cc4

data/README.md

@@ -300,18 +300,6 @@ PodBuilder writes a plist and markdown license files of pods specified in the Po
 }
 ```
 
-#### `subspecs_to_split`
-
-Normally when multiple subspecs are specified in a target a single framework is produced. There are rare cases where you specify different subspecs in different targets: a typical case is subspec specifically designed for app extensions, where you want to use a subspec in the main app and another one in the app extension. 
-
-**Warning**: This will work properly only for static frameworks (_static_framework = true_ specified in the podspec). See [issue](https://github.com/CocoaPods/CocoaPods/issues/5708) and [issue](https://github.com/CocoaPods/CocoaPods/issues/5643)
-
-```json
-{
-    "subspecs_to_split": ["Podname1/Subspec1", "Podname1/Subspec2", "Podname2/Subspec1", "Podname2/Subspec1"]
-}
-```
-
 #### `use_bundler`
 
 If you use bundler to pin the version of CocoaPods in your project set this to true. Default false.

data/exe/pod_builder

@@ -79,6 +79,9 @@ Options:
         # opts.on("-a", "--auto-resolve-deps", "Resolve pod dependencies automatically") do |o|
         #   OPTIONS[:auto_resolve_dependencies] = o
         # end
+        opts.on("-s", "--no-stdin", "Never request interaction with sdtin (e.g. in CI environment)") do |o|
+          OPTIONS[:no_stdin_available] = o
+        end
         opts.on("-d", "--debug", "Don't clean build folder") do |o|
           OPTIONS[:debug] = o
         end
@@ -108,6 +111,9 @@ Options:
         opts.on("-w", "--allow-warnings", "Allow warnings") do |o|
           OPTIONS[:allow_warnings] = o
         end
+        opts.on("-s", "--no-stdin", "Never request interaction with sdtin (e.g. in CI environment)") do |o|
+          OPTIONS[:no_stdin_available] = o
+        end
         opts.on("-d", "--debug", "Don't clean build folder") do |o|
           OPTIONS[:debug] = o
         end

data/lib/pod_builder/command/build.rb

@@ -49,34 +49,27 @@ module PodBuilder
 
         restore_file_error = Podfile.restore_file_sanity_check
   
-        check_splitted_subspecs_are_buildable(all_buildable_items, installer)
         check_pods_exists(argument_pods, all_buildable_items)
 
         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
-        # 1. subspecs: because the resulting .framework path is treated differently when added to Configuration.subspecs_to_split
-        # 2. pods to build in release
-        # 3. pods to build in debug
+        # 1. pods to build in release
+        # 2. pods to build in debug
 
         check_not_building_development_pods(pods_to_build)
 
-        pods_to_build_subspecs = splitted_pods_to_build(pods_to_build, installer)
-
         # Remove dependencies from pods to build
         all_dependencies_name = pods_to_build.map(&:dependency_names).flatten.uniq
         pods_to_build.select! { |x| !all_dependencies_name.include?(x.name) }
 
-        pods_to_build -= pods_to_build_subspecs.flatten
         pods_to_build_debug = pods_to_build.select { |x| x.build_configuration == "debug" }
         pods_to_build_release = pods_to_build - pods_to_build_debug
 
         check_dependencies_build_configurations(all_buildable_items)
 
-        podfiles_items = pods_to_build_subspecs
-        podfiles_items.push(pods_to_build_debug)
-        podfiles_items.push(pods_to_build_release)   
+        podfiles_items = [pods_to_build_debug] + [pods_to_build_release]
 
         install_using_frameworks = Podfile::install_using_frameworks(analyzer)
         
@@ -125,20 +118,6 @@ module PodBuilder
 
       private
 
-      def self.splitted_pods_to_build(pods_to_build, installer)
-        specs_by_target = installer.analysis_result.specs_by_target
-
-        pods_to_build_subspecs = pods_to_build.select { |x| x.is_subspec && Configuration.subspecs_to_split.include?(x.name) }
-        
-        pods = []
-        specs_by_target.each do |target, specs|
-          grouped = pods_to_build_subspecs.group_by { |t| specs.map(&:name).include?(t.name) }
-          pods.push(grouped[true])
-        end
-
-        return pods.compact
-      end
-
       def self.check_not_building_subspecs(pods_to_build)
         pods_to_build.each do |pod_to_build|
           if pod_to_build.include?("/")
@@ -156,55 +135,6 @@ module PodBuilder
         end
       end
 
-      def self.check_splitted_subspecs_are_buildable(all_buildable_items, installer)
-        check_splitted_subspecs_are_static(all_buildable_items)
-        check_splitted_subspecs_have_valid_dependencies(all_buildable_items)
-        check_splitted_subspecs_not_in_multiple_targets(all_buildable_items, installer)
-      end
-
-      def self.check_splitted_subspecs_have_valid_dependencies(all_buildable_items)
-        splitted_items = all_buildable_items.select { |t| Configuration.subspecs_to_split.include?(t.name) }
-        splitted_items.each do |splitted_item|
-          common_deps = splitted_item.dependency_names.select { |t| t.start_with?(splitted_item.root_name) }
-
-          if common_deps.count > 0
-            raise "\n\nSubspecs included in 'subspecs_to_split' cannot have dependencies to other subspecs within the spec.\n\n#{splitted_item.name} has dependencies to: '#{common_deps.join(', ')}'\n\n".red
-          end
-        end
-      end
-
-      def self.check_splitted_subspecs_not_in_multiple_targets(all_buildable_items, installer)
-        specs_by_target = installer.analysis_result.specs_by_target
-
-        flat_item_names = specs_by_target.values.flatten.map(&:name)
-
-        splitted_items = all_buildable_items.select { |t| Configuration.subspecs_to_split.include?(t.name) }
-
-        splitted_items.each do |splitted_item|
-          if flat_item_names.count(splitted_item.name) > 1
-            raise "\n\n'#{splitted_item.name}' is included in 'subspecs_to_split' but it is used in multiple targets. This is unsupported.\nIf possible duplicate the subspec '#{splitted_item.name}' in the podspec using different names for each target.\n".red
-          end
-        end
-      end
-
-      def self.check_splitted_subspecs_are_static(all_buildable_items)
-        non_static_subspecs = all_buildable_items.select { |x| x.is_subspec && x.is_static == false }
-        non_static_subspecs_names = non_static_subspecs.map(&:name)
-
-        invalid_subspecs = Configuration.subspecs_to_split & non_static_subspecs_names # intersect
-
-        unless invalid_subspecs.count > 0
-          return
-        end
-
-        warn_message = "The following pods `#{invalid_subspecs.join(" ")}` are non static binaries which are being splitted over different targets. Beware that this is an unsafe setup as per https://github.com/CocoaPods/CocoaPods/issues/5708 and https://github.com/CocoaPods/CocoaPods/issues/5643\n\nYou can ignore this error by passing the `--allow-warnings` flag to the build command\n"
-        if OPTIONS[:allow_warnings]
-          puts "\n\n#{warn_message}".yellow
-        else
-          raise "\n\n#{warn_message}".red
-        end
-      end
-
       def self.check_dependencies_build_configurations(pods)
         pods.each do |pod|
           pod_dependency_names = pod.dependency_names.select { |x| !pod.has_common_spec(x) }

data/lib/pod_builder/command/clean.rb

@@ -31,19 +31,6 @@ module PodBuilder
           end
         end
 
-        splitted_specs = buildable_items.select { |t| Configuration.subspecs_to_split.include?(t.name) }
-        splitted_specs.each do |splitted_spec|
-          root_name = splitted_spec.root_name
-
-          Dir.glob(PodBuilder::prebuiltpath("#{root_name}/Subspecs/*")).each do |path|
-            basename = File.basename(path)
-            unless splitted_specs.map(&:podspec_name).include?(basename)
-              puts "Cleanining up `#{root_name}/#{basename}`, no longer found among dependencies".blue
-              PodBuilder::safe_rm_rf(path)
-            end
-          end
-        end
-
         puts "Cleaning dSYM folder".yellow
         module_names = buildable_items.map(&:module_name).uniq
         Dir.glob(File.join(PodBuilder::dsympath, "**/*.dSYM")).each do |path|
@@ -78,7 +65,7 @@ module PodBuilder
 
         paths_to_delete.flatten.each do |path|
           confirm = ask("#{path} unused.\nDelete it? [Y/N] ") { |yn| yn.limit = 1, yn.validate = /[yn]/i }
-          if confirm.downcase == 'y'
+          if confirm.downcase == 'y' || OPTIONS.has_key?(:no_stdin_available)
             PodBuilder::safe_rm_rf(path)
           end
         end

data/lib/pod_builder/configuration.rb

@@ -61,7 +61,6 @@ module PodBuilder
       attr_accessor :skip_pods
       attr_accessor :force_prebuild_pods
       attr_accessor :license_filename
-      attr_accessor :subspecs_to_split
       attr_accessor :development_pods_paths
       attr_accessor :build_base_path
       attr_accessor :build_path
@@ -92,7 +91,6 @@ module PodBuilder
     @skip_pods = DEFAULT_SKIP_PODS
     @force_prebuild_pods = DEFAULT_FORCE_PREBUILD_PODS
     @license_filename = "Pods-acknowledgements"
-    @subspecs_to_split = []
     @development_pods_paths = []
     @build_base_path = "/tmp/pod_builder".freeze
     @build_path = build_base_path
@@ -180,11 +178,6 @@ module PodBuilder
             Configuration.license_filename = value
           end
         end
-        if value = json["subspecs_to_split"]
-          if value.is_a?(Array) && value.count > 0
-            Configuration.subspecs_to_split = value
-          end
-        end
         if value = json["project_name"]
           if value.is_a?(String) && value.length > 0
             Configuration.project_name = value
@@ -263,7 +256,6 @@ module PodBuilder
       config["build_system"] = Configuration.build_system
       config["library_evolution_support"] = Configuration.library_evolution_support
       config["license_filename"] = Configuration.license_filename
-      config["subspecs_to_split"] = Configuration.subspecs_to_split
       config["restore_enabled"] = Configuration.restore_enabled
       config["allow_building_development_pods"] = Configuration.allow_building_development_pods
       config["use_bundler"] = Configuration.use_bundler

data/lib/pod_builder/install.rb

@@ -179,7 +179,7 @@ module PodBuilder
         if File.directory?("#{Configuration.build_path}/Pods/Pods.xcodeproj")
           if ENV['DEBUGGING']
             system("xed #{Configuration.build_path}/Pods")  
-          else
+          elsif !OPTIONS.has_key?(:no_stdin_available)
             confirm = ask("\n\nOh no! Something went wrong during prebuild phase! Do you want to open the prebuild project to debug the error, you will need to add and run the Pods-Dummy scheme? [Y/N] ".red) { |yn| yn.limit = 1, yn.validate = /[yn]/i }
             if confirm.downcase == 'y'
               system("xed #{Configuration.build_path}/Pods")  
@@ -217,9 +217,6 @@ module PodBuilder
         
         podbuilder_file = File.join(path, Configuration.prebuilt_info_filename)
         entry = podfile_item.entry(true, false)
-        if Configuration.subspecs_to_split.include?(podfile_item.name)
-          entry.gsub!("'#{podfile_item.name}'", "'#{podfile_item.root_name}'")
-        end
         
         data = {}
         data["entry"] = entry
@@ -313,11 +310,8 @@ module PodBuilder
           podspec_path = item.prebuilt_podspec_path
           if last_build_folder_hash = build_folder_hash_in_prebuilt_info_file(item)
             if last_build_folder_hash == build_folder_hash(item, gitignored_files)
-              if Configuration.subspecs_to_split.include?(item.name)
-                puts "No changes detected to '#{item.name}', will skip rebuild".blue
-              else
-                puts "No changes detected to '#{item.root_name}', will skip rebuild".blue
-              end
+              puts "No changes detected to '#{item.root_name}', will skip rebuild".blue
+
               replaced_items.push(item)
 
               podfile_items.select { |t| t.root_name == item.root_name }.each do |replace_item|
@@ -385,33 +379,21 @@ module PodBuilder
 
       non_prebuilt_items = podfile_items.reject(&:is_prebuilt)
 
-      splitted_pods = non_prebuilt_items.map { |t| splitted_pod(t, podfile_items) }.flatten.uniq
-      splitted_pods_root_name = splitted_pods.map { |t| t.root_name }.uniq
-
-      pod_names = non_prebuilt_items.reject { |t| splitted_pods_root_name.include?(t.root_name) }.map(&:root_name).uniq + splitted_pods.map(&:name)
+      pod_names = non_prebuilt_items.map(&:root_name).uniq
 
       pod_names.reject! { |t| 
         folder_path = PodBuilder::buildpath_prebuiltpath(t)
         File.directory?(folder_path) && Dir.empty?(folder_path) # When using prebuilt items we end up with empty folders
       } 
 
-      # Selectively delete destination folder. 
-      # If it's a splitted spec we just need to wipe the Subspecs/#{pod_name}
-      # If it's not we need to wipe everything except the Subspecs folder
       pod_names.each do |pod_name|   
         root_name = pod_name.split("/").first
-        if pod_name.include?("/") # Splitted pod
-          PodBuilder::safe_rm_rf(PodBuilder::prebuiltpath("#{root_name}/Subspecs/#{pod_name.gsub("/", "_") }"))
-        else
-          items_to_delete = Dir.glob("#{PodBuilder::prebuiltpath(root_name)}/**/*")
-          items_to_delete.reject! { |t| t.include?(PodBuilder::prebuiltpath("#{root_name}/Subspecs")) }
 
-          items_to_delete.each { |t| PodBuilder::safe_rm_rf(t) }
-        end
+        items_to_delete = Dir.glob("#{PodBuilder::prebuiltpath(root_name)}/**/*")
+        items_to_delete.each { |t| PodBuilder::safe_rm_rf(t) }
       end
 
       # Now copy
-      splitted_items_copied = false
       pod_names.each do |pod_name|        
         root_name = pod_name.split("/").first
         source_path = PodBuilder::buildpath_prebuiltpath(root_name)
@@ -421,18 +403,9 @@ module PodBuilder
           next
         end
 
-        if Configuration.subspecs_to_split.include?(pod_name)
-          destination_folder = PodBuilder::prebuiltpath("#{root_name}/Subspecs/#{pod_name.gsub("/", "_") }")
-          FileUtils.mkdir_p(destination_folder)
-          unless splitted_items_copied
-            FileUtils.cp_r("#{source_path}/.", destination_folder)              
-            splitted_items_copied = true
-          end
-        else
-          destination_folder = PodBuilder::prebuiltpath(root_name)
-          FileUtils.mkdir_p(destination_folder)
-          FileUtils.cp_r("#{source_path}/.", destination_folder)  
-        end
+        destination_folder = PodBuilder::prebuiltpath(root_name)
+        FileUtils.mkdir_p(destination_folder)
+        FileUtils.cp_r("#{source_path}/.", destination_folder)  
       end
       
       # Folder won't exist if no dSYM were generated (all static libs)
@@ -522,9 +495,5 @@ module PodBuilder
         return replace_path
       end
     end 
-
-    def self.splitted_pod(podfile_item, podfile_items)
-      return podfile_items.select { |t| t.root_name == podfile_item.root_name && Configuration.subspecs_to_split.include?(t.name) }
-    end
   end
 end

data/lib/pod_builder/podfile_item.rb

@@ -295,16 +295,14 @@ module PodBuilder
 
       root_names = deps.map(&:root_name).uniq
 
-      unless Configuration.subspecs_to_split.include?(name)
-        # We need to build all other common subspecs to properly build the item
-        # Ex. 
-        # PodA depends on DepA/subspec1
-        # PodB depends on DepA/subspec2
-        #
-        # When building PodA we need to build both DepA subspecs because they might 
-        # contain different code
-        deps += available_pods.select { |t| root_names.include?(t.root_name) && t.root_name != t.name && !Configuration.subspecs_to_split.include?(t.name) }
-      end
+      # We need to build all other common subspecs to properly build the item
+      # Ex. 
+      # PodA depends on DepA/subspec1
+      # PodB depends on DepA/subspec2
+      #
+      # When building PodA we need to build both DepA subspecs because they might 
+      # contain different code
+      deps += available_pods.select { |t| root_names.include?(t.root_name) && t.root_name != t.name }
 
       deps.uniq!
 
@@ -406,11 +404,7 @@ module PodBuilder
     end
 
     def prebuilt_rel_path
-      if is_subspec && Configuration.subspecs_to_split.include?(name)
-        return "Subspecs/#{podspec_name}/#{module_name}.framework"
-      else
-        return "#{module_name}.framework"
-      end
+      return "#{module_name}.framework"
     end
 
     def prebuilt_podspec_path(absolute_path = true)

data/lib/pod_builder/podspec.rb

@@ -24,16 +24,12 @@ module PodBuilder
       indentation = "    " * slash_count
       spec_var = "p#{slash_count}"
 
-      subspec_prefix = Configuration.subspecs_to_split.include?(item.name) ? "Subspecs/#{item.podspec_name}/" : ""
-
       if spec_var == "p1" && item.default_subspecs.count > 0
         podspec += "#{indentation}#{spec_var}.default_subspecs = '#{item.default_subspecs.join("', '")}'\n"
       end
 
-      if subspec_prefix.length > 0 && Dir["#{PodBuilder::prebuiltpath("#{item.root_name}/#{subspec_prefix}")}/*"].empty?
-        podspec += "#{indentation}#{spec_var}.source_files = '*.splittedspec'\n"
-      elsif item.name == name
-        if_exists = lambda { |t| File.exist?(PodBuilder::prebuiltpath("#{item.root_name}/#{subspec_prefix}#{t}") || "") }
+      if item.name == name
+        if_exists = lambda { |t| File.exist?(PodBuilder::prebuiltpath("#{item.root_name}/#{t}") || "") }
 
         vendored_frameworks = item.vendored_frameworks 
         if item.default_subspecs.count == 0 && install_using_frameworks
@@ -76,7 +72,7 @@ module PodBuilder
 
         entries = lambda { |spec_key, spec_value| 
           key = "#{indentation}#{spec_var}.#{spec_key}"
-          joined_values = spec_value.map { |t| "#{subspec_prefix}#{t}" }.uniq.sort.join("', '")
+          joined_values = spec_value.map { |t| "#{t}" }.uniq.sort.join("', '")
           "#{key} = '#{joined_values}'\n" 
         }
           
@@ -180,7 +176,7 @@ module PodBuilder
         end
       end
     
-      return podspec, (valid || Configuration.subspecs_to_split.include?(item.name))
+      return podspec, valid
     end
 
     def self.generate_podspec_from(all_buildable_items, platform, install_using_frameworks)

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "2.0.0.beta.29"
+  VERSION = "2.0.0.beta.30"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.29
+  version: 2.0.0.beta.30
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler