build.rb in pod-builder-2.0.0.beta.27

- old
+ new

@@ -47,11 +47,11 @@
 
         Podfile.restore_podfile_clean(all_buildable_items)
 
         restore_file_error = Podfile.restore_file_sanity_check
   
-        check_splitted_subspecs_are_static(all_buildable_items)
+        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
 
@@ -60,45 +60,48 @@
         # 2. pods to build in release
         # 3. pods to build in debug
 
         check_not_building_development_pods(pods_to_build)
 
-        pods_to_build_subspecs = pods_to_build.select { |x| x.is_subspec && Configuration.subspecs_to_split.include?(x.name) }
+        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
+        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.map { |x| [x] }
+        podfiles_items = pods_to_build_subspecs
         podfiles_items.push(pods_to_build_debug)
         podfiles_items.push(pods_to_build_release)   
 
-        licenses = []
+        install_using_frameworks = Podfile::install_using_frameworks(analyzer)
         
-        podfiles_items.select { |x| x.count > 0 }.each do |podfile_items|
+        install_result = InstallResult.new
+        podfiles_items.reject { |x| x.empty? }.each do |podfile_items|
           build_configuration = podfile_items.map(&:build_configuration).uniq.first
           
           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)
+          podfile_content = Podfile.from_podfile_items(podfile_items, analyzer, build_configuration, install_using_frameworks)
           
-          licenses += Install.podfile(podfile_content, podfile_items, podfile_items.first.build_configuration)
+          install_result += Install.podfile(podfile_content, podfile_items, podfile_items.first.build_configuration)          
           
           # remove lockfile which gets unexplicably created
           FileUtils.rm_f(PodBuilder::basepath("Podfile.lock"))
         end
 
+        install_result.write_prebuilt_info_files
+
         Clean::prebuilt_items(all_buildable_items)
 
-        Licenses::write(licenses, all_buildable_items)
+        Licenses::write(install_result.licenses, all_buildable_items)
 
-        Podspec::generate(all_buildable_items, analyzer)
+        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 }
@@ -120,10 +123,24 @@
         return 0
       end
 
       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?("/")
             raise "\n\nCan't build subspec #{pod_to_build} refer to podspec name.\n\nUse `pod_builder build #{pods_to_build.map { |x| x.split("/").first }.uniq.join(" ")}` instead\n\n".red
           end
@@ -137,10 +154,41 @@
         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)
         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
@@ -149,13 +197,13 @@
           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
+          puts "\n\n#{warn_message}".yellow
         else
-          raise "\n\n🚨️  #{warn_message}".red
+          raise "\n\n#{warn_message}".red
         end
       end
 
       def self.check_dependencies_build_configurations(pods)
         pods.each do |pod|
@@ -194,12 +242,12 @@
         expected_stripped = Podfile::POST_INSTALL_ACTIONS.map { |x| Podfile.strip_line(x) }
 
         if !expected_stripped.all? { |x| stripped_lines.include?(x) }
           warn_message = "PodBuilder's post install actions missing from application Podfile!\n"
           if OPTIONS[:allow_warnings]
-            puts "\n\n⚠️  #{warn_message}".yellow
+            puts "\n\n#{warn_message}".yellow
           else
-            raise "\n\n🚨️  #{warn_message}".red
+            raise "\n\n#{warn_message}".red
           end
         end
       end
 
       def self.resolve_pods_to_build(argument_pods, buildable_items)