cocoapods 1.9.0 → 1.10.0.beta.2

data/lib/cocoapods/target/pod_target.rb

@@ -103,9 +103,9 @@ module Pod
       end]
     end
 
-    # @return [Hash{String => (Specification,PodTarget)}] tuples of app specs and pod targets by test spec name.
+    # @return [Hash{Specification => (Specification,PodTarget)}] tuples of app specs and pod targets by test spec.
     #
-    attr_accessor :test_app_hosts_by_spec_name
+    attr_accessor :test_app_hosts_by_spec
 
     # @return [Hash{String => BuildSettings}] the test spec build settings for this target.
     #
@@ -153,7 +153,7 @@ module Pod
       self.dependent_targets = []
       self.test_dependent_targets_by_spec_name = Hash[test_specs.map { |ts| [ts.name, []] }]
       self.app_dependent_targets_by_spec_name = Hash[app_specs.map { |as| [as.name, []] }]
-      @test_app_hosts_by_spec_name = {}
+      @test_app_hosts_by_spec = {}
       @build_config_cache = {}
       @test_spec_build_settings_by_config = create_test_build_settings_by_config
       @app_spec_build_settings_by_config = create_app_build_settings_by_config
@@ -171,7 +171,7 @@ module Pod
         cache_key = [specs, target_definition]
         cache[cache_key] ||= begin
           target = PodTarget.new(sandbox, build_type, user_build_configurations, archs, platform, specs,
-                                 [target_definition], file_accessors, target_definition.label)
+                                 [target_definition], file_accessors, target_definition.label, swift_version)
           scope_dependent_targets = ->(dependent_targets) do
             dependent_targets.flat_map do |pod_target|
               pod_target.scoped(cache).select { |pt| pt.target_definitions == [target_definition] }
@@ -185,8 +185,8 @@ module Pod
           target.app_dependent_targets_by_spec_name_by_config = Hash[app_dependent_targets_by_spec_name_by_config.map do |spec_name, app_pod_targets_by_config|
             [spec_name, Hash[app_pod_targets_by_config.map { |k, v| [k, scope_dependent_targets[v]] }]]
           end]
-          target.test_app_hosts_by_spec_name = Hash[test_app_hosts_by_spec_name.map do |spec_name, (app_host_spec, app_pod_target)|
-            [spec_name, [app_host_spec, app_pod_target.scoped(cache).find { |pt| pt.target_definitions == [target_definition] }]]
+          target.test_app_hosts_by_spec = Hash[test_app_hosts_by_spec.map do |spec, (app_host_spec, app_pod_target)|
+            [spec, [app_host_spec, app_pod_target.scoped(cache).find { |pt| pt.target_definitions == [target_definition] }]]
           end]
           target
         end
@@ -430,13 +430,22 @@ module Pod
     end
 
     # @return [Hash{String=>Array<String>}] The resource and resource bundle paths this target depends upon keyed by
-    #         spec name. Resources for app specs and test specs are directly added to “Copy Bundle Resources” phase
-    #         from the generated targets for frameworks, but not libraries. Therefore they are not part of the resource paths.
+    #         spec name. Resource (not resource bundles) paths can vary depending on the type of spec:
+    #           - App specs _always_ get their resource paths added to "Copy Bundle Resources" phase from
+    #             [PodTargetInstaller] therefore their resource paths are never included here.
+    #           - Test specs may have their resource paths added to "Copy Bundle Resources" if the target itself is
+    #             built as a framework, which is again checked and handled by PodTargetInstaller. If that is true then
+    #             the resource paths are not included, otherwise they are included and handled via the CocoaPods copy
+    #             resources script phase.
+    #           - Library specs _do not_ have per-configuration CocoaPods copy resources script phase and their resource
+    #             paths will be added to "Copy Bundle Resources" phase if the target is built as a framework because
+    #             it supports it. We always include the resource paths for library specs because they are also
+    #             integrated to the user target.
     #
     def resource_paths
       @resource_paths ||= begin
         file_accessors.each_with_object({}) do |file_accessor, hash|
-          resource_paths = if file_accessor.spec.non_library_specification? && build_as_framework?
+          resource_paths = if file_accessor.spec.app_specification? || (file_accessor.spec.test_specification? && build_as_framework?)
                              []
                            else
                              file_accessor.resources.map do |res|
@@ -582,7 +591,7 @@ module Pod
     #         app host, and the second item is the target name of the app host
     #
     def app_host_target_label(test_spec)
-      app_spec, app_target = test_app_hosts_by_spec_name[test_spec.name]
+      app_spec, app_target = test_app_hosts_by_spec[test_spec]
 
       if app_spec
         [app_target.name, app_target.app_target_label(app_spec)]
@@ -601,7 +610,7 @@ module Pod
     #
     def app_host_dependent_targets_for_spec(spec, configuration: nil)
       return [] unless spec.test_specification? && spec.consumer(platform).test_type == :unit
-      app_host_info = test_app_hosts_by_spec_name[spec.name]
+      app_host_info = test_app_hosts_by_spec[spec]
       if app_host_info.nil?
         []
       else
@@ -684,11 +693,33 @@ module Pod
       support_files_dir + "#{non_library_spec_label(spec)}-frameworks-output-files.xcfilelist"
     end
 
+    # @return [Pathname] The absolute path of the copy xcframeworks script.
+    #
+    def copy_xcframeworks_script_path
+      support_files_dir + "#{label}-xcframeworks.sh"
+    end
+
+    # @return [String] The path of the copy xcframeworks input files file list
+    #
+    def copy_xcframeworks_script_input_files_path
+      support_files_dir + "#{label}-xcframeworks-input-files.xcfilelist"
+    end
+
+    # @return [String] The path of the copy xcframeworks output files file list
+    #
+    def copy_xcframeworks_script_output_files_path
+      support_files_dir + "#{label}-xcframeworks-output-files.xcfilelist"
+    end
+
     # @param  [Specification] spec
     #         The spec this script path is for.
     #
     # @return [Pathname] The absolute path of the prepare artifacts script for the given spec.
     #
+    # @deprecated
+    #
+    # @todo Remove in 2.0
+    #
     def prepare_artifacts_script_path_for_spec(spec)
       support_files_dir + "#{non_library_spec_label(spec)}-artifacts.sh"
     end
@@ -698,6 +729,10 @@ module Pod
     #
     # @return [Pathname] The absolute path of the prepare artifacts script input file list for the given spec.
     #
+    # @deprecated
+    #
+    # @todo Remove in 2.0
+    #
     def prepare_artifacts_script_input_files_path_for_spec(spec)
       support_files_dir + "#{non_library_spec_label(spec)}-artifacts-input-files.xcfilelist"
     end
@@ -707,10 +742,32 @@ module Pod
     #
     # @return [Pathname] The absolute path of the prepare artifacts script output file list for the given spec.
     #
+    # @deprecated
+    #
+    # @todo Remove in 2.0
+    #
     def prepare_artifacts_script_output_files_path_for_spec(spec)
       support_files_dir + "#{non_library_spec_label(spec)}-artifacts-output-files.xcfilelist"
     end
 
+    # @return [Pathname] The absolute path of the copy dSYMs script.
+    #
+    def copy_dsyms_script_path
+      support_files_dir + "#{label}-copy-dsyms.sh"
+    end
+
+    # @return [Pathname] The absolute path of the copy dSYM script phase input file list.
+    #
+    def copy_dsyms_script_input_files_path
+      support_files_dir + "#{label}-copy-dsyms-input-files.xcfilelist"
+    end
+
+    # @return [Pathname] The absolute path of the copy dSYM script phase output file list.
+    #
+    def copy_dsyms_script_output_files_path
+      support_files_dir + "#{label}-copy-dsyms-output-files.xcfilelist"
+    end
+
     # @param  [Specification] spec
     #         The spec this Info.plist path is for.
     #
@@ -1065,5 +1122,22 @@ module Pod
       end
       mappings
     end
+
+    # @!group Deprecated APIs
+    # ----------------------------------------------------------------------- #
+
+    public
+
+    # @deprecated Use `test_app_hosts_by_spec` instead.
+    #
+    # @todo Remove in 2.0
+    #
+    # @return [Hash{String => (Specification,PodTarget)}] tuples of app specs and pod targets by test spec name.
+    #
+    def test_app_hosts_by_spec_name
+      Hash[test_app_hosts_by_spec.map do |spec, value|
+        [spec.name, value]
+      end]
+    end
   end
 end

data/lib/cocoapods/user_interface/error_report.rb

@@ -31,7 +31,7 @@ module Pod
 ### Error
 
 ```
-#{exception.class} - #{exception.message}
+#{exception.class} - #{exception.message.force_encoding('UTF-8')}
 #{exception.backtrace.join("\n") if exception.backtrace}
 ```
 

data/lib/cocoapods/user_interface/inspector_reporter.rb

@@ -1,3 +1,4 @@
+require 'addressable'
 require 'uri'
 
 module Pod
@@ -8,8 +9,6 @@ module Pod
       # Called just as the investigation has begun.
       # Lets the user know that it's looking for an issue.
       #
-      # @param [query] String unused
-      #
       # @param [GhInspector::Inspector] inspector
       #        The current inspector
       #
@@ -25,9 +24,6 @@ module Pod
       # @param [GhInspector::InspectionReport] report
       #        Report a list of the issues
       #
-      # @param [GhInspector::Inspector] inspector
-      #        The current inspector
-      #
       # @return [void]
       #
       def inspector_successfully_received_report(report, _)
@@ -41,9 +37,6 @@ module Pod
 
       # Called once the report has been received, but when there are no issues found.
       #
-      # @param [GhInspector::InspectionReport] report
-      #        An empty report
-      #
       # @param [GhInspector::Inspector] inspector
       #        The current inspector
       #
@@ -68,7 +61,7 @@ module Pod
       # @return [void]
       #
       def inspector_could_not_create_report(error, query, inspector)
-        safe_query = URI.escape query
+        safe_query = Addressable::URI.escape query
         UI.puts 'Could not access the GitHub API, you may have better luck via the website.'
         UI.puts "https://github.com/#{inspector.repo_owner}/#{inspector.repo_name}/search?q=#{safe_query}&type=Issues&utf8=✓"
         UI.puts "Error: #{error.name}"
@@ -77,7 +70,7 @@ module Pod
       private
 
       def print_issue_full(issue)
-        safe_url = URI.escape issue.html_url
+        safe_url = Addressable::URI.escape issue.html_url
         UI.puts " - #{issue.title}"
         UI.puts "   #{safe_url} [#{issue.state}] [#{issue.comments} comment#{issue.comments == 1 ? '' : 's'}]"
         UI.puts "   #{pretty_date(issue.updated_at)}"

data/lib/cocoapods/validator.rb

@@ -241,6 +241,10 @@ module Pod
     #
     attr_accessor :skip_tests
 
+    # @return [Array<String>] List of test_specs to run. If nil, all tests are run (unless skip_tests is specified).
+    #
+    attr_accessor :test_specs
+
     # @return [Bool] Whether the validator should run Xcode Static Analysis.
     #
     attr_accessor :analyze
@@ -253,6 +257,10 @@ module Pod
     #
     attr_accessor :use_modular_headers
 
+    # @return [Boolean] Whether static frameworks should be used for the installation.
+    #
+    attr_accessor :use_static_frameworks
+
     # @return [Boolean] Whether attributes that affect only public sources
     #         Bool be skipped.
     #
@@ -271,6 +279,8 @@ module Pod
     attr_accessor :skip_import_validation
     alias_method :skip_import_validation?, :skip_import_validation
 
+    attr_accessor :configuration
+
     #-------------------------------------------------------------------------#
 
     # !@group Lint results
@@ -557,7 +567,7 @@ module Pod
 
     def download_pod
       test_spec_names = consumer.spec.test_specs.select { |ts| ts.supported_on_platform?(consumer.platform_name) }.map(&:name)
-      podfile = podfile_from_spec(consumer.platform_name, deployment_target, use_frameworks, test_spec_names, use_modular_headers)
+      podfile = podfile_from_spec(consumer.platform_name, deployment_target, use_frameworks, test_spec_names, use_modular_headers, use_static_frameworks)
       sandbox = Sandbox.new(config.sandbox_root)
       @installer = Installer.new(sandbox, podfile)
       @installer.use_default_plugins = false
@@ -584,7 +594,7 @@ module Pod
       app_target = app_project.targets.first
       pod_target = validation_pod_target
       Pod::Generator::AppTargetHelper.add_app_project_import(app_project, app_target, pod_target, consumer.platform_name)
-      Pod::Generator::AppTargetHelper.add_xctest_search_paths(app_target) if @installer.pod_targets.any? { |pt| pt.spec_consumers.any? { |c| c.frameworks.include?('XCTest') } }
+      Pod::Generator::AppTargetHelper.add_xctest_search_paths(app_target) if @installer.pod_targets.any? { |pt| pt.spec_consumers.any? { |c| c.frameworks.include?('XCTest') || c.weak_frameworks.include?('XCTest') } }
       Pod::Generator::AppTargetHelper.add_empty_swift_file(app_project, app_target) if @installer.pod_targets.any?(&:uses_swift?)
       app_project.save
       Xcodeproj::XCScheme.share_scheme(app_project.path, 'App')
@@ -710,7 +720,7 @@ module Pod
                 error('build_pod', message)
               end
             else
-              output = xcodebuild('build', scheme, 'Release')
+              output = xcodebuild('build', scheme, configuration ? configuration : 'Release')
             end
             parsed_output = parse_xcodebuild_output(output)
             translate_output_to_linter_messages(parsed_output)
@@ -732,7 +742,17 @@ module Pod
       else
         UI.message "\nTesting with `xcodebuild`.\n".yellow do
           pod_target = validation_pod_target
-          consumer.spec.test_specs.each do |test_spec|
+          all_test_specs = consumer.spec.test_specs
+          unless test_specs.nil?
+            test_spec_names = all_test_specs.map(&:base_name)
+            all_test_specs.select! { |test_spec| test_specs.include? test_spec.base_name }
+            test_specs.each do |test_spec|
+              unless test_spec_names.include? test_spec
+                UI.warn "Requested test spec `#{test_spec}` does not exist in the podspec. Existing test specs are `#{test_spec_names}`"
+              end
+            end
+          end
+          all_test_specs.each do |test_spec|
             if !test_spec.supported_on_platform?(consumer.platform_name)
               UI.warn "Skipping test spec `#{test_spec.name}` on platform `#{consumer.platform_name}` since it is not supported.\n".yellow
             else
@@ -953,7 +973,7 @@ module Pod
     # @note   The generated podfile takes into account whether the linter is
     #         in local mode.
     #
-    def podfile_from_spec(platform_name, deployment_target, use_frameworks = true, test_spec_names = [], use_modular_headers = false)
+    def podfile_from_spec(platform_name, deployment_target, use_frameworks = true, test_spec_names = [], use_modular_headers = false, use_static_frameworks = false)
       name     = subspec_name || spec.name
       podspec  = file.realpath
       local    = local?
@@ -963,12 +983,16 @@ module Pod
       additional_path_pods = (include_podspecs ? Dir.glob(include_podspecs) : []) .select { |path| spec.name != Specification.from_file(path).name } - additional_podspec_pods
 
       Pod::Podfile.new do
-        install! 'cocoapods', :deterministic_uuids => false
+        install! 'cocoapods', :deterministic_uuids => false, :warn_for_unused_master_specs_repo => false
         # By default inhibit warnings for all pods, except the one being validated.
         inhibit_all_warnings!
         urls.each { |u| source(u) }
         target 'App' do
-          use_frameworks!(use_frameworks)
+          if use_static_frameworks
+            use_frameworks!(:linkage => :static)
+          else
+            use_frameworks!(use_frameworks)
+          end
           use_modular_headers! if use_modular_headers
           platform(platform_name, deployment_target)
           if local
@@ -1016,7 +1040,7 @@ module Pod
           l.include?('note: ') && (l !~ /expanded from macro/)
       end
       selected_lines.map do |l|
-        new = l.gsub(%r{#{validation_dir}/Pods/}, '')
+        new = l.force_encoding('UTF-8').gsub(%r{#{validation_dir}/Pods/}, '')
         new.gsub!(/^ */, ' ')
       end
     end

data/lib/cocoapods/xcode/framework_paths.rb

@@ -9,7 +9,7 @@ module Pod
       #
       attr_reader :dsym_path
 
-      # @return [Array, Nil] the bcsymbolmap files path array, if one exists
+      # @return [Array<String>, Nil] the bcsymbolmap files path array, if one exists
       #
       attr_reader :bcsymbolmap_paths
 

data/lib/cocoapods/xcode/xcframework.rb

@@ -52,13 +52,22 @@ module Pod
       # @return [Boolean] true if any slices use dynamic linkage
       #
       def includes_dynamic_slices?
-        slices.any? { |slice| Xcode::LinkageAnalyzer.dynamic_binary?(slice.binary_path) }
+        build_type.dynamic?
       end
 
       # @return [Boolean] true if any slices use dynamic linkage
       #
       def includes_static_slices?
-        slices.any? { |slice| !Xcode::LinkageAnalyzer.dynamic_binary?(slice.binary_path) }
+        build_type.static?
+      end
+
+      # @return [Pod::BuildType] the build type of the contained slices
+      #
+      # @note As CocoaPods does not support mixed packaging nor linkage for xcframework slices,
+      #       we pick the first slice and assume all are the same
+      #
+      def build_type
+        @build_type ||= slices.first.build_type
       end
 
       private
@@ -71,10 +80,14 @@ module Pod
           archs = library['SupportedArchitectures']
           platform_name = library['SupportedPlatform']
           platform_variant = library['SupportedPlatformVariant']
+          headers = library['HeadersPath']
 
-          slice_path = path.join(identifier).join(relative_path)
-          XCFramework::Slice.new(slice_path, identifier, archs, platform_name, platform_variant)
+          slice_root = path.join(identifier)
+          slice_path = slice_root.join(relative_path)
+          headers = slice_root.join(headers) unless headers.nil?
+          XCFramework::Slice.new(slice_path, identifier, archs, platform_name, :platform_variant => platform_variant, :headers => headers)
         end
+        raise Informative, "XCFramework at #{path} does not contain any frameworks or libraries." if slices.empty?
       end
     end
   end

data/lib/cocoapods/xcode/xcframework/xcframework_slice.rb

@@ -1,8 +1,10 @@
+require 'cocoapods/xcode/linkage_analyzer'
+
 module Pod
   module Xcode
     class XCFramework
       class Slice
-        # @return [Pathname] the path to the .framework root of this framework slice
+        # @return [Pathname] the path to the .framework or .a of this slice
         #
         attr_reader :path
 
@@ -22,24 +24,100 @@ module Pod
         #
         attr_reader :platform_variant
 
-        def initialize(path, identifier, archs, platform, platform_variant = nil)
+        # @return [Pathname] the path to the headers
+        #
+        attr_reader :headers
+
+        def initialize(path, identifier, archs, platform, platform_variant: nil, headers: path.join('Headers'))
           @path = path
           @identifier = identifier
           @supported_archs = archs
           @platform = Pod::Platform.new(platform)
           @platform_variant = platform_variant.to_sym unless platform_variant.nil?
+          @headers = headers
         end
 
         # @return [String] the name of the framework
         #
         def name
-          @name ||= File.basename(path, '.framework')
+          @name ||= begin
+            case package_type
+            when :framework
+              File.basename(path, '.framework')
+            when :library
+              result = File.basename(path, '.a').gsub(/^lib/, '')
+              result[0] = result.downcase[0]
+              result
+            else
+              raise Informative, "Invalid package type `#{package_type}`"
+            end
+          end
         end
 
+        # @return [Boolean] true if this is a slice built for simulator
+        #
         def simulator_variant?
           @platform_variant == :simulator
         end
 
+        # @return [Symbol] the package type of the slice - either :framework or :library
+        #
+        def package_type
+          @package_type ||= begin
+            ext = File.extname(path)
+            case ext
+            when '.framework'
+              :framework
+            when '.a'
+              :library
+            else
+              raise Informative, "Invalid XCFramework slice type `#{ext}`"
+            end
+          end
+        end
+
+        # @return [Boolean] true if this slice is a framework, not a library
+        #
+        def framework?
+          build_type.framework?
+        end
+
+        # @return [Boolean] true if this slice is a library, not a framework
+        #
+        def library?
+          build_type.library?
+        end
+
+        # @return [Boolean] true if this slice contains a statically-linked binary
+        #
+        def static?
+          build_type.static?
+        end
+
+        # @return [Boolean] true if this slice contains a dynamically-linked binary
+        #
+        def dynamic?
+          build_type.dynamic?
+        end
+
+        # @return [BuildType] the build type of the binary
+        #
+        def build_type
+          @build_type ||= begin
+            linkage = Xcode::LinkageAnalyzer.dynamic_binary?(binary_path) ? :dynamic : :static
+            ext = File.extname(path)
+            packaging = case ext
+                        when '.framework'
+                          :framework
+                        when '.a'
+                          :library
+                        else
+                          raise Informative, "Invalid XCFramework slice type `#{ext}`"
+                        end
+            BuildType.new(:linkage => linkage, :packaging => packaging)
+          end
+        end
+
         # @return [Pathname] the path to the bundled binary
         #
         def binary_path