cocoapods 1.11.3 → 1.12.0

data/lib/cocoapods/project.rb

@@ -26,7 +26,7 @@ module Pod
     #
     attr_reader :dependencies_group
 
-    # @return [Bool] Bool indicating if this project is a pod target subproject.
+    # @return [Boolean] Bool indicating if this project is a pod target subproject.
     # Used by `generate_multiple_pod_projects` installation option.
     #
     attr_reader :pod_target_subproject
@@ -39,7 +39,7 @@ module Pod
     # Initialize a new instance
     #
     # @param  [Pathname, String] path @see Xcodeproj::Project#path
-    # @param  [Bool] skip_initialization Whether the project should be initialized from scratch.
+    # @param  [Boolean] skip_initialization Whether the project should be initialized from scratch.
     # @param  [Int] object_version Object version to use for serialization, defaults to Xcode 3.2 compatible.
     #
     def initialize(path, skip_initialization = false,
@@ -107,10 +107,10 @@ module Pod
     # @param  [#to_s] path
     #         The path to the root of the Pod.
     #
-    # @param  [Bool] development
+    # @param  [Boolean] development
     #         Whether the group should be added to the Development Pods group.
     #
-    # @param  [Bool] absolute
+    # @param  [Boolean] absolute
     #         Whether the path of the group should be set as absolute.
     #
     # @return [PBXGroup] The new group.
@@ -136,7 +136,7 @@ module Pod
     # @param [Project] project
     #        The subproject to be added.
     #
-    # @param [Bool] development
+    # @param [Boolean] development
     #        Whether the project should be added to the Development Pods group.
     #        For projects where `pod_target_subproject` is enabled, all subprojects are added into the Dependencies group.
     #
@@ -156,7 +156,7 @@ module Pod
     # @param [TargetMetadata] metadata
     #        The project metadata to be added.
     #
-    # @param [Bool] development
+    # @param [Boolean] development
     #        Whether the project should be added to the Development Pods group.
     #        For projects where `pod_target_subproject` is enabled, all subprojects are added into the Dependencies group.
     #
@@ -253,7 +253,7 @@ module Pod
     # @param  [PBXGroup] group
     #         The group for the new file reference.
     #
-    # @param  [Bool] reflect_file_system_structure
+    # @param  [Boolean] reflect_file_system_structure
     #         Whether group structure should reflect the file system structure.
     #         If yes, where needed, intermediate groups are created, similar to
     #         how mkdir -p operates.
@@ -430,7 +430,7 @@ module Pod
     # @param  [PBXGroup] group
     #         The parent group used as the base of the relative path.
     #
-    # @param  [Bool] reflect_file_system_structure
+    # @param  [Boolean] reflect_file_system_structure
     #         Whether group structure should reflect the file system structure.
     #         If yes, where needed, intermediate groups are created, similar to
     #         how mkdir -p operates.

data/lib/cocoapods/resolver/resolver_specification.rb

@@ -12,7 +12,7 @@ module Pod
       #
       attr_reader :source
 
-      # @return [Bool] whether this resolved specification is used by non-library targets.
+      # @return [Boolean] whether this resolved specification is used by non-library targets.
       #
       attr_reader :used_by_non_library_targets_only
       alias used_by_non_library_targets_only? used_by_non_library_targets_only

data/lib/cocoapods/resolver.rb

@@ -34,7 +34,7 @@ module Pod
     #
     attr_reader :sources
 
-    # @return [Bool] Whether the resolver has sources repositories up-to-date.
+    # @return [Boolean] Whether the resolver has sources repositories up-to-date.
     #
     attr_reader :specs_updated
     alias specs_updated? specs_updated
@@ -531,7 +531,7 @@ You have either:#{specs_update_message}
     #
     # @param  [Specification] spec
     #
-    # @return [Bool]
+    # @return [Boolean]
     #
     def spec_is_platform_compatible?(dependency_graph, dependency, spec)
       # This is safe since a pod will only be in locked dependencies if we're
@@ -575,7 +575,7 @@ You have either:#{specs_update_message}
     # Whether the given `edge` should be followed to find dependencies for the
     # given `target_platform`.
     #
-    # @return [Bool]
+    # @return [Boolean]
     #
     def edge_is_valid_for_target_platform?(edge, target_platform)
       @edge_validity ||= Hash.new do |hash, edge_and_platform|

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -513,7 +513,7 @@ module Pod
       # @option options [Array<String>] :exclude_patterns
       #         The exclude patterns to pass to the PathList.
       #
-      # @option options [Bool] :include_dirs
+      # @option options [Boolean] :include_dirs
       #         Whether directories should be also included or just plain
       #         files.
       #

data/lib/cocoapods/sandbox/path_list.rb

@@ -164,7 +164,7 @@ module Pod
 
       # @!group Private helpers
 
-      # @return [Bool] Wether a path is a directory. The result of this method
+      # @return [Boolean] Wether a path is a directory. The result of this method
       #         computed without accessing the file system and is case
       #         insensitive.
       #

data/lib/cocoapods/sandbox.rb

@@ -67,6 +67,7 @@ module Pod
       @root = Pathname.new(root).realpath
       @public_headers = HeadersStore.new(self, 'Public', :public)
       @predownloaded_pods = []
+      @downloaded_pods = []
       @checkout_sources = {}
       @development_pods = {}
       @pods_with_absolute_path = []
@@ -84,18 +85,17 @@ module Pod
 
     # Removes the files of the Pod with the given name from the sandbox.
     #
+    # @param [String] name The name of the pod, which is used to calculate additional paths to clean.
+    # @param [String] pod_dir The directory of the pod to clean.
+    #
     # @return [void]
     #
-    def clean_pod(name)
-      root_name = Specification.root_name(name)
-      unless local?(root_name)
-        path = pod_dir(name)
-        path.rmtree if path.exist?
-      end
+    def clean_pod(name, pod_dir)
+      pod_dir.rmtree if pod_dir&.exist?
       podspec_path = specification_path(name)
-      podspec_path.rmtree if podspec_path
+      podspec_path.rmtree if podspec_path&.exist?
       pod_target_project_path = pod_target_project_path(name)
-      pod_target_project_path.rmtree if pod_target_project_path.exist?
+      pod_target_project_path.rmtree if pod_target_project_path&.exist?
     end
 
     # Prepares the sandbox for a new installation removing any file that will
@@ -192,7 +192,7 @@ module Pod
     #
     # @param  [String] name
     #
-    # @return [Bool] true if originally absolute
+    # @return [Boolean] true if originally absolute
     #
     def local_path_was_absolute?(name)
       @pods_with_absolute_path.include? name
@@ -342,7 +342,7 @@ module Pod
     # @param  [String] name
     #         The name of the Pod.
     #
-    # @return [Bool] Whether the Pod has been pre-downloaded.
+    # @return [Boolean] Whether the Pod has been pre-downloaded.
     #
     def predownloaded?(name)
       root_name = Specification.root_name(name)
@@ -351,6 +351,42 @@ module Pod
 
     #--------------------------------------#
 
+    # Marks a Pod as downloaded
+    #
+    # @param  [String] name
+    #         The name of the Pod.
+    #
+    # @return [void]
+    #
+    def store_downloaded_pod(name)
+      root_name = Specification.root_name(name)
+      downloaded_pods << root_name
+    end
+
+    # Checks if a Pod has been downloaded before the installation
+    # process.
+    #
+    # @param  [String] name
+    #         The name of the Pod.
+    #
+    # @return [Boolean] Whether the Pod has been downloaded.
+    #
+    def downloaded?(name)
+      root_name = Specification.root_name(name)
+      downloaded_pods.include?(root_name)
+    end
+
+    # @return [Array<String>] The names of the pods that have been
+    #         downloaded before the installation process begins.
+    #         These are distinct from the pre-downloaded pods in
+    #         that these do not necessarily come from external
+    #         sources, and are only downloaded right before
+    #         installation if the parallel_pod_downloads option is on.
+    #
+    attr_reader :downloaded_pods
+
+    #--------------------------------------#
+
     # Stores the local path of a Pod.
     #
     # @param  [String] name
@@ -406,7 +442,7 @@ module Pod
     # @param  [Pathname, String] path
     #         The path to the local Podspec
     #
-    # @param  [Bool] was_absolute
+    # @param  [Boolean] was_absolute
     #         True if the specified local path was absolute.
     #
     # @return [void]
@@ -428,7 +464,7 @@ module Pod
     # @param  [String] name
     #         The name of the Pod.
     #
-    # @return [Bool] Whether the Pod is locally sourced.
+    # @return [Boolean] Whether the Pod is locally sourced.
     #
     def local?(name)
       !local_podspec(name).nil?

data/lib/cocoapods/sources_manager.rb

@@ -119,7 +119,7 @@ module Pod
       #
       # @param  [String] source_name
       #
-      # @param  [Bool] show_output
+      # @param  [Boolean] show_output
       #
       # @return [void]
       #

data/lib/cocoapods/target/build_settings.rb

@@ -443,7 +443,7 @@ module Pod
       def merged_xcconfigs(xcconfig_values_by_consumer_by_key, attribute, overriding: {})
         xcconfig_values_by_consumer_by_key.each_with_object(overriding.dup) do |(key, values_by_consumer), xcconfig|
           uniq_values = values_by_consumer.values.uniq
-          values_are_bools = uniq_values.all? { |v| v =~ /\A(yes|no)\z/i }
+          values_are_bools = uniq_values.all? { |v| v.is_a?(String) && v =~ /\A(yes|no)\z/i }
           if values_are_bools
             # Boolean build settings
             if uniq_values.count > 1
@@ -602,6 +602,11 @@ module Pod
           target.pod_target_srcroot
         end
 
+        # @return [String]
+        define_build_settings_method :pods_development_language, :build_setting => true do
+          '${DEVELOPMENT_LANGUAGE}'
+        end
+
         #-------------------------------------------------------------------------#
 
         # @!group Frameworks

data/lib/cocoapods/target/pod_target.rb

@@ -285,7 +285,7 @@ module Pod
       end
     end
 
-    # @return [Bool] Whether or not this target should be built.
+    # @return [Boolean] Whether or not this target should be built.
     #
     # A target should not be built if it has no source files.
     #
@@ -947,7 +947,7 @@ module Pod
 
     # Checks if warnings should be inhibited for this pod.
     #
-    # @return [Bool]
+    # @return [Boolean]
     #
     def inhibit_warnings?
       return @inhibit_warnings if defined? @inhibit_warnings

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
@@ -370,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 = []
@@ -201,23 +200,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 +224,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 +232,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 +244,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 +323,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.
     #
@@ -827,8 +830,8 @@ module Pod
       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`")
+        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)
@@ -992,7 +995,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
@@ -1098,7 +1101,6 @@ 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)
@@ -1131,7 +1133,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 }
@@ -1145,7 +1147,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/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}`"

data/lib/cocoapods/xcode/xcframework.rb

@@ -91,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.11.3
+  version: 1.12.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2023-02-27 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.11.3
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.3
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +73,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -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'
@@ -283,7 +283,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.3.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -293,7 +293,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.3.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -345,14 +345,14 @@ dependencies:
     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.
 
@@ -458,6 +458,7 @@ 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