pod-builder 2.0.0.beta.27 → 2.0.0.beta.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44ff676a26caedcecf597f47315839aa7b6785d34f77c61d72fba8125473fdac
-  data.tar.gz: 761a04159150170ee9f826d05e0664d18b679252820c582f4ddb5fef925feb18
+  metadata.gz: 2d2d2da339c3c50f17484abe18c4f4dd8080d4344bc526b393c95c3d166c9851
+  data.tar.gz: 483067dfc8cd9b914dfa9768afc33cf067f7807a9b09ce3f1b3c86c67b4c08a6
 SHA512:
-  metadata.gz: 84fed9f6fdbeed8adc3b79c7dab9d037d67c066437be938823a0feb3257c1dce27fe74800cfb5f8672c06a568f02a766325840ca54acc471eea40acd54c05c2b
-  data.tar.gz: 92ce97f49e9dd1a10604a7b6cafe30c47d9c202afad83aef212eab025a756c8ec70d99eb8bcff90b14ae0d4a18bdac0eb9e0f9f80e309e69b94e93619dd20f13
+  metadata.gz: e87ca666254ff92c0c729412acf61d02e822b55933524d07ed2ec13ea38b33a29f13fac2ec6eef221f373626b50f690ec45235f7874910374123806d0a0d6122
+  data.tar.gz: 945398f22ccc35ac924a16e6fe3a95be6343fd0ee335f8f9f94082004193113566884a49043cefac8bf6efb705db79d774dab304e56ec15fe468acdcf6e687e4

data/README.md

@@ -12,6 +12,10 @@ Unless you're using a Ruby version manager you should generally install using `s
 
     $ sudo gem install pod-builder
 
+## Requirements
+
+Ruby 2.6.3 or newer. Cocoapods 1.9.0 or newer
+
 # Quick start
 
 You can the initialize your project to use the tool using the `init` command
@@ -253,6 +257,8 @@ Xcode build settings to use. You can override the default values which are:
 } 
 ```
 
+If your project uses bitcode change "ENABLE_BITCODE" to "YES".
+
 #### `build_settings_overrides`
 
 Like `build_settings` but per pod. Pod name can also refer to subspec.
@@ -272,7 +278,7 @@ Like `build_settings` but per pod. Pod name can also refer to subspec.
 
 #### `build_system`
 
-Specify which build system to use to compile frameworks. Either `Legacy` (standard build system) or `Latest` (new build system). Default value: `Legacy`.
+Specify which build system to use to compile frameworks. Either `Legacy` (standard build system) or `Latest` (new build system). Default value: `Latest`.
 
 #### `library_evolution_support`
 
@@ -300,18 +306,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

@@ -8,7 +8,7 @@ if show_version
   exit(0)
 end
 
-if ENV['DEBUGGING']
+if ENV["DEBUGGING"]
   puts "Running in debug, injecting $LOAD_PATH"
   libdir = File.expand_path("#{File.dirname(__FILE__)}/../lib")
   $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
@@ -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
@@ -367,7 +373,7 @@ end
 
 command_ret = -1
 begin
-  unless ENV['USER'] != "root"
+  unless ENV["USER"] != "root"
     raise "\n\nFor safety do not run this as root\n".red
   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

@@ -39,7 +39,7 @@ module PodBuilder
     }.freeze
     DEFAULT_SKIP_PODS = ["GoogleMaps"]
     DEFAULT_FORCE_PREBUILD_PODS = ["GoogleTagManager"]
-    DEFAULT_BUILD_SYSTEM = "Legacy".freeze # either Latest (New build system) or Legacy (Standard build system)
+    DEFAULT_BUILD_SYSTEM = "Latest".freeze # either Latest (New build system) or Legacy (Standard build system)
     DEFAULT_LIBRARY_EVOLUTION_SUPPORT = false
     DEFAULT_PLATFORMS = ["iphoneos", "iphonesimulator", "appletvos", "appletvsimulator"].freeze
     DEFAULT_BUILD_FOR_APPLE_SILICON = false
@@ -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

@@ -177,9 +177,9 @@ module PodBuilder
         return InstallResult.new(licenses, prebuilt_info)
       rescue Exception => e
         if File.directory?("#{Configuration.build_path}/Pods/Pods.xcodeproj")
-          if ENV['DEBUGGING']
+          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
@@ -233,7 +230,7 @@ module PodBuilder
         subspec_self_deps = subspecs_deps.select { |x| x.start_with?("#{prebuilt_name}/") }
         data["specs"] = (specs.map(&:name) + subspec_self_deps).uniq
         data["is_static"] = podfile_item.is_static
-        data["original_compile_path"] = Configuration.build_path.gsub(/^\/private/, "") # Use realpath for /private/tmp
+        data["original_compile_path"] = Pathname.new(Configuration.build_path).realpath.to_s
         if hash = build_folder_hash(podfile_item, gitignored_files)
           data["build_folder_hash"] = hash
         end
@@ -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.rb

@@ -37,29 +37,33 @@ module PodBuilder
         item_build_settings = Configuration.build_settings_overrides[item.name] || {}
         
         # These settings need to be set as is to properly build frameworks
-        build_settings['SWIFT_COMPILATION_MODE'] = 'wholemodule'
-        build_settings['ONLY_ACTIVE_ARCH'] = 'NO'
-        build_settings['DEBUG_INFORMATION_FORMAT'] = "dwarf-with-dsym"
+        build_settings["SWIFT_COMPILATION_MODE"] = "wholemodule"
+        build_settings["ONLY_ACTIVE_ARCH"] = "NO"
+        build_settings["DEBUG_INFORMATION_FORMAT"] = "dwarf-with-dsym"
 
-        build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = platform.deployment_target.version # Fix compilation warnings on Xcode 12
+        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"
+        build_settings["CLANG_ENABLE_MODULE_DEBUGGING"] = "NO"
+        build_settings["OTHER_SWIFT_FLAGS"] = "$(inherited) -Xfrontend -no-clang-module-breadcrumbs"
 
         # Improve compile speed
-        build_settings['COMPILER_INDEX_STORE_ENABLE'] = 'NO'
-        build_settings['SWIFT_INDEX_STORE_ENABLE'] = 'NO'
-        build_settings['MTL_ENABLE_INDEX_STORE'] = 'NO'
+        build_settings["COMPILER_INDEX_STORE_ENABLE"] = "NO"
+        build_settings["SWIFT_INDEX_STORE_ENABLE"] = "NO"
+        build_settings["MTL_ENABLE_INDEX_STORE"] = "NO"
 
         if Configuration.build_system == "Legacy"
-          build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = "NO"
+          build_settings["BUILD_LIBRARY_FOR_DISTRIBUTION"] = "NO"
           raise "\n\nCan't enable library evolution support with legacy build system!".red if Configuration.library_evolution_support
         elsif Configuration.library_evolution_support
-          build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = "YES"
+          build_settings["BUILD_LIBRARY_FOR_DISTRIBUTION"] = "YES"
         end
 
-        build_settings['SWIFT_VERSION'] = item_build_settings["SWIFT_VERSION"] || item.swift_version || project_swift_version(analyzer)
+        build_settings["SWIFT_VERSION"] = item_build_settings["SWIFT_VERSION"] || item.swift_version || project_swift_version(analyzer)
+
+        if build_settings["ENABLE_BITCODE"] == "YES"
+          build_settings["BITCODE_GENERATION_MODE"] = "bitcode"
+        end
 
         item_build_settings.each do |k, v|
           build_settings[k] = v
@@ -387,7 +391,7 @@ module PodBuilder
     def self.install_using_frameworks(analyzer)
       target_settings = analyzer.podfile.target_definition_list.map(&:uses_frameworks?).uniq
       if target_settings.count == 1
-        if target_settings.first == false && ENV['DEBUGGING'].nil?
+        if target_settings.first == false && ENV["DEBUGGING"].nil?
           raise "\n\nOnly framework packaging currently supported. Please add 'use_frameworks!' at Podfile root level (not nested in targets)".red
         end
         return target_settings.first

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/rome/post_install.rb

@@ -17,7 +17,8 @@ module PodBuilder
     target_label = target.cocoapods_target_label
     
     xcodebuild(sandbox, target_label, device, deployment_target, configuration, deterministic_build, [], {})
-    excluded_archs = build_for_apple_silicon ? [] : ["arm64"]
+    excluded_archs = ["i386"] # Fixes https://github.com/Subito-it/PodBuilder/issues/17
+    excluded_archs += build_for_apple_silicon ? [] : ["arm64"]
     xcodebuild(sandbox, target_label, simulator, deployment_target, configuration, deterministic_build, excluded_archs, {})
 
     spec_names = target.specs.map { |spec| [spec.root.name, spec.root.module_name] }.uniq
@@ -258,8 +259,8 @@ module PodBuilder
     project = Xcodeproj::Project.open(project_path)
     project.targets.each do |target|
       config = target.build_configurations.find { |config| config.name.eql? configuration }
-      config.build_settings['DEBUG_INFORMATION_FORMAT'] = 'dwarf-with-dsym'
-      config.build_settings['ONLY_ACTIVE_ARCH'] = 'NO'
+      config.build_settings["DEBUG_INFORMATION_FORMAT"] = "dwarf-with-dsym"
+      config.build_settings["ONLY_ACTIVE_ARCH"] = "NO"
     end
     project.save
   end

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "2.0.0.beta.27"
+  VERSION = "2.0.0.beta.32"
 end
   

data/pod-builder.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.6'
+
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "ruby-debug-ide", '0.6.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.27
+  version: 2.0.0.beta.32
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -226,7 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"