cocoapods 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef9725752e53e158770daed057cf73b9f7cf849e1ef4c663a2256f360fbfd7da
-  data.tar.gz: 6a52819a3e1a7e232a1d1ea14e0cedf6e27ac6c523fd265a9882a4bd54d1a9aa
+  metadata.gz: 351d42241021bbf2982a2031406a62a7829075ebf1797b1149ca2207a75645a0
+  data.tar.gz: 3bfb129706090a443739d23e99b355c09a8e2e5ba97c700f4d2f9ca3f858adec
 SHA512:
-  metadata.gz: 3d4a47b0ff16089ad7d81eb95a55672fe2cda75bc9cfe963fe736e17290340a6e6fdd899d36fdde7ae8a75f0e03a25da67f23b52449444e7dd3daebb2391cbdb
-  data.tar.gz: 81c62f774bafafd9e324e41174cc060fdf218bae6de2817b2c952982c9b709fc12589e4662fff1386e66a9a880672797678736e51e98a922f6e1de3bb59e3706
+  metadata.gz: c883065405b1143221bec0680be744e098a8cac54b468da9442246b943ca3978b80ef28bb63e762a2dbbda4b0571a30d8ad8fc81be89bcc0340d5463fbc7f52d
+  data.tar.gz: 350ffaeffc77cac95347ff5834af721fa8f2ee30d9a226ad55d363d19fa62dfade61115cbc9b1b3bb2d4e97bf213131e4d16114e7632e111118cda9a42588a10

data/CHANGELOG.md

@@ -4,6 +4,49 @@ To install or update CocoaPods see this [guide](https://guides.cocoapods.org/usi
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.13.0 (2023-09-22)
+
+##### Enhancements
+
+* Add `visionOS` as a new platform.  
+  [Gabriel Donadel](https://github.com/gabrieldonadel)
+  [#11965](https://github.com/CocoaPods/CocoaPods/pull/11965)
+
+* Extend `script_phase` DSL to support `always_out_of_date` attribute.  
+  [Alvar Hansen](https://github.com/alvarhansen)
+  [#12055](https://github.com/CocoaPods/CocoaPods/pull/12055)
+
+##### Bug Fixes
+
+* Use `safe_load` during custom YAML config loading.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#11974](https://github.com/CocoaPods/CocoaPods/pull/11974)
+
+* Xcode 15 fix: Replace `DT_TOOLCHAIN_DIR` with `TOOLCHAIN_DIR` when generating script.  
+  [Marcus Wu](https://github.com/marcuswu0814)
+  [#12009](https://github.com/CocoaPods/CocoaPods/pull/12009)
+
+## 1.12.1 (2023-04-18)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Xcode 14.3 fix: Pass the -f option when resolving the path to the symlinked source.  
+  [Chris Vasselli](https://github.com/chrisvasselli)
+  [#11828](https://github.com/CocoaPods/CocoaPods/pull/11828)
+  [#11808](https://github.com/CocoaPods/CocoaPods/issues/11808)
+
+* Fix typo in validation for `--validation-dir` help message  
+  [Austin Evans](https://github.com/ajevans99)
+  [#11857](https://github.com/CocoaPods/CocoaPods/issues/11857)
+
+* Xcode 14.3 fix: `pod lib lint` warning generation from main.m.  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#11846](https://github.com/CocoaPods/CocoaPods/issues/11846)
+
 ## 1.12.0 (2023-02-27)
 
 ##### Enhancements

data/bin/sandbox-pod

@@ -61,7 +61,7 @@ PROFILE_ERB_TEMPLATE = <<-EOS
 
 (allow file-read-metadata)
 (allow file-read*
-  ; This is currenly only added because using `xcodebuild` to build a resource
+  ; This is currently only added because using `xcodebuild` to build a resource
   ; bundle target starts a FSEvents stream on `/`. No idea why that would be
   ; needed, but for now it doesn’t seem like a real problem.
   (literal "/")

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

@@ -38,7 +38,7 @@ module Pod
             ['--test-specs=test-spec1,test-spec2,etc', 'List of test specs to run'],
             ['--analyze', 'Validate with the Xcode Static Analysis tool'],
             ['--configuration=CONFIGURATION', 'Build using the given configuration (defaults to Release)'],
-            ['--validaton-dir', 'The directory to use for validation. If none is specified a temporary directory will be used.'],
+            ['--validation-dir', 'The directory to use for validation. If none is specified a temporary directory will be used.'],
           ].concat(super)
         end
 

data/lib/cocoapods/command/repo/push.rb

@@ -38,7 +38,7 @@ module Pod
              'This takes precedence over the Swift versions specified by the spec or a `.swift-version` file'],
             ['--no-overwrite', 'Disallow pushing that would overwrite an existing spec'],
             ['--update-sources', 'Make sure sources are up-to-date before a push'],
-            ['--validaton-dir', 'The directory to use for validation. If none is specified a temporary directory will be used.'],
+            ['--validation-dir', 'The directory to use for validation. If none is specified a temporary directory will be used.'],
           ].concat(super)
         end
 

data/lib/cocoapods/command/spec/create.rb

@@ -181,6 +181,7 @@ Pod::Spec.new do |spec|
   # spec.osx.deployment_target = "10.7"
   # spec.watchos.deployment_target = "2.0"
   # spec.tvos.deployment_target = "9.0"
+  # spec.visionos.deployment_target = "1.0"
 
 
   # ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #

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

@@ -37,7 +37,7 @@ module Pod
             ['--test-specs=test-spec1,test-spec2,etc', 'List of test specs to run'],
             ['--analyze', 'Validate with the Xcode Static Analysis tool'],
             ['--configuration=CONFIGURATION', 'Build using the given configuration (defaults to Release)'],
-            ['--validaton-dir', 'The directory to use for validation. If none is specified a temporary directory will be used.'],
+            ['--validation-dir', 'The directory to use for validation. If none is specified a temporary directory will be used.'],
           ].concat(super)
         end
 

data/lib/cocoapods/config.rb

@@ -111,7 +111,8 @@ module Pod
 
       if use_user_settings && user_settings_file.exist?
         require 'yaml'
-        user_settings = YAML.load_file(user_settings_file)
+        user_settings_contents = File.read(user_settings_file)
+        user_settings = YAML.safe_load(user_settings_contents)
         configure_with(user_settings)
       end
 

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/app_target_helper.rb

@@ -203,7 +203,7 @@ module Pod
             f << "@import Foundation;\n"
             f << "@import UIKit;\n" if platform == :ios || platform == :tvos
             f << "@import Cocoa;\n" if platform == :osx
-            f << "#{import_statement}int main() {}\n"
+            f << "#{import_statement}int main(void) {}\n"
           end
         end
         source_file

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -57,6 +57,7 @@ module Pod
         :osx => Version.new('10.8'),
         :watchos => Version.new('2.0'),
         :tvos => Version.new('9.0'),
+        :visionos => Version.new('1.0'),
       }
 
       # @return [Boolean] Whether the external strings file is supported by the

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -63,7 +63,7 @@ echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
 COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
-SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
+SWIFT_STDLIB_PATH="${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
 BCSYMBOLMAP_DIR="BCSymbolMaps"
 
 
@@ -83,7 +83,7 @@ install_framework()
 
   if [ -L "${source}" ]; then
     echo "Symlinked..."
-    source="$(readlink "${source}")"
+    source="$(readlink -f "${source}")"
   fi
 
   if [ -d "${source}/${BCSYMBOLMAP_DIR}" ]; then

data/lib/cocoapods/installer/base_install_hooks_context.rb

@@ -97,7 +97,7 @@ module Pod
         #
         attr_reader :specs
 
-        # @return [Symbol] The platform (either `:ios`, `:watchos`, `:tvos`, or `:osx`).
+        # @return [Symbol] The platform (either `:ios`, `:watchos`, `:tvos`, `:visionos`, or `:osx`).
         #
         attr_reader :platform_name
 

data/lib/cocoapods/installer/project_cache/project_cache_analyzer.rb

@@ -139,10 +139,10 @@ module Pod
             when PodTarget
               local = sandbox.local?(target.pod_name)
               checkout_options = sandbox.checkout_sources[target.pod_name]
-              [label, TargetCacheKey.from_pod_target(sandbox, target, :is_local_pod => local,
-                                                                      :checkout_options => checkout_options)]
+              [label, TargetCacheKey.from_pod_target(sandbox, target_by_label, target,
+                                                     :is_local_pod => local, :checkout_options => checkout_options)]
             when AggregateTarget
-              [label, TargetCacheKey.from_aggregate_target(sandbox, target)]
+              [label, TargetCacheKey.from_aggregate_target(sandbox, target_by_label, target)]
             else
               raise "[BUG] Unknown target type #{target}"
             end

data/lib/cocoapods/installer/project_cache/target_cache_key.rb

@@ -58,6 +58,10 @@ module Pod
             other_files = other.key_hash['FILES']
             return :project if this_files != other_files
 
+            this_resources = key_hash['RESOURCES']
+            other_resources = other.key_hash['RESOURCES']
+            return :project if this_resources != other_resources
+
             this_build_settings = key_hash['BUILD_SETTINGS_CHECKSUM']
             other_build_settings = other.key_hash['BUILD_SETTINGS_CHECKSUM']
             return :project if this_build_settings != other_build_settings
@@ -98,6 +102,9 @@ module Pod
           if specs = cache_hash['SPECS']
             cache_hash['SPECS'] = specs.sort_by(&:downcase)
           end
+          if resources = cache_hash['RESOURCES']
+            cache_hash['RESOURCES'] = resources.sort_by(&:downcase)
+          end
           type = cache_hash['CHECKSUM'] ? :pod_target : :aggregate
           TargetCacheKey.new(sandbox, type, cache_hash)
         end
@@ -106,6 +113,9 @@ module Pod
         #
         # @param [Sandbox] sandbox The sandbox to use to construct a TargetCacheKey object.
         #
+        # @param [Hash] target_by_label
+        #        Maps target names to PodTarget objects.
+        #
         # @param [PodTarget] pod_target
         #        The pod target used to construct a TargetCacheKey object.
         #
@@ -117,7 +127,7 @@ module Pod
         #
         # @return [TargetCacheKey]
         #
-        def self.from_pod_target(sandbox, pod_target, is_local_pod: false, checkout_options: nil)
+        def self.from_pod_target(sandbox, target_by_label, pod_target, is_local_pod: false, checkout_options: nil)
           build_settings = {}
           build_settings[pod_target.label.to_s] = Hash[pod_target.build_settings.map do |k, v|
             [k, Digest::MD5.hexdigest(v.xcconfig.to_s)]
@@ -129,6 +139,20 @@ module Pod
             build_settings[name] = Hash[settings_by_config.map { |k, v| [k, Digest::MD5.hexdigest(v.xcconfig.to_s)] }]
           end
 
+          # find resources from upstream dependencies that will be named in the `{name}-resources.sh` script
+          resource_dependencies = []
+          pod_target.dependencies.each do |name|
+            next unless target_by_label[name]
+
+            upstream = target_by_label[name]
+
+            # pod target
+            resource_dependencies.append(upstream.resource_paths.values.flatten) if upstream.respond_to?(:resource_paths)
+
+            # aggregate target
+            resource_dependencies.append(upstream.resource_paths_by_config.values.flatten) if upstream.respond_to?(:resource_paths_by_config)
+          end
+
           contents = {
             'CHECKSUM' => pod_target.root_spec.checksum,
             'SPECS' => pod_target.specs.map(&:to_s).sort_by(&:downcase),
@@ -140,6 +164,7 @@ module Pod
             contents['FILES'] = relative_file_paths.sort_by(&:downcase)
           end
           contents['CHECKOUT_OPTIONS'] = checkout_options if checkout_options
+          contents['RESOURCES'] = resource_dependencies.flatten.uniq.sort_by(&:downcase) if resource_dependencies.any?
           TargetCacheKey.new(sandbox, :pod_target, contents)
         end
 
@@ -152,12 +177,24 @@ module Pod
         #
         # @return [TargetCacheKey]
         #
-        def self.from_aggregate_target(sandbox, aggregate_target)
+        def self.from_aggregate_target(sandbox, target_by_label, aggregate_target)
           build_settings = {}
           aggregate_target.user_build_configurations.keys.each do |configuration|
             build_settings[configuration] = Digest::MD5.hexdigest(aggregate_target.build_settings(configuration).xcconfig.to_s)
           end
 
+          # find resources from upstream dependencies that will be named in the `{name}-resources.sh` script
+          resource_dependencies = []
+          aggregate_target.pod_targets.each do |name|
+            upstream = target_by_label[name]
+
+            # pod target
+            resource_dependencies.append(upstream.resource_paths.values.flatten) if upstream.respond_to?(:resource_paths)
+
+            # aggregate target
+            resource_dependencies.append(upstream.resource_paths_by_config.values.flatten) if upstream.respond_to?(:resource_paths_by_config)
+          end
+
           contents = {
             'BUILD_SETTINGS_CHECKSUM' => build_settings,
           }
@@ -167,6 +204,7 @@ module Pod
               res.relative_path_from(sandbox.project_path.dirname).to_s
             end
             contents['FILES'] = (relative_resource_file_paths + relative_on_demand_resource_file_paths).sort_by(&:downcase)
+            contents['RESOURCES'] = resource_dependencies.flatten.uniq.sort_by(&:downcase) if resource_dependencies.any?
           end
           TargetCacheKey.new(sandbox, :aggregate, contents)
         end

data/lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -314,6 +314,7 @@ module Pod
               phase.input_file_list_paths = script_phase[:input_file_lists]
               phase.output_file_list_paths = script_phase[:output_file_lists]
               phase.dependency_file = script_phase[:dependency_file]
+              phase.always_out_of_date = script_phase[:always_out_of_date]
               # At least with Xcode 10 `showEnvVarsInLog` is *NOT* set to any value even if it's checked and it only
               # gets set to '0' if the user has explicitly disabled this.
               if (show_env_vars_in_log = script_phase.fetch(:show_env_vars_in_log, '1')) == '0'

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

@@ -894,6 +894,7 @@ module Pod
             :osx => Version.new('10.8'),
             :watchos => Version.new('2.0'),
             :tvos => Version.new('9.0'),
+            :visionos => Version.new('1.0'),
           }.freeze
 
           # Returns the compiler flags for the source files of the given specification.

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

@@ -103,11 +103,13 @@ module Pod
             ios_deployment_target = platforms.select { |p| p.name == :ios }.map(&:deployment_target).min
             watchos_deployment_target = platforms.select { |p| p.name == :watchos }.map(&:deployment_target).min
             tvos_deployment_target = platforms.select { |p| p.name == :tvos }.map(&:deployment_target).min
+            visionos_deployment_target = platforms.select { |p| p.name == :visionos }.map(&:deployment_target).min
             project.build_configurations.each do |build_configuration|
               build_configuration.build_settings['MACOSX_DEPLOYMENT_TARGET'] = osx_deployment_target.to_s if osx_deployment_target
               build_configuration.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = ios_deployment_target.to_s if ios_deployment_target
               build_configuration.build_settings['WATCHOS_DEPLOYMENT_TARGET'] = watchos_deployment_target.to_s if watchos_deployment_target
               build_configuration.build_settings['TVOS_DEPLOYMENT_TARGET'] = tvos_deployment_target.to_s if tvos_deployment_target
+              build_configuration.build_settings['XROS_DEPLOYMENT_TARGET'] = visionos_deployment_target.to_s if visionos_deployment_target
               build_configuration.build_settings['STRIP_INSTALLED_PRODUCT'] = 'NO'
               build_configuration.build_settings['CLANG_ENABLE_OBJC_ARC'] = 'YES'
               build_configuration.build_settings['CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED'] = 'YES'

data/lib/cocoapods/target/build_settings.rb

@@ -359,7 +359,7 @@ module Pod
                    else
                      "'@loader_path/Frameworks'"
                    end
-          paths << '${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}' if uses_swift
+          paths << '${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}' if uses_swift
         else
           paths << "'@executable_path/Frameworks'"
           paths << "'@loader_path/Frameworks'"
@@ -866,7 +866,7 @@ module Pod
           search_paths = vendored_static_library_search_paths + vendored_dynamic_library_search_paths
           if target.uses_swift? || other_swift_flags_without_swift?
             search_paths << '/usr/lib/swift'
-            search_paths << '${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}'
+            search_paths << '${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}'
             search_paths << '$(PLATFORM_DIR)/Developer/Library/Frameworks' if test_xcconfig?
           end
           return search_paths if target.build_as_framework? || !target.should_build?

data/lib/cocoapods/validator.rb

@@ -152,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 = ''
@@ -1104,6 +1106,9 @@ module Pod
       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, 'visionOS', deployment_target)
       end
 
       if analyze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-27 00:00:00.000000000 Z
+date: 2023-09-22 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.12.0
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -187,7 +187,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 1.23.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -197,7 +197,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 1.23.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'