cocoapods 1.10.0 → 1.16.0

data/lib/cocoapods/user_interface.rb

@@ -25,7 +25,7 @@ module Pod
       #
       attr_accessor :output_io
 
-      # @return [Bool] Whether the wrapping of the strings to the width of the
+      # @return [Boolean] Whether the wrapping of the strings to the width of the
       #         terminal should be disabled.
       #
       attr_accessor :disable_wrap
@@ -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?
@@ -366,7 +370,7 @@ module Pod
       #
       # @param [String]  message The message to print.
       # @param [Array]   actions The actions that the user should take.
-      # @param [Bool]    verbose_only
+      # @param [Boolean]    verbose_only
       #        Restrict the appearance of the warning to verbose mode only
       #
       # return [void]

data/lib/cocoapods/validator.rb

@@ -58,7 +58,6 @@ module Pod
         end
         result
       end
-      @use_frameworks = true
     end
 
     #-------------------------------------------------------------------------#
@@ -110,7 +109,7 @@ module Pod
     # @note   This method shows immediately which pod is being processed and
     #         overrides the printed line once the result is known.
     #
-    # @return [Bool] whether the specification passed validation.
+    # @return [Boolean] whether the specification passed validation.
     #
     def validate
       @results = []
@@ -118,7 +117,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
@@ -153,6 +152,8 @@ module Pod
           platform_message = '[watchOS] '
         elsif result.platforms == [:tvos]
           platform_message = '[tvOS] '
+        elsif result.platforms == [:visionos]
+          platform_message = '[visionOS] '
         end
 
         subspecs_message = ''
@@ -201,23 +202,23 @@ module Pod
 
     #  @!group Configuration
 
-    # @return [Bool] whether the validation should skip the checks that
+    # @return [Boolean] whether the validation should skip the checks that
     #         requires the download of the library.
     #
     attr_accessor :quick
 
-    # @return [Bool] whether the linter should not clean up temporary files
+    # @return [Boolean] whether the linter should not clean up temporary files
     #         for inspection.
     #
     attr_accessor :no_clean
 
-    # @return [Bool] whether the linter should fail as soon as the first build
+    # @return [Boolean] whether the linter should fail as soon as the first build
     #         variant causes an error. Helpful for i.e. multi-platforms specs,
     #         specs with subspecs.
     #
     attr_accessor :fail_fast
 
-    # @return [Bool] whether the validation should be performed against the root of
+    # @return [Boolean] whether the validation should be performed against the root of
     #         the podspec instead to its original source.
     #
     # @note   Uses the `:path` option of the Podfile.
@@ -225,7 +226,7 @@ module Pod
     attr_accessor :local
     alias_method :local?, :local
 
-    # @return [Bool] Whether the validator should fail on warnings, or only on errors.
+    # @return [Boolean] Whether the validator should fail on warnings, or only on errors.
     #
     attr_accessor :allow_warnings
 
@@ -233,11 +234,11 @@ module Pod
     #
     attr_accessor :only_subspec
 
-    # @return [Bool] Whether the validator should validate all subspecs.
+    # @return [Boolean] Whether the validator should validate all subspecs.
     #
     attr_accessor :no_subspecs
 
-    # @return [Bool] Whether the validator should skip building and running tests.
+    # @return [Boolean] Whether the validator should skip building and running tests.
     #
     attr_accessor :skip_tests
 
@@ -245,11 +246,11 @@ module Pod
     #
     attr_accessor :test_specs
 
-    # @return [Bool] Whether the validator should run Xcode Static Analysis.
+    # @return [Boolean] Whether the validator should run Xcode Static Analysis.
     #
     attr_accessor :analyze
 
-    # @return [Bool] Whether frameworks should be used for the installation.
+    # @return [Boolean] Whether frameworks should be used for the installation.
     #
     attr_accessor :use_frameworks
 
@@ -324,6 +325,10 @@ module Pod
       @validation_dir ||= Pathname(Dir.mktmpdir(['CocoaPods-Lint-', "-#{spec.name}"]))
     end
 
+    def validation_dir=(validation_dir)
+      @validation_dir = Pathname(validation_dir) unless validation_dir.nil?
+    end
+
     # @return [String] The SWIFT_VERSION that should be used to validate the pod. This is set by passing the
     # `--swift-version` parameter during validation.
     #
@@ -443,7 +448,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,11 +586,23 @@ 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,
+                                                                                                             :build_setting_value => '$(SRCROOT)/App/App-Info.plist')
       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
       app_target.build_configurations.each do |config|
+        # 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
         config.build_settings.delete('ASSETCATALOG_COMPILER_APPICON_NAME')
+        # Ensure this is set generally but we have seen an issue with ODRs:
+        # see: https://github.com/CocoaPods/CocoaPods/issues/10933
+        config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = 'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}'
       end
       app_project.save
       app_project.recreate_user_schemes
@@ -712,8 +729,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 +740,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 +792,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 +828,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', '.dylib') && lib_name.start_with?('lib')
+          warning('vendored_libraries', "`#{basename}` does not match the expected library name format `lib[name].a` or `lib[name].dylib`")
+        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)
@@ -963,7 +997,7 @@ module Pod
     #         the deployment target, which should be declared in
     #         the Podfile.
     #
-    # @param  [Bool] use_frameworks
+    # @param  [Boolean] use_frameworks
     #         whether frameworks should be used for the installation
     #
     # @param [Array<String>] test_spec_names
@@ -1069,10 +1103,12 @@ module Pod
         end
       when :watchos
         command += %w(CODE_SIGN_IDENTITY=- -sdk watchsimulator)
-        command += Fourflusher::SimControl.new.destination(:oldest, 'watchOS', deployment_target)
       when :tvos
         command += %w(CODE_SIGN_IDENTITY=- -sdk appletvsimulator)
         command += Fourflusher::SimControl.new.destination(:oldest, 'tvOS', deployment_target)
+      when :visionos
+        command += %w(CODE_SIGN_IDENTITY=- -sdk xrsimulator)
+        command += Fourflusher::SimControl.new.destination(:oldest, 'xrOS', deployment_target)
       end
 
       if analyze
@@ -1102,7 +1138,7 @@ module Pod
     # @param  [Platform] platform
     #         The platform to check
     #
-    # @return [Bool] True if the platform is valid
+    # @return [Boolean] True if the platform is valid
     #
     def valid_platform?(platform)
       VALID_PLATFORMS.any? { |p| p.name == platform.name }
@@ -1116,7 +1152,7 @@ module Pod
     # @param  [Specification] spec
     #         The specification which must support the provided platform
     #
-    # @return [Bool] Whether the platform is supported by the specification
+    # @return [Boolean] Whether the platform is supported by the specification
     #
     def supported_platform?(platform, spec)
       available_platforms = spec.available_platforms

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/xcframework_slice.rb

@@ -4,7 +4,7 @@ module Pod
   module Xcode
     class XCFramework
       class Slice
-        # @return [Pathname] the path to the .framework or .a of this slice
+        # @return [Pathname] the path to the .framework, .a or .dylib of this slice
         #
         attr_reader :path
 
@@ -45,9 +45,15 @@ module Pod
             when :framework
               File.basename(path, '.framework')
             when :library
-              result = File.basename(path, '.a').gsub(/^lib/, '')
-              result[0] = result.downcase[0]
-              result
+              ext = File.extname(path)
+              case ext
+              when '.a', '.dylib'
+                result = File.basename(path).gsub(/^lib/, '')
+                result[0] = result.downcase[0]
+                result
+              else
+                raise Informative, "Invalid package type `#{package_type}`"
+              end
             else
               raise Informative, "Invalid package type `#{package_type}`"
             end
@@ -68,7 +74,7 @@ module Pod
             case ext
             when '.framework'
               :framework
-            when '.a'
+            when '.a', '.dylib'
               :library
             else
               raise Informative, "Invalid XCFramework slice type `#{ext}`"
@@ -109,7 +115,7 @@ module Pod
             packaging = case ext
                         when '.framework'
                           :framework
-                        when '.a'
+                        when '.a', '.dylib'
                           :library
                         else
                           raise Informative, "Invalid XCFramework slice type `#{ext}`"
@@ -121,7 +127,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

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
@@ -86,7 +91,7 @@ module Pod
           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
+        end.sort_by(&:identifier)
         raise Informative, "XCFramework at #{path} does not contain any frameworks or libraries." if slices.empty?
       end
     end

data/lib/cocoapods.rb

@@ -4,6 +4,8 @@ require 'xcodeproj'
 # It is very likely that we'll need these and as some of those paths will atm
 # result in a I18n deprecation warning, we load those here now so that we can
 # get rid of that warning.
+require 'active_support'
+require 'active_support/core_ext'
 require 'active_support/core_ext/string/strip'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/array/conversions'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.16.0
 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: 2024-10-28 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.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -73,20 +73,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '2.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '2.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: cocoapods-plugins
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +133,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -143,7 +143,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -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.26.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -197,7 +197,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.26.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: 2.3.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: 2.3.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,28 +331,28 @@ 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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 description: |-
   CocoaPods manages library dependencies for your Xcode project.
 
@@ -452,12 +458,14 @@ files:
 - lib/cocoapods/installer/analyzer/target_inspector.rb
 - lib/cocoapods/installer/base_install_hooks_context.rb
 - lib/cocoapods/installer/installation_options.rb
+- lib/cocoapods/installer/pod_source_downloader.rb
 - lib/cocoapods/installer/pod_source_installer.rb
 - lib/cocoapods/installer/pod_source_preparer.rb
 - lib/cocoapods/installer/podfile_validator.rb
 - 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 +539,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'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: The Cocoa library package manager.
 test_files: []