cocoapods 1.10.0.beta.2 → 1.10.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb6ea2032e8f048ddbdddbef9d383ddb952c1d7ebec5c2a4ae2fa458b6047af8
-  data.tar.gz: 0cb3253433506bb0ffbdabc77ef3ca3e4dcd098deeed4bffb9e05c342399a056
+  metadata.gz: 2b610fca17dbffb7ed6c959cd5f43bd0ddbf0c2c9b91bb19b03ecf5353804f1a
+  data.tar.gz: 6bb43720da1072c1824b2dfcc3735ccdd11eba2845ef8be9cb6caf00b47ef6b0
 SHA512:
-  metadata.gz: 8d40b3fb83faad9c20a172c4b980f3aa2412169c180463747883504cb6747fd6adf76013451055c3f3cc3816a555468b9d77436ec73947bd9727192fc4f4d2ae
-  data.tar.gz: 0f424168358d4940f151f2b67639d4782cf59619b36b62420d880e37ab46d7831cb55abcb1f9b0105e0d8c7933de44009d47a0156633f645254bf58f1fa9f408
+  metadata.gz: 83a7c0f693ec49044e4766fa0f427a663358bf1c6346fd366d133a60b70d559209a215c019198593210919f2e42fefda4cff0747384ece6c08a75a9489e491d1
+  data.tar.gz: 945634e14120c0deda48a9ce2397fd77b307f2376ffff84f33162fa73324002776b022833180e4d65e9b3638c7a90d2c1c1891557988e1fd471a65dfe1d9d61a

data/CHANGELOG.md

@@ -1,9 +1,31 @@
 # 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.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.0.rc.1'.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

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/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/validator.rb

@@ -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

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.0.rc.1
 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: 2020-09-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.10.0.beta.2
+        version: 1.10.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0.beta.2
+        version: 1.10.0.rc.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -538,7 +538,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 3
 summary: The Cocoa library package manager.