cocoapods 1.6.0.rc.1 → 1.6.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22d034f2584a2be7eca9591e3e96aadfe0d69bdf
-  data.tar.gz: ccef570c47e3403cb37da66528683828e71ade6a
+  metadata.gz: d233d9b66203555df515f80f06b7344e507e7b6f
+  data.tar.gz: 6a8c2f222b3eb5ef854fbdd65af033d77ea861cb
 SHA512:
-  metadata.gz: 59c090cf2cd1dfc0d4e6f486d4eb6f223314a8f992a7428b71b6f9b8cf1f29b2cf032642d1e2d6f49a3b3f6421c68437b4527326fc27d3c35ae11e2bcdfe64b3
-  data.tar.gz: 378668cdae9cb9086bac89df9a94841f2a33b539bd57020c3b42362f287a385ab1e72cd727da1a093cb1a6f3128aa8885bf1a41aabeb9017e87753fed619dff0
+  metadata.gz: 54fcdddb7e3128c5c6f037c1513500df7351971a35ca6585e2536032bbf3ac99d56b71b439b4919c8597addbeb6bb70d478422779aa0ff5edc8355a04559f1c1
+  data.tar.gz: 18167232fc760887b07c6b97b085164cbd1dc476dcc585e32f392f03efe855e3f7643e43133feaf4041310d1d41ffb36ba282e4b853abdbc7476a52d5553a67a

data/CHANGELOG.md

@@ -4,6 +4,18 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.6.0.rc.2 (2019-01-29)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Fix linking of vendored libraries and frameworks in pod targets  
+  [Wes Campaigne](https://github.com/Westacular)
+  [#8453](https://github.com/CocoaPods/CocoaPods/issues/8453)
+
 ## 1.6.0.rc.1 (2019-01-25)
 
 ##### Enhancements

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/target/build_settings.rb

@@ -601,13 +601,24 @@ module Pod
 
         # @!group Libraries
 
+        # Converts array of library path references to just the names to use
+        # link each library, e.g. from '/path/to/libSomething.a' to 'Something'
+        #
+        # @param [Array<String>] libraries
+        #
+        # @return [Array<String>]
+        #
+        def linker_names_from_libraries(libraries)
+          libraries.map { |l| File.basename(l, l.extname).sub(/\Alib/, '') }
+        end
+
         # @return [Array<String>]
         define_build_settings_method :libraries, :memoized => true, :sorted => true, :uniqued => true do
           return [] if (!target.requires_frameworks? || target.static_framework?) && !test_xcconfig?
 
           libraries = []
           if test_xcconfig? || target.requires_frameworks? && !target.static_framework?
-            libraries.concat vendored_static_frameworks.map { |l| File.basename(l, '.framework') }
+            libraries.concat linker_names_from_libraries(vendored_static_libraries)
             libraries.concat libraries_to_import
           end
           if test_xcconfig?
@@ -621,7 +632,7 @@ module Pod
         define_build_settings_method :static_libraries_to_import, :memoized => true do
           static_libraries_to_import = []
           unless target.should_build? && target.requires_frameworks? && !target.static_framework?
-            static_libraries_to_import.concat vendored_static_libraries.map { |l| File.basename(l, l.extname).sub(/\Alib/, '') }
+            static_libraries_to_import.concat linker_names_from_libraries(vendored_static_libraries)
           end
           static_libraries_to_import << target.product_basename if target.should_build? && !target.requires_frameworks?
           static_libraries_to_import
@@ -629,7 +640,7 @@ module Pod
 
         # @return [Array<String>]
         define_build_settings_method :dynamic_libraries_to_import, :memoized => true do
-          vendored_dynamic_libraries.map { |l| File.basename(l, l.extname).sub(/\Alib/, '') } +
+          linker_names_from_libraries(vendored_dynamic_libraries) +
           spec_consumers.flat_map(&:libraries)
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.6.0.rc.1
+  version: 1.6.0.rc.2
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-24 00:00:00.000000000 Z
+date: 2019-01-29 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.6.0.rc.1
+        version: 1.6.0.rc.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0.rc.1
+        version: 1.6.0.rc.2
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -273,16 +273,22 @@ dependencies:
   name: fourflusher
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: gh_inspector
   requirement: !ruby/object:Gem::Requirement