cocoapods 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18029602b0c6762ae9758040ac419c6f06d349a572369fa9bf0345cf765d08a1
-  data.tar.gz: c7eb15f452ae34c5478ddb4e64a75bd3e61d2b0a607503dc9cafafd4e563d915
+  metadata.gz: 3d7d68150bd77329db1e629e610c6a8fa831590339a9502e5bedd4eaeaf1be1f
+  data.tar.gz: 33a2b4a376e840e9129200ad3d8e2ffc50ff006f53f5963343ec6b75fd0a4baf
 SHA512:
-  metadata.gz: 7be0a083dac27cc3267cd3d671b83dad1a897c6ef0cdb09bfa61cdfb6f791ac6ea5de13bbf674df3781221901b63fe2c97f1bbd6b8d378fad594c083eeec83a5
-  data.tar.gz: 859cb8e68cf8918c7d99066aa49589a3b3bcfc47944b3154876328724dc5b854e5accc518092275a0b130996d1428c09d9f12b4e29a22b7f9628d4c11a0c315e
+  metadata.gz: b501dc64078ee094a69bd497416114c68f226136174eb8c3c18b1e57fdcd37ef7a97c0da2de404f3a4d7433865fb4d952712b717f88d59e3d86ab2a7ce2bed98
+  data.tar.gz: ffd57b0deec005f87f65856f2eb28902b00dc966336b05d65994e2aa8ede4f02136144aeae82f059d401d2abed5c95f8e836ea46d361aa28f40077b5172d1b48

data/CHANGELOG.md

@@ -4,6 +4,32 @@ To install or update CocoaPods see this [guide](https://guides.cocoapods.org/usi
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 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
@@ -16,7 +42,7 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [Wes Campaigne](https://github.com/Westacular)
   [#10071](https://github.com/CocoaPods/CocoaPods/issues/10071)
 
-* Add support for automatically embeddeding XCFramework debug symbols for XCFrameworks generated with Xcode 12  
+* 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)
 

data/lib/cocoapods/gem_version.rb

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

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

@@ -1263,8 +1263,24 @@ module Pod
           end
         end
 
+        # @return [Boolean]
+        define_build_settings_method :any_vendored_static_xcframeworks?, :memoized => true do
+          pod_targets.any? do |pt|
+            pt.build_settings.any? do |bs|
+              if bs.respond_to?(:vendored_xcframeworks)
+                bs.vendored_xcframeworks.any? do |xcf|
+                  xcf.build_type == BuildType.static_framework
+                end
+              end
+            end
+          end
+        end
+
         # @return [Boolean]
         define_build_settings_method :any_vendored_static_artifacts?, :memoized => true do
+          if any_vendored_static_xcframeworks?
+            return true
+          end
           pod_targets.any? do |pt|
             pt.file_accessors.any? do |fa|
               !fa.vendored_static_artifacts.empty?

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
+  version: 1.10.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2021-01-07 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
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.10.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement