cocoapods 1.14.3 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 372730283427bdac2346d3cffe08336a98f10197e2c231bcad1cab2b071e4990
-  data.tar.gz: c323b662e31bc4aeebe0039ade710f688cf3f5b12a047ea156f56bf6e7b77bb3
+  metadata.gz: 6e3dfaffc21d7b35657891ab5aa80c7ca89e1ebb09b551812262036d6969c4a0
+  data.tar.gz: ba969734f50b628ba4905eb8835288731cd6d8a5558534199e7d6d2418a5eebb
 SHA512:
-  metadata.gz: b75e64450f7b1418fc89ce421bbbee52c70359ad347e2a87f4308c7e7fe72a4fa67e8d9d31f5b565b786ecfbd54040f770f44a16baa6641d8e7d4163eda5f1b2
-  data.tar.gz: 50fdd316deea657b15ec3efb0955ddb0d22799d636ee55f7623be0e591e9442aa95d9f146b7545b599db80179111827d0344bcf16bbfaf504ad1e5dea2d24bbd
+  metadata.gz: 33a8b9e9815c9210a2e57eb19cb782aef7d4319e20a0fe0f3f69b697adb81cec51502f98b70aed3ae7eb2220d75a85eb15db0d1bd8828e9c4ba7e2d0452a10c1
+  data.tar.gz: 757db13273be7d182ad1e44e478c19386cc6c7b83ad0fcb04b76889a5761fd0709069359bceacddc9d8dde00942a6432257f311586e1c6cf0f394347e2544376

data/CHANGELOG.md

@@ -4,6 +4,28 @@ To install or update CocoaPods see this [guide](https://guides.cocoapods.org/usi
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.15.0 (2024-01-28)
+
+##### Enhancements
+
+* Optimize performance during uncached pod installation.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#12154](https://github.com/CocoaPods/CocoaPods/pull/12154)
+
+##### Bug Fixes
+
+* Fix pod install issue when git's `core.fsmonitor` feature is enabled  
+  [Justin Martin](https://github.com/justinseanmartin)
+  [#11640](https://github.com/CocoaPods/CocoaPods/issues/11640)
+
+* Don't use the `remove_destination` parameter in FileUtils.cp_r  
+  [Justin Martin](https://github.com/justinseanmartin)
+  [#12165](https://github.com/CocoaPods/CocoaPods/pull/12165)
+
+* Support `visionos` in `pod lib lint --platforms=` and use `xros` for `Fourflusher`  
+  [MagnificentMiles](https://github.com/MagnificentMiles)
+  [#12159](https://github.com/CocoaPods/CocoaPods/pull/12159)
+
 ## 1.14.3 (2023-11-19)
 
 ##### Enhancements
@@ -16,7 +38,6 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [Eric Amorde](https://github.com/amorde)
   [#12122](https://github.com/CocoaPods/CocoaPods/issues/12122)
 
-
 ## 1.14.2 (2023-10-27)
 
 ##### Enhancements

data/lib/cocoapods/command/lib/lint.rb

@@ -25,7 +25,7 @@ module Pod
             ['--use-static-frameworks', 'Lint uses static frameworks during installation'],
             ["--sources=#{Pod::TrunkSource::TRUNK_REPO_URL}", 'The sources from which to pull dependent pods ' \
               "(defaults to #{Pod::TrunkSource::TRUNK_REPO_URL}). Multiple sources must be comma-delimited"],
-            ['--platforms=ios,macos', 'Lint against specific platforms (defaults to all platforms supported by the ' \
+            ['--platforms=ios,macos,visionos', 'Lint against specific platforms (defaults to all platforms supported by the ' \
               'podspec). Multiple platforms must be comma-delimited'],
             ['--private', 'Lint skips checks that apply only to public specs'],
             ['--swift-version=VERSION', 'The `SWIFT_VERSION` that should be used to lint the spec. ' \

data/lib/cocoapods/downloader/cache.rb

@@ -235,13 +235,38 @@ module Pod
       #         was not found in the download cache.
       #
       def uncached_pod(request)
-        in_tmpdir do |target|
-          result, podspecs = download(request, target)
+        in_tmpdir do |tmp_dir|
+          result, podspecs = download(request, tmp_dir)
           result.location = nil
 
-          podspecs.each do |name, spec|
+          # Split by pods that require a prepare command or not to speed up installation.
+          no_prep_cmd_specs, prep_cmd_specs = podspecs.partition { |_, spec| spec.prepare_command.nil? }.map(&:to_h)
+
+          # Pods with a prepare command currently copy the entire repo, run the prepare command against the whole
+          # repo and then clean it up. We configure those first to ensure the repo is pristine.
+          prep_cmd_specs.each do |name, spec|
             destination = path_for_pod(request, :name => name, :params => result.checkout_options)
-            copy_and_clean(target, destination, spec)
+            copy_source_and_clean(tmp_dir, destination, spec)
+            write_spec(spec, path_for_spec(request, :name => name, :params => result.checkout_options))
+            if request.name == name
+              result.location = destination
+            end
+          end
+
+          specs_by_platform = group_subspecs_by_platform(no_prep_cmd_specs.values)
+
+          # Remaining pods without a prepare command can be optimized by cleaning the repo first
+          # and then copying only the files needed.
+          pod_dir_cleaner = Sandbox::PodDirCleaner.new(tmp_dir, specs_by_platform)
+          Cache.write_lock(tmp_dir) do
+            pod_dir_cleaner.clean!
+          end
+
+          no_prep_cmd_specs.each do |name, spec|
+            destination = path_for_pod(request, :name => name, :params => result.checkout_options)
+            file_accessors = pod_dir_cleaner.file_accessors.select { |fa| fa.spec.root.name == spec.name }
+            files = Pod::Sandbox::FileAccessor.all_files(file_accessors).map(&:to_s)
+            copy_files(files, tmp_dir, destination)
             write_spec(spec, path_for_spec(request, :name => name, :params => result.checkout_options))
             if request.name == name
               result.location = destination
@@ -279,23 +304,55 @@ module Pod
       #
       # @return [Void]
       #
-      def copy_and_clean(source, destination, spec)
-        specs_by_platform = group_subspecs_by_platform(spec)
+      def copy_source_and_clean(source, destination, spec)
+        specs_by_platform = group_subspecs_by_platform([spec])
         destination.parent.mkpath
         Cache.write_lock(destination) do
-          FileUtils.rm_rf(destination)
-          FileUtils.cp_r(source, destination)
+          Pod::Executable.execute_command('rsync', ['-a', '--exclude=.git/fsmonitor--daemon.ipc', '--delete', "#{source}/", destination])
           Pod::Installer::PodSourcePreparer.new(spec, destination).prepare!
           Sandbox::PodDirCleaner.new(destination, specs_by_platform).clean!
         end
       end
 
-      def group_subspecs_by_platform(spec)
+      # Copies the `files` from the `source` directory to `destination` _without_ cleaning the
+      # `destination` directory of any files unused by `spec`. This is a faster version used when
+      # installing pods without a prepare command which has already happened prior.
+      #
+      # @param  [Array<Pathname>] files
+      #
+      # @param  [Pathname] source
+      #
+      # @param  [Pathname] destination
+      #
+      # @return [Void]
+      #
+      def copy_files(files, source, destination)
+        files = files.select { |f| File.exist?(f) }
+        destination.parent.mkpath
+        Cache.write_lock(destination) do
+          FileUtils.rm_rf(destination)
+          destination.mkpath
+          files_by_dir = files.group_by do |file|
+            relative_path = Pathname(file).relative_path_from(Pathname(source)).to_s
+            destination_path = File.join(destination, relative_path)
+            File.dirname(destination_path)
+          end
+
+          files_by_dir.each do |dir, files_to_copy|
+            FileUtils.mkdir_p(dir)
+            FileUtils.cp_r(files_to_copy, dir)
+          end
+        end
+      end
+
+      def group_subspecs_by_platform(specs)
         specs_by_platform = {}
-        [spec, *spec.recursive_subspecs].each do |ss|
-          ss.available_platforms.each do |platform|
-            specs_by_platform[platform] ||= []
-            specs_by_platform[platform] << ss
+        specs.each do |spec|
+          [spec, *spec.recursive_subspecs].each do |ss|
+            ss.available_platforms.each do |platform|
+              specs_by_platform[platform] ||= []
+              specs_by_platform[platform] << ss
+            end
           end
         end
         specs_by_platform

data/lib/cocoapods/downloader.rb

@@ -51,7 +51,7 @@ module Pod
       if target && result.location && target != result.location
         UI.message "Copying #{request.name} from `#{result.location}` to #{UI.path target}", '> ' do
           Cache.read_lock(result.location) do
-            FileUtils.rm_rf target
+            FileUtils.rm_rf(target)
             FileUtils.cp_r(result.location, target)
           end
         end

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the CocoaPods command line tool.
   #
-  VERSION = '1.14.3'.freeze unless defined? Pod::VERSION
+  VERSION = '1.15.0'.freeze unless defined? Pod::VERSION
 end

data/lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb

@@ -245,7 +245,7 @@ module Pod
               @plist_bundle_id = target.info_plist_entries['CFBundleIdentifier']
               unless @plist_bundle_id.nil?
                 message = "The `#{target.name}` target " \
-              "sets a Bundle Identifier of `#{@plist_bundle_id}` in it's info.plist file. " \
+              "sets a Bundle Identifier of `#{@plist_bundle_id}` in its info.plist file. " \
               'The Bundle Identifier should be set using pod_target_xcconfig: ' \
               "s.pod_target_xcconfig = { 'PRODUCT_BUNDLE_IDENTIFIER': '#{@plist_bundle_id}' }`."
                 UI.warn message

data/lib/cocoapods/sandbox/pod_dir_cleaner.rb

@@ -15,11 +15,9 @@ module Pod
       # @return [void]
       #
       def clean!
-        clean_paths.each { |path| FileUtils.rm_rf(path) } if root.exist?
+        FileUtils.rm_rf(clean_paths) if root.exist?
       end
 
-      private
-
       # @return [Array<Sandbox::FileAccessor>] the file accessors for all the
       #         specifications on their respective platform.
       #
@@ -29,6 +27,8 @@ module Pod
         end
       end
 
+      private
+
       # @return [Sandbox::PathList] The path list for this Pod.
       #
       def path_list

data/lib/cocoapods/validator.rb

@@ -1108,7 +1108,7 @@ module Pod
         command += Fourflusher::SimControl.new.destination(:oldest, 'tvOS', deployment_target)
       when :visionos
         command += %w(CODE_SIGN_IDENTITY=- -sdk xrsimulator)
-        command += Fourflusher::SimControl.new.destination(:oldest, 'visionOS', deployment_target)
+        command += Fourflusher::SimControl.new.destination(:oldest, 'xrOS', deployment_target)
       end
 
       if analyze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.14.3
+  version: 1.15.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-19 00:00:00.000000000 Z
+date: 2024-01-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.14.3
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.14.3
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -546,7 +546,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: The Cocoa library package manager.