cocoapods 1.11.2 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 931de41ff6f73552f6df94fe1f181116e93e675d3ea19455ac9487916c398bb5
-  data.tar.gz: e003ee69f4eb100152140a48685d9da44f48adb2081ff0fa1174a209efdd5d74
+  metadata.gz: aae7ed73ff99d6f5553364df8d34c4a26cc9825bd41ee3a59cb7b8d86f290197
+  data.tar.gz: a439077432771a732ad842f4d9c42c147eeebace664c6a4766bf922a91c8dd6b
 SHA512:
-  metadata.gz: bc23958f427a0bcccdc959d7a92e3f50e6ff40fb5e4d34c8a6d25b678baa082aa300d70a2c8e0e99d32372cd1c2a87ae1d128571edd6aaa57ca76072d7baa617
-  data.tar.gz: a5379c8993a55018a63fc95167380691f2e3c3ed5ae9ba0ca53974064cd30606ff098b5b79a2f06d3ac81bb763aa9ca9ba499756461785be1955a54a917cf421
+  metadata.gz: 61a5beb8911ca4a8fe200421d757187f0c70f3b30ec3b00712dd32627a9749797a6e693c385163844b78f15bee2f7a686f9faac83a5a83713d69c9c1b61574fe
+  data.tar.gz: a55f30e798efa79abb3f0a7bf103d30cec767661f95b9fe8ef8ff72413bc191b2a5d558f2819ebe6ef7c9f85d029d57dd9bbf1274cfdf34d171399981311b140

data/CHANGELOG.md

@@ -4,6 +4,39 @@ To install or update CocoaPods see this [guide](https://guides.cocoapods.org/usi
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 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
@@ -17,7 +50,7 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [#10912](https://github.com/CocoaPods/CocoaPods/issues/10912)
 
 
-## 1.11.1 (2021-09-13)
+## 1.11.1 (2021-09-12)
 
 ##### Enhancements
 

data/lib/cocoapods/gem_version.rb

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

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/installer/analyzer/sandbox_analyzer.rb

@@ -145,7 +145,8 @@ module Pod
           return true if spec.version != sandbox_version(pod)
           return true if spec.checksum != sandbox_checksum(pod)
           return true if resolved_spec_names(pod) != sandbox_spec_names(pod)
-          return true if podfile_dependency(pod) != sandbox_dependency(pod)
+          podfile_dep = podfile_dependency(pod)&.tap { |dep| dep.podspec_repo = nil }
+          return true if podfile_dep != sandbox_dependency(pod)
           return true if sandbox.predownloaded?(pod)
           return true if folder_empty?(pod)
           false

data/lib/cocoapods/installer/analyzer.rb

@@ -125,7 +125,7 @@ module Pod
         validate_platforms(resolver_specs_by_target)
         specifications = generate_specifications(resolver_specs_by_target)
         aggregate_targets, pod_targets = generate_targets(resolver_specs_by_target, target_inspections)
-        sandbox_state   = generate_sandbox_state(specifications)
+        sandbox_state = generate_sandbox_state(specifications)
         specs_by_target = resolver_specs_by_target.each_with_object({}) do |rspecs_by_target, hash|
           hash[rspecs_by_target[0]] = rspecs_by_target[1].map(&:spec)
         end

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -179,7 +179,7 @@ module Pod
         end
       end
 
-      # @return [Array<Pathname>] The paths of the dynamic xcframework bundles
+      # @return [Array<Pathname>] The paths of the static xcframework bundles
       #         that come shipped with the Pod.
       #
       def vendored_static_xcframeworks
@@ -188,6 +188,15 @@ module Pod
         end
       end
 
+      # @return [Array<Pathname>] The paths of the dynamic xcframework bundles
+      #         that come shipped with the Pod.
+      #
+      def vendored_dynamic_xcframeworks
+        vendored_xcframeworks.select do |path|
+          Xcode::XCFramework.new(spec.name, path).build_type == BuildType.dynamic_framework
+        end
+      end
+
       # @return [Array<Pathname>] The paths of the static (fake) framework
       #         bundles that come shipped with the Pod.
       #

data/lib/cocoapods/sources_manager.rb

@@ -86,7 +86,7 @@ module Pod
         response = OpenURI.open_uri(url.chomp('/') + '/CocoaPods-version.yml', uri_options)
         response_hash = YAML.load(response.read) # rubocop:disable Security/YAMLLoad
         response_hash.is_a?(Hash) && !Source::Metadata.new(response_hash).latest_cocoapods_version.nil?
-      rescue ::OpenURI::HTTPError, SocketError
+      rescue Psych::SyntaxError, ::OpenURI::HTTPError, SocketError
         return false
       rescue => e
         raise Informative, "Couldn't determine repo type for URL: `#{url}`: #{e}"

data/lib/cocoapods/target/build_settings.rb

@@ -938,6 +938,8 @@ module Pod
         define_build_settings_method :swift_include_paths, :build_setting => true, :memoized => true, :sorted => true, :uniqued => true do
           paths = dependent_targets.flat_map { |pt| pt.build_settings[@configuration].swift_include_paths_to_import }
           paths.concat swift_include_paths_to_import if non_library_xcconfig?
+          vendored_static_library_search_paths = dependent_targets.flat_map { |pt| pt.build_settings[@configuration].vendored_static_library_search_paths }
+          paths.concat vendored_static_library_search_paths
           paths.concat ['$(PLATFORM_DIR)/Developer/usr/lib'] if should_apply_xctunwrap_fix?
           paths
         end
@@ -1283,7 +1285,7 @@ module Pod
         define_build_settings_method :any_vendored_dynamic_artifacts?, :memoized => true do
           pod_targets.any? do |pt|
             pt.file_accessors.any? do |fa|
-              !fa.vendored_dynamic_artifacts.empty?
+              !fa.vendored_dynamic_artifacts.empty? || !fa.vendored_dynamic_xcframeworks.empty?
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.11.3
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2022-03-15 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.2
+        version: 1.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.11.3
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -545,7 +545,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: The Cocoa library package manager.