cocoapods 1.11.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e617acf0486b439b72d009eb2905d7b78853b6ff52d8bd0c9e303534ad978e5
-  data.tar.gz: ea674c9a2524f0ea96b413037afe634b72a53e8f5d8e0c44253e7ba559e5c19e
+  metadata.gz: 7eb2a7cb51265484772462e33da3c268da859b1f18adffdb57d6e6f4c2d378a2
+  data.tar.gz: 4d47bdd4efa9026b670884c3b230adc94ffb69e66953945349e0d4a17f9d6018
 SHA512:
-  metadata.gz: 4c2a0a0a9a3d92658aa77309c41f51f0385d0d0556ab649fdfeed07996c8e7310c6adb2c09fcb6b3490c0ffe2e004df0a4c7ca8d1d15fe40a4adec40be923c96
-  data.tar.gz: d91ebdc6f396a6f04a13439362131247037e7c477ef207c37f3432b383a7552d8e21ab5ffd408c6c8307a77de61476dbd428ff8109bc2d0f3c0f28d1f9cd55c8
+  metadata.gz: 16cd5d292991ab0067b0611eb82e8fe6fa8d50bfe6ee36779bb45d5f14101e1b359d8cf6b8ae15aa74f54f6cb36d441429500ec1f8f7909928a15208b568e67a
+  data.tar.gz: 22d3de57cb0446e321e740591b5bd9378d3fc0ed4ee1b521b8ec8d33d18608f5a53b75e7086b4e5244221660c6f6f6b4328180d3c7b07a7fbbf562b9b108d58f

data/CHANGELOG.md

@@ -4,6 +4,166 @@ To install or update CocoaPods see this [guide](https://guides.cocoapods.org/usi
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 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/issuess/11846)
+
+## 1.12.0 (2023-02-27)
+
+##### Enhancements
+
+* Add ability to specify the `validation-dir` during `lint`.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#11773](https://github.com/CocoaPods/CocoaPods/pull/11773)
+
+* Correctly handle `.docc` documentation in source_files.  
+  [haifengkao](https://github.com/haifengkao)
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#11438](https://github.com/CocoaPods/CocoaPods/pull/11438)
+  [#10885](https://github.com/CocoaPods/CocoaPods/issues/10885)
+
+* Re-use the same path lists for pods that share the same root.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#11417](https://github.com/CocoaPods/CocoaPods/pull/11417)
+
+* Integrate `parallelizable` scheme DSL option.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#11399](https://github.com/CocoaPods/CocoaPods/pull/11399)
+
+* Use `${DEVELOPMENT_LANGUAGE}` as the default `CFBundleDevelopmentRegion` value in any generated `Info.plist`.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#10950](https://github.com/CocoaPods/CocoaPods/pull/10950)
+
+* Fix setting `LD_RUNTIME_SEARCH_PATHS` for aggregate targets that include dynamic xcframeworks.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#11158](https://github.com/CocoaPods/CocoaPods/pull/11158)
+
+* Add method for formatting licenses for acknowledgements generation.  
+  [Raihaan Shouhell](https://github.com/res0nance)
+  [#10940](https://github.com/CocoaPods/CocoaPods/pull/10940)
+
+* Add the ability to download pods in parallel  
+  [Seth Friedman](https://github.com/sethfri)
+  [#11232](https://github.com/CocoaPods/CocoaPods/pull/11232)
+
+* Include subprojects in the plugin post-install hook context  
+  [Eric Amorde](https://github.com/amorde)
+  [#11224](https://github.com/CocoaPods/CocoaPods/pull/11224)
+
+* Ensure the order of slices passed to the `install_xcframework` script (in the "Copy XCFrameworks" script build phase) is stable.  
+  [Olivier Halligon](https://github.com/AliSoftware)
+  [#11707](https://github.com/CocoaPods/CocoaPods/pull/11707)
+
+##### Bug Fixes
+
+* Fix incremental installation when a development pod is deleted.  
+  [John Szumski](https://github.com/jszumski)
+  [#11438](https://github.com/CocoaPods/CocoaPods/pull/11681)
+
+* Clean sandbox when a pod switches from remote to local.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#11213](https://github.com/CocoaPods/CocoaPods/pull/11213)
+
+* Run post install hooks when "skip Pods.xcodeproj generation" option is set  
+  [Elton Gao](https://github.com/gyfelton)
+  [#11073](https://github.com/CocoaPods/CocoaPods/pull/11073)
+
+* Change minimal required version of ruby-macho to 2.3.0.  
+  [xuzhongping](https://github.com/xuzhongping)
+  [#10390](https://github.com/CocoaPods/CocoaPods/issues/10390)
+
+* Add .gitignores to the banana and snake fixtures  
+  [Seth Friedman](https://github.com/sethfri)
+  [#11235](https://github.com/CocoaPods/CocoaPods/pull/11235)
+
+* Fix publishing podspecs with watchOS support on Xcode 14  
+  [Justin Martin](https://github.com/justinseanmartin)
+  [#11660](https://github.com/CocoaPods/CocoaPods/pull/11660)
+
+## 1.11.3 (2022-03-16)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Fix script breaking when attempting to print a warning.  
+  [Igor Makarov](https://github.com/igor-makarov)
+  [#11251](https://github.com/CocoaPods/CocoaPods/issues/11251)
+
+* Do not consider podspec_repo when analying sandbox for changes.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#10985](https://github.com/CocoaPods/CocoaPods/pull/10985)
+
+* Rewrite XCFramework slice selection using plist metadata.  
+  [Igor Makarov](https://github.com/igor-makarov)
+  [#11229](https://github.com/CocoaPods/CocoaPods/pull/11229)
+
+* Fix setting `LD_RUNTIME_SEARCH_PATHS` for aggregate targets that include dynamic xcframeworks.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#11158](https://github.com/CocoaPods/CocoaPods/pull/11158)
+
+* Add catch for YAML syntax error to prevent crash in `cdn_url?` check.  
+  [Kanstantsin Shautsou](https://github.com/KostyaSha)
+  [#11010](https://github.com/CocoaPods/CocoaPods/issues/11010)
+
+* Fix static Swift XCFramework import paths.  
+  [Igor Makarov](https://github.com/igor-makarov)
+  [#11058](https://github.com/CocoaPods/CocoaPods/issues/10058)
+  [#11093](https://github.com/CocoaPods/CocoaPods/pull/11093)
+
+## 1.11.2 (2021-09-13)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Do not validate modular header dependencies for pre-built Swift pods.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#10912](https://github.com/CocoaPods/CocoaPods/issues/10912)
+
+
+## 1.11.1 (2021-09-12)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Handle spec repo urls with user info when determining if they are CDN.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#10941](https://github.com/CocoaPods/CocoaPods/issues/10941)
+
+* Set `INFOPLIST_FILE` build setting to `$(SRCROOT)/App/App-Info.plist` during lint.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#10927](https://github.com/CocoaPods/CocoaPods/issues/10927)
+
+* Set `PRODUCT_BUNDLE_IDENTIFIER` for generated app during lint.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#10933](https://github.com/CocoaPods/CocoaPods/issues/10933)
+
+
 ## 1.11.0 (2021-09-01)
 
 ##### Enhancements
@@ -7497,7 +7657,7 @@ that can be added to a settings bundle for an iOS application.
 You don't need to do anything for this to happen, it should just work.
 
 If you're not happy with the default boilerplate text generated for the title, header
-and footnotes in the files, it's possible to customise these by overriding the methods
+and footnotes in the files, it's possible to customize these by overriding the methods
 that generate the text in your `Podfile` like this:
 
 ```ruby
@@ -7508,7 +7668,7 @@ class ::Pod::Generator::Acknowledgements
 end
 ```
 
-You can even go one step further and customise the text on a per target basis by
+You can even go one step further and customize the text on a per target basis by
 checking against the target name, like this:
 
 ```ruby

data/README.md

@@ -2,7 +2,7 @@
 
 ### CocoaPods: The Cocoa dependency manager
 
-[![Build Status](https://img.shields.io/github/workflow/status/CocoaPods/CocoaPods/Specs)](https://github.com/CocoaPods/CocoaPods/actions)
+[![Build Status](https://github.com/CocoaPods/CocoaPods/workflows/Specs/badge.svg)](https://github.com/CocoaPods/CocoaPods/actions/workflows/Specs.yml)
 [![Gem Version](https://img.shields.io/gem/v/cocoapods)](https://rubygems.org/gems/cocoapods)
 [![Maintainability](https://api.codeclimate.com/v1/badges/8f0fe544baf2ae1acc2b/maintainability)](https://codeclimate.com/github/CocoaPods/CocoaPods/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/8f0fe544baf2ae1acc2b/test_coverage)](https://codeclimate.com/github/CocoaPods/CocoaPods/test_coverage)
@@ -72,11 +72,10 @@ CocoaPods is composed of the following projects:
 
 | Status    | Project | Description | Info |
 | :-------- | :------ | :--- | :--- |
-| [![Build Status](https://img.shields.io/github/workflow/status/CocoaPods/CocoaPods/Specs)](https://github.com/CocoaPods/CocoaPods/actions) | [CocoaPods](https://github.com/CocoaPods/CocoaPods) | The CocoaPods command line tool. | [guides](https://guides.cocoapods.org)
-| [![Build Status](https://img.shields.io/github/workflow/status/CocoaPods/Core/Specs)](https://github.com/CocoaPods/Core/actions) | [CocoaPods Core](https://github.com/CocoaPods/Core) | Support for working with specifications and podfiles. | [docs](https://guides.cocoapods.org/contributing/components.html)
-| [![Build Status](https://img.shields.io/travis/CocoaPods/cocoapods-downloader/master.svg?style=flat)](https://travis-ci.org/CocoaPods/cocoapods-downloader) |[CocoaPods Downloader](https://github.com/CocoaPods/cocoapods-downloader) |  Downloaders for various source types. |  [docs](https://www.rubydoc.info/gems/cocoapods-downloader)
-| [![Build Status](https://img.shields.io/travis/CocoaPods/Xcodeproj/master.svg?style=flat)](https://travis-ci.org/CocoaPods/Xcodeproj) | [Xcodeproj](https://github.com/CocoaPods/Xcodeproj) | Create and modify Xcode projects from Ruby. |  [docs](https://www.rubydoc.info/gems/xcodeproj)
-| [![Build Status](https://img.shields.io/travis/CocoaPods/CLAide/master.svg?style=flat)](https://travis-ci.org/CocoaPods/CLAide) | [CLAide](https://github.com/CocoaPods/CLAide) | A small command-line interface framework.  | [docs](https://www.rubydoc.info/gems/claide)
-| [![Build Status](https://img.shields.io/travis/CocoaPods/Molinillo/master.svg?style=flat)](https://travis-ci.org/CocoaPods/Molinillo) | [Molinillo](https://github.com/CocoaPods/Molinillo) | A powerful generic dependency resolver.  | [docs](https://www.rubydoc.info/gems/molinillo)
-| [![Build Status](https://img.shields.io/travis/CocoaPods/CocoaPods-app/master.svg?style=flat)](https://travis-ci.org/CocoaPods/CocoaPods-app) | [CocoaPods.app](https://github.com/CocoaPods/CocoaPods-app) | A full-featured and standalone installation of CocoaPods.  | [info](https://cocoapods.org/app)
+| [![Build Status](https://github.com/CocoaPods/CocoaPods/workflows/Specs/badge.svg)](https://github.com/CocoaPods/CocoaPods/actions/workflows/Specs.yml) | [CocoaPods](https://github.com/CocoaPods/CocoaPods) | The CocoaPods command line tool. | [guides](https://guides.cocoapods.org)
+| [![Build Status](https://github.com/CocoaPods/Core/workflows/Specs/badge.svg)](https://github.com/CocoaPods/Core/actions/workflows/Specs.yml) | [CocoaPods Core](https://github.com/CocoaPods/Core) | Support for working with specifications and podfiles. | [docs](https://guides.cocoapods.org/contributing/components.html)
+| [![Build Status](https://github.com/CocoaPods/cocoapods-downloader/workflows/Specs/badge.svg)](https://github.com/CocoaPods/cocoapods-downloader/actions/workflows/Specs.yml) |[CocoaPods Downloader](https://github.com/CocoaPods/cocoapods-downloader) |  Downloaders for various source types. |  [docs](https://www.rubydoc.info/gems/cocoapods-downloader)
+| [![Build Status](https://github.com/CocoaPods/Xcodeproj/workflows/Specs/badge.svg)](https://github.com/CocoaPods/Xcodeproj/actions/workflows/Specs.yml) | [Xcodeproj](https://github.com/CocoaPods/Xcodeproj) | Create and modify Xcode projects from Ruby. |  [docs](https://www.rubydoc.info/gems/xcodeproj)
+| [![Build Status](https://github.com/CocoaPods/CLAide/workflows/ci/badge.svg)](https://github.com/CocoaPods/CLAide/actions/workflows/ci.yml) | [CLAide](https://github.com/CocoaPods/CLAide) | A small command-line interface framework.  | [docs](https://www.rubydoc.info/gems/claide)
+| [![Build Status](https://github.com/CocoaPods/Molinillo/workflows/test/badge.svg)](https://github.com/CocoaPods/Molinillo/actions/workflows/test.yml) | [Molinillo](https://github.com/CocoaPods/Molinillo) | A powerful generic dependency resolver.  | [docs](https://www.rubydoc.info/gems/molinillo)
 |  | [Master Repo ](https://github.com/CocoaPods/Specs) | Master repository of specifications. | [guides](https://guides.cocoapods.org/making/specs-and-specs-repo.html)

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

@@ -38,6 +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)'],
+            ['--validation-dir', 'The directory to use for validation. If none is specified a temporary directory will be used.'],
           ].concat(super)
         end
 
@@ -63,6 +64,7 @@ module Pod
           @analyze             = argv.flag?('analyze', false)
           @podspecs_paths      = argv.arguments!
           @configuration       = argv.option('configuration', nil)
+          @validation_dir      = argv.option('validation-dir', nil)
           super
         end
 
@@ -93,6 +95,7 @@ module Pod
             validator.include_podspecs = @include_podspecs
             validator.external_podspecs = @external_podspecs
             validator.configuration = @configuration
+            validator.validation_dir = @validation_dir
             validator.validate
 
             unless @clean

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

@@ -38,6 +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'],
+            ['--validation-dir', 'The directory to use for validation. If none is specified a temporary directory will be used.'],
           ].concat(super)
         end
 
@@ -59,6 +60,7 @@ module Pod
           @skip_import_validation = argv.flag?('skip-import-validation', false)
           @skip_tests = argv.flag?('skip-tests', false)
           @allow_overwrite = argv.flag?('overwrite', true)
+          @validation_dir = argv.option('validation-dir', nil)
           super
         end
 
@@ -144,6 +146,7 @@ module Pod
             validator.swift_version = @swift_version
             validator.skip_import_validation = @skip_import_validation
             validator.skip_tests = @skip_tests
+            validator.validation_dir = @validation_dir
             begin
               validator.validate
             rescue => e

data/lib/cocoapods/command/setup.rb

@@ -3,10 +3,10 @@ require 'fileutils'
 module Pod
   class Command
     class Setup < Command
-      self.summary = 'Setup the CocoaPods environment'
+      self.summary = 'Set up the CocoaPods environment'
 
       self.description = <<-DESC
-        Setup the CocoaPods environment
+        Set up the CocoaPods environment
       DESC
 
       def run

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

@@ -37,6 +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)'],
+            ['--validation-dir', 'The directory to use for validation. If none is specified a temporary directory will be used.'],
           ].concat(super)
         end
 
@@ -60,6 +61,7 @@ module Pod
           @analyze         = argv.flag?('analyze', false)
           @podspecs_paths  = argv.arguments!
           @configuration   = argv.option('configuration', nil)
+          @validation_dir = argv.option('validation-dir', nil)
           super
         end
 
@@ -84,6 +86,7 @@ module Pod
             validator.test_specs = @test_specs
             validator.analyze = @analyze
             validator.configuration = @configuration
+            validator.validation_dir = @validation_dir
             validator.validate
             failure_reasons << validator.failure_reason
 

data/lib/cocoapods/config.rb

@@ -49,23 +49,23 @@ module Pod
 
     # @!group UI
 
-    # @return [Bool] Whether CocoaPods should provide detailed output about the
+    # @return [Boolean] Whether CocoaPods should provide detailed output about the
     #         performed actions.
     #
     attr_accessor :verbose
     alias_method :verbose?, :verbose
 
-    # @return [Bool] Whether CocoaPods should produce not output.
+    # @return [Boolean] Whether CocoaPods should produce not output.
     #
     attr_accessor :silent
     alias_method :silent?, :silent
 
-    # @return [Bool] Whether CocoaPods is allowed to run as root.
+    # @return [Boolean] Whether CocoaPods is allowed to run as root.
     #
     attr_accessor :allow_root
     alias_method :allow_root?, :allow_root
 
-    # @return [Bool] Whether a message should be printed when a new version of
+    # @return [Boolean] Whether a message should be printed when a new version of
     #         CocoaPods is available.
     #
     attr_accessor :new_version_message
@@ -75,7 +75,7 @@ module Pod
 
     # @!group Installation
 
-    # @return [Bool] Whether the installer should skip the download cache.
+    # @return [Boolean] Whether the installer should skip the download cache.
     #
     attr_accessor :skip_download_cache
     alias_method :skip_download_cache?, :skip_download_cache

data/lib/cocoapods/executable.rb

@@ -36,7 +36,7 @@ module Pod
     # @param  [Array<#to_s>] command
     #         The command to send to the binary.
     #
-    # @param  [Bool] raise_on_failure
+    # @param  [Boolean] raise_on_failure
     #         Whether it should raise if the command fails.
     #
     # @raise  If the executable could not be located.

data/lib/cocoapods/external_sources/abstract_external_source.rb

@@ -36,7 +36,7 @@ module Pod
         @can_cache = can_cache
       end
 
-      # @return [Bool] whether an external source source is equal to another
+      # @return [Boolean] whether an external source source is equal to another
       #         according to the {#name} and to the {#params}.
       #
       def ==(other)

data/lib/cocoapods/external_sources/path_source.rb

@@ -45,7 +45,7 @@ module Pod
         path.exist? ? path : Pathname("#{path}.json")
       end
 
-      # @return [Bool]
+      # @return [Boolean]
       #
       def absolute?(path)
         Pathname(path).absolute? || path.to_s.start_with?('~')

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/acknowledgements.rb

@@ -84,10 +84,22 @@ module Pod
           elsif license_file = file_accessor(spec).license
             text = IO.read(license_file)
           end
+          text = format_license(text)
         end
         text
       end
 
+      # Convenience method for users to format licenses
+      #
+      # @param  [String] text
+      #         Unformatted license text
+      #
+      # @return [String] Formatted license text
+      #
+      def format_license(text)
+        text
+      end
+
       protected
 
       # Returns the file accessor for the given spec.

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

@@ -59,7 +59,7 @@ module Pod
         :tvos => Version.new('9.0'),
       }
 
-      # @return [Bool] Whether the external strings file is supported by the
+      # @return [Boolean] Whether the external strings file is supported by the
       #         `ibtool` according to the deployment target of the platform.
       #
       def use_external_strings_file?

data/lib/cocoapods/generator/copy_xcframework_script.rb

@@ -64,6 +64,10 @@ module Pod
 
 #{Pod::Generator::ScriptPhaseConstants::RSYNC_PROTECT_TMP_FILES}
 
+#{variant_for_slice}
+
+#{archs_for_slice}
+
 copy_dir()
 {
   local source="$1"
@@ -77,7 +81,9 @@ copy_dir()
 SELECT_SLICE_RETVAL=""
 
 select_slice() {
-  local paths=("$@")
+  local xcframework_name="$1"
+  xcframework_name="${xcframework_name##*/}"
+  local paths=("${@:2}")
   # Locate the correct slice of the .xcframework for the current architectures
   local target_path=""
 
@@ -93,29 +99,15 @@ select_slice() {
   fi
   for i in ${!paths[@]}; do
     local matched_all_archs="1"
-    for target_arch in $target_archs
-    do
-      if ! [[ "${paths[$i]}" == *"$target_variant"* ]]; then
+    local slice_archs="$(archs_for_slice "${xcframework_name}/${paths[$i]}")"
+    local slice_variant="$(variant_for_slice "${xcframework_name}/${paths[$i]}")"
+    for target_arch in $target_archs; do
+      if ! [[ "${slice_variant}" == "$target_variant" ]]; then
         matched_all_archs="0"
         break
       fi
 
-      # Verifies that the path contains the variant string (simulator or maccatalyst) if the variant is set.
-      if [[ -z "$target_variant" && ("${paths[$i]}" == *"simulator"* || "${paths[$i]}" == *"maccatalyst"*) ]]; then
-        matched_all_archs="0"
-        break
-      fi
-
-      # This regex matches all possible variants of the arch in the folder name:
-      # Let's say the folder name is: ios-armv7_armv7s_arm64_arm64e/CoconutLib.framework
-      # We match the following: -armv7_, _armv7s_, _arm64_ and _arm64e/.
-      # If we have a specific variant: ios-i386_x86_64-simulator/CoconutLib.framework
-      # We match the following: -i386_ and _x86_64-
-      # When the .xcframework wraps a static library, the folder name does not include
-      # any .framework. In that case, the folder name can be: ios-arm64_armv7
-      # We also match _armv7$ to handle that case.
-      local target_arch_regex="[_\\-]${target_arch}([\\/_\\-]|$)"
-      if ! [[ "${paths[$i]}" =~ $target_arch_regex ]]; then
+      if ! echo "${slice_archs}" | tr " " "\\n" | grep -F -q -x "$target_arch"; then
         matched_all_archs="0"
         break
       fi
@@ -137,10 +129,10 @@ install_xcframework() {
   local paths=("${@:4}")
 
   # Locate the correct slice of the .xcframework for the current architectures
-  select_slice "${paths[@]}"
+  select_slice "${basepath}" "${paths[@]}"
   local target_path="$SELECT_SLICE_RETVAL"
   if [[ -z "$target_path" ]]; then
-    echo "warning: [CP] Unable to find matching .xcframework slice in '${paths[@]}' for the current build architectures ($ARCHS)."
+    echo "warning: [CP] $(basename ${basepath}): Unable to find matching slice in '${paths[@]}' for the current build architectures ($ARCHS) and platform (${EFFECTIVE_PLATFORM_NAME-${PLATFORM_NAME}})."
     return
   fi
   local source="$basepath/$target_path"
@@ -183,6 +175,40 @@ install_xcframework() {
         args.join(' ')
       end
 
+      def variant_for_slice
+        script = ''
+        script << "variant_for_slice()\n"
+        script << "{\n"
+        script << "  case \"$1\" in\n"
+        xcframeworks.each do |xcframework|
+          root = xcframework.path
+          xcframework.slices.each do |slice|
+            script << "  #{shell_escape(root.basename.join(slice.path.dirname.relative_path_from(root)))})\n"
+            script << "    echo \"#{slice.platform_variant}\"\n"
+            script << "    ;;\n"
+          end
+        end
+        script << "  esac\n"
+        script << '}'
+      end
+
+      def archs_for_slice
+        script = ''
+        script << "archs_for_slice()\n"
+        script << "{\n"
+        script << "  case \"$1\" in\n"
+        xcframeworks.each do |xcframework|
+          root = xcframework.path
+          xcframework.slices.each do |slice|
+            script << "  #{shell_escape(root.basename.join(slice.path.dirname.relative_path_from(root)))})\n"
+            script << "    echo \"#{slice.supported_archs.sort.join(' ')}\"\n"
+            script << "    ;;\n"
+          end
+        end
+        script << "  esac\n"
+        script << '}'
+      end
+
       class << self
         # @param  [Pathname] xcframework_path
         #         the base path of the .xcframework bundle

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -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/generator/info_plist_file.rb

@@ -112,7 +112,7 @@ module Pod
           'CFBundleSignature' => '????',
           'CFBundleVersion' => '${CURRENT_PROJECT_VERSION}',
           'NSPrincipalClass' => '',
-          'CFBundleDevelopmentRegion' => 'en',
+          'CFBundleDevelopmentRegion' => '${PODS_DEVELOPMENT_LANGUAGE}',
         }
 
         info['CFBundleExecutable'] = '${EXECUTABLE_NAME}' if bundle_package_type != :bndl

data/lib/cocoapods/installer/analyzer/analysis_result.rb

@@ -59,14 +59,14 @@ module Pod
           end
         end
 
-        # @return [Bool] Whether an installation should be performed or this
+        # @return [Boolean] Whether an installation should be performed or this
         #         CocoaPods project is already up to date.
         #
         def needs_install?
           podfile_needs_install? || sandbox_needs_install?
         end
 
-        # @return [Bool] Whether the podfile has changes respect to the lockfile.
+        # @return [Boolean] Whether the podfile has changes respect to the lockfile.
         #
         def podfile_needs_install?
           state = podfile_state
@@ -74,7 +74,7 @@ module Pod
           needing_install > 0
         end
 
-        # @return [Bool] Whether the sandbox is in synch with the lockfile.
+        # @return [Boolean] Whether the sandbox is in synch with the lockfile.
         #
         def sandbox_needs_install?
           state = sandbox_state

data/lib/cocoapods/installer/analyzer/pod_variant.rb

@@ -56,7 +56,7 @@ module Pod
         # @note Non library specs are intentionally not included as part of the equality for pod variants since a pod
         #       variant should not be affected by the number of test nor app specs included.
         #
-        # @return [Bool] whether the {PodVariant} is equal to another taking all all their attributes into account
+        # @return [Boolean] whether the {PodVariant} is equal to another taking all all their attributes into account
         #
         def ==(other)
           self.class == other.class &&