cocoapods 1.10.0.beta.2 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb6ea2032e8f048ddbdddbef9d383ddb952c1d7ebec5c2a4ae2fa458b6047af8
-  data.tar.gz: 0cb3253433506bb0ffbdabc77ef3ca3e4dcd098deeed4bffb9e05c342399a056
+  metadata.gz: 9c9864dec487d5e04b5d9cf7f4bc36a25ba9793c629ae64bf71eabb30cc8b040
+  data.tar.gz: 70643343f2fc6e263c7fbcd41df19646b6c321d5c3b7d112b1a674bc72bdbdf1
 SHA512:
-  metadata.gz: 8d40b3fb83faad9c20a172c4b980f3aa2412169c180463747883504cb6747fd6adf76013451055c3f3cc3816a555468b9d77436ec73947bd9727192fc4f4d2ae
-  data.tar.gz: 0f424168358d4940f151f2b67639d4782cf59619b36b62420d880e37ab46d7831cb55abcb1f9b0105e0d8c7933de44009d47a0156633f645254bf58f1fa9f408
+  metadata.gz: d1b48cdba64b6721446371c392d5fb1f93a28854addcc7dc4724e79484cbe995b75f46675ffd0a0ba3feafb60590e60baf22b725062119bf0e64246e68c5502c
+  data.tar.gz: de5fa055225078932fac6470a3fda8bb0deef31f6a9165a4b77c84efb778989e82edb9e54197a319b9704c1f0c415516fe703a6333f05f47401087d1e78efa18

data/CHANGELOG.md

@@ -1,9 +1,94 @@
 # Installation & Update
 
-To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
+To install or update CocoaPods see this [guide](https://guides.cocoapods.org/using/index.html).
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.10.2 (2021-07-28)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Fix errors when archiving a Catalyst app which depends on a pod which uses `header_mappings_dir`.  
+  [Thomas Goyne](https://github.com/tgoyne)
+  [#10224](https://github.com/CocoaPods/CocoaPods/pull/10224)
+
+* Fix missing `-ObjC` for static XCFrameworks - take 2  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#10459](https://github.com/CocoaPods/CocoaPods/issuess/10459)
+
+* Change URL validation failure to a note  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#10291](https://github.com/CocoaPods/CocoaPods/issues/10291)
+
+
+## 1.10.1 (2021-01-07)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Fix library name in LD `-l` flags for XCFrameworks containing libraries  
+  [Wes Campaigne](https://github.com/Westacular)
+  [#10165](https://github.com/CocoaPods/CocoaPods/issues/10165)
+
+* Fix file extension replacement for resource paths when using static frameworks.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#10206](https://github.com/CocoaPods/CocoaPods/issues/10206)
+
+* Fix processing of xcassets resources when pod target is static framework  
+  [Federico Trimboli](https://github.com/fedetrim)
+  [#10175](https://github.com/CocoaPods/CocoaPods/pull/10175)
+  [#10170](https://github.com/CocoaPods/CocoaPods/issues/10170)
+
+* Fix missing `-ObjC` for static XCFrameworks  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#10234](https://github.com/CocoaPods/CocoaPods/pull/10234)
+
+
+## 1.10.0 (2020-10-20)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Generate the correct LD `-l` flags for XCFrameworks containing libraries  
+  [Wes Campaigne](https://github.com/Westacular)
+  [#10071](https://github.com/CocoaPods/CocoaPods/issues/10071)
+
+* Add support for automatically embedding XCFramework debug symbols for XCFrameworks generated with Xcode 12  
+  [johntmcintosh](https://github.com/johntmcintosh)
+  [#10111](https://github.com/CocoaPods/CocoaPods/issues/10111)
+
+## 1.10.0.rc.1 (2020-09-15)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Fix XCFramework slice selection  
+  [lowip](https://github.com/lowip)
+  [#10026](https://github.com/CocoaPods/CocoaPods/issues/10026)
+
+* Honor test spec deployment target during validation.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#9999](https://github.com/CocoaPods/CocoaPods/pull/9999)
+
+* Ensure that incremental installation is able to set target dependencies for a
+  test spec that uses a custom `app_host_name` that is in a project that is not
+  regenerated.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+
 ## 1.10.0.beta.2 (2020-08-12)
 
 ##### Enhancements

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/copy_xcframework_script.rb

@@ -100,12 +100,21 @@ select_slice() {
         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-
-      local target_arch_regex="[_\\-]${target_arch}[\\/_\\-]"
+      # 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
         matched_all_archs="0"
         break
@@ -185,12 +194,8 @@ install_xcframework() {
     mkdir -p "$destination"
   fi
 
-  if [[ "$package_type" == "library" ]]; then
-    # Libraries can contain headers, module maps, and a binary, so we'll copy everything in the folder over
-    copy_dir "$source/" "$destination"
-  elif [[ "$package_type" == "framework" ]]; then
-    copy_dir "$source" "$destination"
-  fi
+  copy_dir "$source/" "$destination"
+
   echo "Copied $source to $destination"
 }
 
@@ -217,12 +222,7 @@ install_xcframework() {
         is_framework = xcframework.build_type.framework?
         args << shell_escape(is_framework ? 'framework' : 'library')
         slices.each do |slice|
-          args << if is_framework
-                    shell_escape(slice.path.relative_path_from(root))
-                  else
-                    # We don't want the path to the library binary, we want the dir that contains it
-                    shell_escape(slice.path.dirname.relative_path_from(root))
-                  end
+          args << shell_escape(slice.path.dirname.relative_path_from(root))
         end
         args.join(' ')
       end

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

@@ -54,6 +54,10 @@ module Pod
           installation_results.each do |installation_result|
             native_target = installation_result.native_target
             target_label_by_metadata[native_target.name] = TargetMetadata.from_native_target(sandbox, native_target)
+            # app targets need to be added to the cache because they can be used as app hosts for test targets, even if those test targets live inside a different pod (and thus project)
+            installation_result.app_native_targets.each_value do |app_target|
+              target_label_by_metadata[app_target.name] = TargetMetadata.from_native_target(sandbox, app_target)
+            end
           end
         end
 

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

@@ -79,7 +79,11 @@ module Pod
             app_host_target.build_configurations.each do |configuration|
               configuration.build_settings['PRODUCT_NAME'] = app_target_label
               configuration.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = 'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}'
-              configuration.build_settings['CODE_SIGN_IDENTITY'] = '' if platform == :osx
+              if platform == :osx
+                configuration.build_settings['CODE_SIGN_IDENTITY'] = ''
+              elsif platform == :ios
+                configuration.build_settings['CODE_SIGN_IDENTITY'] = 'iPhone Developer'
+              end
               configuration.build_settings['CURRENT_PROJECT_VERSION'] = '1'
             end
 

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

@@ -152,11 +152,13 @@ module Pod
             target_attributes[test_native_target.uuid.to_s] = { 'TestTargetID' => app_native_target.uuid.to_s }
             project.root_object.attributes['TargetAttributes'] = target_attributes
             test_native_target.add_dependency(app_native_target)
-          else
+          elsif cached_dependency = metadata_cache.target_label_by_metadata[app_host_target_label]
             # Hit the cache
-            cached_dependency = metadata_cache.target_label_by_metadata[app_host_target_label]
             project.add_cached_subproject_reference(sandbox, cached_dependency, project.dependencies_group)
             Project.add_cached_dependency(sandbox, test_native_target, cached_dependency)
+          else
+            raise "Expected to either have an installation or cache result for #{app_host_target_label} (from pod #{app_host_pod_target_label}) " \
+              "for target #{test_native_target.name} in project #{project.project_name}"
           end
         end
 

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

@@ -408,7 +408,11 @@ module Pod
                   configuration.build_settings['CODE_SIGNING_ALLOWED'] = 'YES'
                 end
                 # For macOS we do not code sign the XCTest bundle because we do not code sign the frameworks either.
-                configuration.build_settings['CODE_SIGN_IDENTITY'] = '' if target.platform == :osx
+                if target.platform == :osx
+                  configuration.build_settings['CODE_SIGN_IDENTITY'] = ''
+                elsif target.platform == :ios
+                  configuration.build_settings['CODE_SIGN_IDENTITY'] = 'iPhone Developer'
+                end
               end
 
               remove_pod_target_xcconfig_overrides_from_target(target.test_spec_build_settings_by_config[test_spec.name], test_native_target)
@@ -846,7 +850,7 @@ module Pod
           end
 
           # Creates a build phase which links the versioned header folders
-          # of the OS X into the framework bundle's root root directory.
+          # of the OS X framework into the framework bundle's root directory.
           # This is only necessary because the way how headers are copied
           # via custom copy file build phases in combination with
           # header_mappings_dir interferes with xcodebuild's expectations
@@ -858,11 +862,16 @@ module Pod
           # @return [void]
           #
           def create_build_phase_to_symlink_header_folders(native_target)
-            return unless target.platform.name == :osx && any_header_mapping_dirs?
+            # This is required on iOS for Catalyst, which uses macOS framework layouts
+            return unless (target.platform.name == :osx || target.platform.name == :ios) && any_header_mapping_dirs?
 
             build_phase = native_target.new_shell_script_build_phase('Create Symlinks to Header Folders')
             build_phase.shell_script = <<-eos.strip_heredoc
               cd "$CONFIGURATION_BUILD_DIR/$WRAPPER_NAME" || exit 1
+              if [ ! -d Versions ]; then
+                # Not a versioned framework, so no need to do anything
+                exit 0
+              fi
 
               public_path="${PUBLIC_HEADERS_FOLDER_PATH\#\$CONTENTS_FOLDER_PATH/}"
               if [ ! -f "$public_path" ]; then

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -172,6 +172,15 @@ module Pod
         end
       end
 
+      # @return [Array<Pathname>] The paths of the dynamic xcframework bundles
+      #         that come shipped with the Pod.
+      #
+      def vendored_static_xcframeworks
+        vendored_xcframeworks.select do |path|
+          Xcode::XCFramework.new(path).build_type == BuildType.static_framework
+        end
+      end
+
       # @return [Array<Pathname>] The paths of the static (fake) framework
       #         bundles that come shipped with the Pod.
       #
@@ -289,7 +298,7 @@ module Pod
       #         that come shipped with the Pod.
       #
       def vendored_static_artifacts
-        vendored_static_libraries + vendored_static_frameworks
+        vendored_static_libraries + vendored_static_frameworks + vendored_static_xcframeworks
       end
 
       # @return [Hash{String => Array<Pathname>}] A hash that describes the

data/lib/cocoapods/target.rb

@@ -350,7 +350,7 @@ module Pod
     end
 
     def self.resource_extension_compilable?(input_extension)
-      output_extension_for_resource(input_extension) != input_extension
+      output_extension_for_resource(input_extension) != input_extension && input_extension != '.xcassets'
     end
 
     #-------------------------------------------------------------------------#

data/lib/cocoapods/target/aggregate_target.rb

@@ -292,7 +292,7 @@ module Pod
                 extname = File.extname(resource_path)
                 if self.class.resource_extension_compilable?(extname)
                   output_extname = self.class.output_extension_for_resource(extname)
-                  built_product_dir.join(File.basename(resource_path, extname)).sub_ext(output_extname).to_s
+                  built_product_dir.join(File.basename(resource_path)).sub_ext(output_extname).to_s
                 else
                   resource_path
                 end

data/lib/cocoapods/target/build_settings.rb

@@ -755,7 +755,7 @@ module Pod
             libraries.concat libraries_to_import
             xcframework_libraries = vendored_xcframeworks.
                                     select { |xcf| xcf.build_type.static_library? }.
-                                    map(&:name).
+                                    flat_map { |xcf| linker_names_from_libraries([xcf.slices.first.binary_path]) }.
                                     uniq
             libraries.concat xcframework_libraries
           end
@@ -871,7 +871,16 @@ module Pod
 
         # @return [Array<String>]
         define_build_settings_method :header_search_paths, :build_setting => true, :memoized => true, :sorted => true do
-          target.header_search_paths(:include_dependent_targets_for_test_spec => test_xcconfig? && non_library_spec, :include_dependent_targets_for_app_spec => app_xcconfig? && non_library_spec, :configuration => @configuration)
+          paths = target.header_search_paths(:include_dependent_targets_for_test_spec => test_xcconfig? && non_library_spec, :include_dependent_targets_for_app_spec => app_xcconfig? && non_library_spec, :configuration => @configuration)
+
+          dependent_vendored_xcframeworks = []
+          dependent_vendored_xcframeworks.concat vendored_xcframeworks
+          dependent_vendored_xcframeworks.concat dependent_targets.flat_map { |pt| pt.build_settings[@configuration].vendored_xcframeworks }
+          paths.concat dependent_vendored_xcframeworks.
+            select { |xcf| xcf.build_type.static_library? }.
+            map { |xcf| "#{BuildSettings.xcframework_intermediate_dir(xcf)}/Headers" }.
+            compact
+          paths
         end
 
         # @return [Array<String>]

data/lib/cocoapods/validator.rb

@@ -443,7 +443,7 @@ module Pod
       if !resp
         warning('url', "There was a problem validating the URL #{url}.", true)
       elsif !resp.success?
-        warning('url', "The URL (#{url}) is not reachable.", true)
+        note('url', "The URL (#{url}) is not reachable.", true)
       end
 
       resp
@@ -556,6 +556,8 @@ module Pod
       validation_dir.rmtree
     end
 
+    # @return [String] The deployment targret of the library spec.
+    #
     def deployment_target
       deployment_target = spec.subspec_by_name(subspec_name).deployment_target(consumer.platform_name)
       if consumer.platform_name == :ios && use_frameworks
@@ -711,7 +713,7 @@ module Pod
             UI.warn "Skipping compilation with `xcodebuild` because target contains no sources.\n".yellow
           else
             if analyze
-              output = xcodebuild('analyze', scheme, 'Release')
+              output = xcodebuild('analyze', scheme, 'Release', :deployment_target => deployment_target)
               find_output = Executable.execute_command('find', [validation_dir, '-name', '*.html'], false)
               if find_output != ''
                 message = 'Static Analysis failed.'
@@ -720,7 +722,7 @@ module Pod
                 error('build_pod', message)
               end
             else
-              output = xcodebuild('build', scheme, configuration ? configuration : 'Release')
+              output = xcodebuild('build', scheme, configuration ? configuration : 'Release', :deployment_target => deployment_target)
             end
             parsed_output = parse_xcodebuild_output(output)
             translate_output_to_linter_messages(parsed_output)
@@ -757,7 +759,7 @@ module Pod
               UI.warn "Skipping test spec `#{test_spec.name}` on platform `#{consumer.platform_name}` since it is not supported.\n".yellow
             else
               scheme = @installer.target_installation_results.first[pod_target.name].native_target_for_spec(test_spec)
-              output = xcodebuild('test', scheme, 'Debug')
+              output = xcodebuild('test', scheme, 'Debug', :deployment_target => test_spec.deployment_target(consumer.platform_name))
               parsed_output = parse_xcodebuild_output(output)
               translate_output_to_linter_messages(parsed_output)
             end
@@ -1048,7 +1050,7 @@ module Pod
     # @return [String] Executes xcodebuild in the current working directory and
     #         returns its output (both STDOUT and STDERR).
     #
-    def xcodebuild(action, scheme, configuration)
+    def xcodebuild(action, scheme, configuration, deployment_target:)
       require 'fourflusher'
       command = %W(clean #{action} -workspace #{File.join(validation_dir, 'App.xcworkspace')} -scheme #{scheme} -configuration #{configuration})
       case consumer.platform_name

data/lib/cocoapods/xcode/xcframework/xcframework_slice.rb

@@ -121,7 +121,16 @@ module Pod
         # @return [Pathname] the path to the bundled binary
         #
         def binary_path
-          path + name
+          @binary_path ||= begin
+            case package_type
+            when :framework
+              path + name
+            when :library
+              path
+            else
+              raise Informative, "Invalid package type `#{package_type}`"
+            end
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.10.0.beta.2
+  version: 1.10.2
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2021-07-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.10.0.beta.2
+        version: 1.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0.beta.2
+        version: 1.10.2
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -187,7 +187,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: 1.19.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -197,7 +197,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: 1.19.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'