cocoapods 1.10.0 → 1.11.0.beta.2

data/lib/cocoapods/target/pod_target.rb

@@ -203,7 +203,7 @@ module Pod
       end
     end
 
-    # @return [Array<FileAccessor>] The list of all files tracked.
+    # @return [Array<Pathname>] The list of all files tracked.
     #
     def all_files
       Sandbox::FileAccessor.all_files(file_accessors)
@@ -268,6 +268,23 @@ module Pod
       root_spec.module_name
     end
 
+    # @param [Specification] spec the specification
+    #
+    # @return [String] the product basename of the specification's target
+    def product_basename_for_spec(spec)
+      user_specified = build_settings_by_config_for_spec(spec).
+                       each_value.
+                       map { |settings| settings.merged_pod_target_xcconfigs['PRODUCT_NAME'] }.
+                       compact.
+                       uniq
+
+      if user_specified.size == 1
+        user_specified.first
+      else
+        spec_label(spec)
+      end
+    end
+
     # @return [Bool] Whether or not this target should be built.
     #
     # A target should not be built if it has no source files.
@@ -294,22 +311,26 @@ module Pod
       test_specs.map { |test_spec| test_spec.consumer(platform) }
     end
 
-    # @return [Array<Specification::Consumer>] the test specification consumers for
+    # @return [Array<Specification::Consumer>] the app specification consumers for
     #         the target.
     #
     def app_spec_consumers
       app_specs.map { |app_spec| app_spec.consumer(platform) }
     end
 
-    # @return [Boolean] Whether the target uses Swift code. This excludes source files from non library specs.
+    # Checks whether the target itself plus its specs uses Swift code.
+    # This check excludes source files from non library specs.
+    # Note that if a target does not need to be built (no source code),
+    # we fallback to check whether it indicates a swift version.
+    #
+    # @return [Boolean] Whether the target uses Swift code.
     #
     def uses_swift?
       return @uses_swift if defined? @uses_swift
-      @uses_swift = begin
+      @uses_swift = (!should_build? && !spec_swift_versions.empty?) ||
         file_accessors.select { |a| a.spec.library_specification? }.any? do |file_accessor|
           uses_swift_for_spec?(file_accessor.spec)
         end
-      end
     end
 
     # Checks whether a specification uses Swift or not.
@@ -373,7 +394,7 @@ module Pod
       !test_specs.empty?
     end
 
-    # @return [Boolean] Whether the target has any tests specifications.
+    # @return [Boolean] Whether the target has any app specifications.
     #
     def contains_app_specifications?
       !app_specs.empty?
@@ -422,7 +443,7 @@ module Pod
       @xcframeworks ||= begin
         file_accessors.each_with_object({}) do |file_accessor, hash|
           frameworks = file_accessor.vendored_xcframeworks.map do |framework_path|
-            Xcode::XCFramework.new(framework_path)
+            Xcode::XCFramework.new(file_accessor.spec.name, framework_path)
           end
           hash[file_accessor.spec.name] = frameworks
         end
@@ -455,7 +476,7 @@ module Pod
           prefix = Pod::Target::BuildSettings::CONFIGURATION_BUILD_DIR_VARIABLE
           prefix = configuration_build_dir unless file_accessor.spec.test_specification?
           resource_bundle_paths = file_accessor.resource_bundles.keys.map { |name| "#{prefix}/#{name.shellescape}.bundle" }
-          hash[file_accessor.spec.name] = resource_paths + resource_bundle_paths
+          hash[file_accessor.spec.name] = (resource_paths + resource_bundle_paths).map(&:to_s)
         end
       end
     end
@@ -512,7 +533,7 @@ module Pod
     # @return [Specification] The root specification for the target.
     #
     def root_spec
-      specs.first.root
+      @root_spec ||= specs.first.root
     end
 
     # @return [String] The name of the Pod that this target refers to.
@@ -619,13 +640,16 @@ module Pod
       end
     end
 
-    def non_library_spec_label(spec)
+    def spec_label(spec)
       case spec.spec_type
+      when :library then label
       when :test then test_target_label(spec)
       when :app then app_target_label(spec)
       else raise ArgumentError, "Unhandled spec type #{spec.spec_type.inspect} for #{spec.inspect}"
       end
     end
+    # for backwards compatibility
+    alias non_library_spec_label spec_label
 
     # @param  [Specification] spec
     #         The spec to return scheme configuration for.
@@ -645,7 +669,7 @@ module Pod
     # @return [Pathname] The absolute path of the copy resources script for the given spec.
     #
     def copy_resources_script_path_for_spec(spec)
-      support_files_dir + "#{non_library_spec_label(spec)}-resources.sh"
+      support_files_dir + "#{spec_label(spec)}-resources.sh"
     end
 
     # @param  [Specification] spec
@@ -654,7 +678,7 @@ module Pod
     # @return [Pathname] The absolute path of the copy resources script input file list for the given spec.
     #
     def copy_resources_script_input_files_path_for_spec(spec)
-      support_files_dir + "#{non_library_spec_label(spec)}-resources-input-files.xcfilelist"
+      support_files_dir + "#{spec_label(spec)}-resources-input-files.xcfilelist"
     end
 
     # @param  [Specification] spec
@@ -663,7 +687,7 @@ module Pod
     # @return [Pathname] The absolute path of the copy resources script output file list for the given spec.
     #
     def copy_resources_script_output_files_path_for_spec(spec)
-      support_files_dir + "#{non_library_spec_label(spec)}-resources-output-files.xcfilelist"
+      support_files_dir + "#{spec_label(spec)}-resources-output-files.xcfilelist"
     end
 
     # @param  [Specification] spec
@@ -672,7 +696,7 @@ module Pod
     # @return [Pathname] The absolute path of the embed frameworks script for the given spec.
     #
     def embed_frameworks_script_path_for_spec(spec)
-      support_files_dir + "#{non_library_spec_label(spec)}-frameworks.sh"
+      support_files_dir + "#{spec_label(spec)}-frameworks.sh"
     end
 
     # @param  [Specification] spec
@@ -681,7 +705,7 @@ module Pod
     # @return [Pathname] The absolute path of the embed frameworks script input file list for the given spec.
     #
     def embed_frameworks_script_input_files_path_for_spec(spec)
-      support_files_dir + "#{non_library_spec_label(spec)}-frameworks-input-files.xcfilelist"
+      support_files_dir + "#{spec_label(spec)}-frameworks-input-files.xcfilelist"
     end
 
     # @param  [Specification] spec
@@ -690,7 +714,7 @@ module Pod
     # @return [Pathname] The absolute path of the embed frameworks script output file list for the given spec.
     #
     def embed_frameworks_script_output_files_path_for_spec(spec)
-      support_files_dir + "#{non_library_spec_label(spec)}-frameworks-output-files.xcfilelist"
+      support_files_dir + "#{spec_label(spec)}-frameworks-output-files.xcfilelist"
     end
 
     # @return [Pathname] The absolute path of the copy xcframeworks script.
@@ -721,7 +745,7 @@ module Pod
     # @todo Remove in 2.0
     #
     def prepare_artifacts_script_path_for_spec(spec)
-      support_files_dir + "#{non_library_spec_label(spec)}-artifacts.sh"
+      support_files_dir + "#{spec_label(spec)}-artifacts.sh"
     end
 
     # @param  [Specification] spec
@@ -734,7 +758,7 @@ module Pod
     # @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"
+      support_files_dir + "#{spec_label(spec)}-artifacts-input-files.xcfilelist"
     end
 
     # @param  [Specification] spec
@@ -747,7 +771,7 @@ module Pod
     # @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"
+      support_files_dir + "#{spec_label(spec)}-artifacts-output-files.xcfilelist"
     end
 
     # @return [Pathname] The absolute path of the copy dSYMs script.
@@ -774,7 +798,7 @@ module Pod
     # @return [Pathname] The absolute path of the Info.plist for the given spec.
     #
     def info_plist_path_for_spec(spec)
-      support_files_dir + "#{non_library_spec_label(spec)}-Info.plist"
+      support_files_dir + "#{spec_label(spec)}-Info.plist"
     end
 
     # @param  [Specification] spec
@@ -783,7 +807,7 @@ module Pod
     # @return [Pathname] the absolute path of the prefix header file for the given spec.
     #
     def prefix_header_path_for_spec(spec)
-      support_files_dir + "#{non_library_spec_label(spec)}-prefix.pch"
+      support_files_dir + "#{spec_label(spec)}-prefix.pch"
     end
 
     # @return [Array<String>] The names of the Pods on which this target
@@ -1054,7 +1078,8 @@ module Pod
     #
     def uses_modular_headers?(only_if_defines_modules = true)
       return false if only_if_defines_modules && !defines_module?
-      spec_consumers.none?(&:header_mappings_dir) && spec_consumers.none?(&:header_dir)
+      return @uses_modular_headers if defined? @uses_modular_headers
+      @uses_modular_headers = spec_consumers.none?(&:header_mappings_dir) && spec_consumers.none?(&:header_dir)
     end
 
     private

data/lib/cocoapods/user_interface.rb

@@ -137,6 +137,10 @@ module Pod
       #        The indentation level relative to the current,
       #        when the message is printed.
       #
+      # @yield  The action, this block is always executed.
+      #
+      # @return [void]
+      #
       def message(message, verbose_prefix = '', relative_indentation = 2)
         message = verbose_prefix + message if config.verbose?
         puts_indented message if config.verbose?

data/lib/cocoapods/validator.rb

@@ -118,7 +118,7 @@ module Pod
       # Replace default spec with a subspec if asked for
       a_spec = spec
       if spec && @only_subspec
-        subspec_name = @only_subspec.start_with?(spec.root.name) ? @only_subspec : "#{spec.root.name}/#{@only_subspec}"
+        subspec_name = @only_subspec.start_with?("#{spec.root.name}/") ? @only_subspec : "#{spec.root.name}/#{@only_subspec}"
         a_spec = spec.subspec_by_name(subspec_name, true, true)
         @subspec_name = a_spec.name
       end
@@ -443,7 +443,7 @@ module Pod
       if !resp
         warning('url', "There was a problem validating the URL #{url}.", true)
       elsif !resp.success?
-        warning('url', "The URL (#{url}) is not reachable.", true)
+        note('url', "The URL (#{url}) is not reachable.", true)
       end
 
       resp
@@ -581,6 +581,9 @@ module Pod
     def create_app_project
       app_project = Xcodeproj::Project.new(validation_dir + 'App.xcodeproj')
       app_target = Pod::Generator::AppTargetHelper.add_app_target(app_project, consumer.platform_name, deployment_target)
+      sandbox = Sandbox.new(config.sandbox_root)
+      info_plist_path = app_project.path.dirname.+('App/App-Info.plist')
+      Pod::Installer::Xcode::PodsProjectGenerator::TargetInstallerHelper.create_info_plist_file_with_sandbox(sandbox, info_plist_path, app_target, '1.0.0', Platform.new(consumer.platform_name), :appl)
       Pod::Generator::AppTargetHelper.add_swift_version(app_target, derived_swift_version)
       # Lint will fail if a AppIcon is set but no image is found with such name
       # Happens only with Static Frameworks enabled but shouldn't be set anyway
@@ -712,8 +715,9 @@ module Pod
           if scheme.nil?
             UI.warn "Skipping compilation with `xcodebuild` because target contains no sources.\n".yellow
           else
+            requested_configuration = configuration ? configuration : 'Release'
             if analyze
-              output = xcodebuild('analyze', scheme, 'Release', :deployment_target => deployment_target)
+              output = xcodebuild('analyze', scheme, requested_configuration, :deployment_target => deployment_target)
               find_output = Executable.execute_command('find', [validation_dir, '-name', '*.html'], false)
               if find_output != ''
                 message = 'Static Analysis failed.'
@@ -722,7 +726,7 @@ module Pod
                 error('build_pod', message)
               end
             else
-              output = xcodebuild('build', scheme, configuration ? configuration : 'Release', :deployment_target => deployment_target)
+              output = xcodebuild('build', scheme, requested_configuration, :deployment_target => deployment_target)
             end
             parsed_output = parse_xcodebuild_output(output)
             translate_output_to_linter_messages(parsed_output)
@@ -774,7 +778,7 @@ module Pod
 
     FILE_PATTERNS = %i(source_files resources preserve_paths vendored_libraries
                        vendored_frameworks public_header_files preserve_paths
-                       private_header_files resource_bundles).freeze
+                       project_header_files private_header_files resource_bundles).freeze
 
     # It checks that every file pattern specified in a spec yields
     # at least one file. It requires the pods to be already present
@@ -810,6 +814,22 @@ module Pod
       add_result(message_type, 'file patterns', "The `#{attr_name}` pattern did not match any file.")
     end
 
+    def _validate_vendored_libraries
+      file_accessor.vendored_libraries.each do |lib|
+        basename = File.basename(lib)
+        lib_name = basename.downcase
+        unless lib_name.end_with?('.a') && lib_name.start_with?('lib')
+          warning('vendored_libraries', "`#{basename}` does not match the expected static library name format `lib[name].a`")
+        end
+      end
+      validate_nonempty_patterns(:vendored_libraries, :warning)
+    end
+
+    def _validate_project_header_files
+      _validate_header_files(:project_header_files)
+      validate_nonempty_patterns(:project_header_files, :warning)
+    end
+
     def _validate_private_header_files
       _validate_header_files(:private_header_files)
       validate_nonempty_patterns(:private_header_files, :warning)

data/lib/cocoapods/version_metadata.rb

@@ -1,6 +1,6 @@
 module Pod
   module VersionMetadata
-    CACHE_VERSION = '002'.freeze
+    CACHE_VERSION = '003'.freeze
 
     def self.gem_version
       Pod::VERSION

data/lib/cocoapods/xcode/xcframework.rb

@@ -5,6 +5,10 @@ require 'cocoapods/xcode/xcframework/xcframework_slice'
 module Pod
   module Xcode
     class XCFramework
+      # @return [String] target_name the target name this XCFramework belongs to
+      #
+      attr_reader :target_name
+
       # @return [Pathname] path the path to the .xcframework on disk
       #
       attr_reader :path
@@ -23,12 +27,13 @@ module Pod
 
       # Initializes an XCFramework instance with a path on disk
       #
-      # @param [Pathname, String] path
-      #        The path to the .xcframework on disk
+      # @param [String] target_name @see target_name
+      # @param [Pathname, String] path @see path
       #
       # @return [XCFramework] the xcframework at the given path
       #
-      def initialize(path)
+      def initialize(target_name, path)
+        @target_name = target_name
         @path = Pathname.new(path).tap do |p|
           raise 'Absolute path is required' unless p.absolute?
         end

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

@@ -121,7 +121,16 @@ module Pod
         # @return [Pathname] the path to the bundled binary
         #
         def binary_path
-          path + name
+          @binary_path ||= begin
+            case package_type
+            when :framework
+              path + name
+            when :library
+              path
+            else
+              raise Informative, "Invalid package type `#{package_type}`"
+            end
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0.beta.2
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2021-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0.beta.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0.beta.2
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -173,21 +173,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.21.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -197,7 +197,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.21.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -281,30 +281,36 @@ dependencies:
   name: ruby-macho
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
@@ -325,14 +331,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -458,6 +464,7 @@ files:
 - lib/cocoapods/installer/post_install_hooks_context.rb
 - lib/cocoapods/installer/post_integrate_hooks_context.rb
 - lib/cocoapods/installer/pre_install_hooks_context.rb
+- lib/cocoapods/installer/pre_integrate_hooks_context.rb
 - lib/cocoapods/installer/project_cache/project_cache.rb
 - lib/cocoapods/installer/project_cache/project_cache_analysis_result.rb
 - lib/cocoapods/installer/project_cache/project_cache_analyzer.rb
@@ -531,15 +538,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.3
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.3
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: The Cocoa library package manager.
 test_files: []