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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 78fc10cd8ecb6e143b881badf52a7688a75a4027494be697848432c15e4ef2ea
-  data.tar.gz: 1193a91131a6f03a5ac7b7b52eecca0ca82d74167e7b465f08342255ba4b14d8
+SHA1:
+  metadata.gz: 22d034f2584a2be7eca9591e3e96aadfe0d69bdf
+  data.tar.gz: ccef570c47e3403cb37da66528683828e71ade6a
 SHA512:
-  metadata.gz: f24e4f502e4251a6cebfb9020037af737c52094121aea6d0f26f6392f14d993ba95597249266e74c5113b0062dfc8de277a60ce6eba7e9b2213f19f907ca51cc
-  data.tar.gz: 949700b4fd4b5fec511390a75ad55b12d86128650833b3caf72da2c4bb3d15ecd90429d6e70177b3f67134e4cf8d7848b8c3d06504cf9dbe350b9750f7bbd164
+  metadata.gz: 59c090cf2cd1dfc0d4e6f486d4eb6f223314a8f992a7428b71b6f9b8cf1f29b2cf032642d1e2d6f49a3b3f6421c68437b4527326fc27d3c35ae11e2bcdfe64b3
+  data.tar.gz: 378668cdae9cb9086bac89df9a94841f2a33b539bd57020c3b42362f287a385ab1e72cd727da1a093cb1a6f3128aa8885bf1a41aabeb9017e87753fed619dff0

data/CHANGELOG.md

@@ -4,6 +4,29 @@ 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.1 (2019-01-25)
+
+##### Enhancements
+
+* Generate Info.plist files for static frameworks  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#8287](https://github.com/CocoaPods/CocoaPods/issues/8287)
+
+##### Bug Fixes
+
+* Do not force 64-bit architectures on Xcode 10  
+  [Eric Amorde](https://github.com/amorde)
+  [#8242](https://github.com/CocoaPods/CocoaPods/issues/8242)
+
+* Fix running test specs that support iOS 8.  
+  [Jeff Kelley](https://github.com/SlaunchaMan)
+  [#8286](https://github.com/CocoaPods/CocoaPods/pull/8286)
+
+* Remove linker flags that linked dynamic libraries & frameworks from the build
+  settings for pod targets.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#8314](https://github.com/CocoaPods/CocoaPods/pull/8314)
+
 ## 1.6.0.beta.2 (2018-10-17)
 
 ##### Enhancements

data/bin/pod

@@ -35,7 +35,7 @@ STDOUT.sync = true if ENV['CP_STDOUT_SYNC'] == 'TRUE'
 
 require 'cocoapods'
 
-if profile_filename = ENV['PROFILE']
+if profile_filename = ENV['COCOAPODS_PROFILE']
   require 'ruby-prof'
   reporter =
     case (profile_extname = File.extname(profile_filename))

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/app_target_helper.rb

@@ -105,13 +105,16 @@ module Pod
       # @param  [Symbol] platform
       #         the platform of the target. Can be `:ios` or `:osx`, etc.
       #
+      # @param  [String] deployment_target
+      #         the deployment target for the platform.
+      #
       # @param  [String] name
       #         The name to use for the target, defaults to 'App'.
       #
       # @return [PBXFileReference] the created file reference of the launchscreen storyboard.
       #
-      def self.add_launchscreen_storyboard(project, target, group, name = 'App')
-        launch_storyboard_file = AppTargetHelper.create_launchscreen_storyboard_file(project, name)
+      def self.add_launchscreen_storyboard(project, target, group, deployment_target, name = 'App')
+        launch_storyboard_file = AppTargetHelper.create_launchscreen_storyboard_file(project, deployment_target, name)
         launch_storyboard_ref = group.new_file(launch_storyboard_file)
         target.resources_build_phase.add_file_reference(launch_storyboard_ref)
       end
@@ -199,15 +202,22 @@ module Pod
       # @param  [Project] project
       #         the Xcodeproj to generate the launchscreen storyboard into.
       #
+      # @param  [String] deployment_target
+      #         the deployment target for the platform.
+      #
       # @param  [String] name
       #         The name of the folder to use and save the generated launchscreen storyboard file.
       #
       # @return [Pathname] the new launchscreen storyboard file that was generated.
       #
-      def self.create_launchscreen_storyboard_file(project, name = 'App')
+      def self.create_launchscreen_storyboard_file(project, deployment_target, name = 'App')
         launch_storyboard_file = project.path.dirname.+("#{name}/LaunchScreen.storyboard")
         launch_storyboard_file.parent.mkpath
-        File.write(launch_storyboard_file, LAUNCHSCREEN_STORYBOARD_CONTENTS)
+        if Version.new(deployment_target) >= Version.new('9.0')
+          File.write(launch_storyboard_file, LAUNCHSCREEN_STORYBOARD_CONTENTS)
+        else
+          File.write(launch_storyboard_file, LAUNCHSCREEN_STORYBOARD_CONTENTS_IOS_8)
+        end
         launch_storyboard_file
       end
 
@@ -279,6 +289,36 @@ int main(int argc, const char * argv[]) {
 }
 EOS
 
+      LAUNCHSCREEN_STORYBOARD_CONTENTS_IOS_8 = <<-XML.strip_heredoc.freeze
+              <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+              <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" systemVersion="17A277" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+                <dependencies>
+                  <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
+                  <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+                </dependencies>
+                <scenes>
+                  <!--View Controller-->
+                  <scene sceneID="EHf-IW-A2E">
+                    <objects>
+                      <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                        <layoutGuides>
+                          <viewControllerLayoutGuide type="top" id="rUq-ht-380"/>
+                          <viewControllerLayoutGuide type="bottom" id="a9l-8d-mfx"/>
+                        </layoutGuides>
+                        <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                          <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                          <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                          <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </view>
+                      </viewController>
+                      <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                    </objects>
+                    <point key="canvasLocation" x="53" y="375"/>
+                  </scene>
+                </scenes>
+              </document>
+      XML
+
       LAUNCHSCREEN_STORYBOARD_CONTENTS = <<-XML.strip_heredoc.freeze
               <?xml version="1.0" encoding="UTF-8" standalone="no"?>
               <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" systemVersion="17A277" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">

data/lib/cocoapods/installer/analyzer.rb

@@ -23,6 +23,11 @@ module Pod
       #
       IOS_64_BIT_ONLY_VERSION = Version.new('11.0')
 
+      # @return [Integer] The Xcode object version until which 64-bit architectures should be manually specified
+      #
+      # Xcode 10 will automatically select the correct architectures based on deployment target
+      IOS_64_BIT_ONLY_PROJECT_VERSION = 50
+
       # @return [Sandbox] The sandbox to use for this analysis.
       #
       attr_reader :sandbox
@@ -436,7 +441,7 @@ module Pod
       # @param  [TargetDefinition] target_definition
       #         the target definition for the user target.
       #
-      # @param  [Array<TargetInspection>] target_inspections
+      # @param  [Hash{TargetDefinition => TargetInspectionResult}] target_inspections
       #         the user target inspections used to construct the aggregate and pod targets.
       #
       # @param  [Array<PodTarget>] pod_targets
@@ -448,16 +453,17 @@ module Pod
       # @return [AggregateTarget]
       #
       def generate_target(target_definition, target_inspections, pod_targets, resolver_specs_by_target)
-        target_requires_64_bit = requires_64_bit_archs?(target_definition.platform)
         if installation_options.integrate_targets?
           target_inspection = target_inspections[target_definition]
           raise "missing inspection: #{target_definition.name}" unless target_inspection
+          target_requires_64_bit = Analyzer.requires_64_bit_archs?(target_definition.platform, target_inspection.project.object_version)
           user_project = target_inspection.project
           client_root = target_inspection.client_root
           user_target_uuids = target_inspection.project_target_uuids
           user_build_configurations = target_inspection.build_configurations
           archs = target_requires_64_bit ? ['$(ARCHS_STANDARD_64_BIT)'] : target_inspection.archs
         else
+          target_requires_64_bit = Analyzer.requires_64_bit_archs?(target_definition.platform, nil)
           user_project = nil
           client_root = config.installation_root.realpath
           user_target_uuids = []
@@ -549,7 +555,7 @@ module Pod
       # @param  [Hash{Podfile::TargetDefinition => Array<ResolvedSpecification>}] resolver_specs_by_target
       #         the resolved specifications grouped by target.
       #
-      # @param  [Array<TargetInspection>] target_inspections
+      # @param  [Hash{TargetDefinition => TargetInspectionResult}] target_inspections
       #         the user target inspections used to construct the aggregate and pod targets.
       #
       # @return [Array<PodTarget>]
@@ -661,7 +667,7 @@ module Pod
       # @param  [Array<TargetDefinition>] target_definitions
       #         the target definitions of the aggregate target
       #
-      # @param  [Array<TargetInspection>] target_inspections
+      # @param  [Hash{TargetDefinition => TargetInspectionResult}] target_inspections
       #         the user target inspections used to construct the aggregate and pod targets.
       #
       # @param  [Array<Specification>] specs
@@ -673,7 +679,8 @@ module Pod
       # @return [PodTarget]
       #
       def generate_pod_target(target_definitions, target_inspections, specs, scope_suffix: nil)
-        target_requires_64_bit = target_definitions.all? { |td| requires_64_bit_archs?(td.platform) }
+        object_version = target_inspections.values.map { |ti| ti.project.object_version }.min
+        target_requires_64_bit = target_definitions.all? { |td| Analyzer.requires_64_bit_archs?(td.platform, object_version) }
         if installation_options.integrate_targets?
           target_inspections = target_inspections.select { |t, _| target_definitions.include?(t) }.values
           user_build_configurations = target_inspections.map(&:build_configurations).reduce({}, &:merge)
@@ -953,22 +960,31 @@ module Pod
         sandbox_state
       end
 
-      # @param  [Platform] platform
-      #         The platform to build against
-      #
-      # @return [Boolean] Whether the platform requires 64-bit architectures
-      #
-      def requires_64_bit_archs?(platform)
-        return false unless platform
-        case platform.name
-        when :osx
-          true
-        when :ios
-          platform.deployment_target >= IOS_64_BIT_ONLY_VERSION
-        when :watchos
-          false
-        when :tvos
-          false
+      class << self
+        # @param  [Platform] platform
+        #         The platform to build against
+        #
+        # @param  [String, Nil] object_version
+        #         The user project's object version, or nil if not available
+        #
+        # @return [Boolean] Whether the platform requires 64-bit architectures
+        #
+        def requires_64_bit_archs?(platform, object_version)
+          return false unless platform
+          case platform.name
+          when :osx
+            true
+          when :ios
+            if (version = object_version)
+              platform.deployment_target >= IOS_64_BIT_ONLY_VERSION && version.to_i < IOS_64_BIT_ONLY_PROJECT_VERSION
+            else
+              platform.deployment_target >= IOS_64_BIT_ONLY_VERSION
+            end
+          when :watchos
+            false
+          when :tvos
+            false
+          end
         end
       end
 

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

@@ -61,7 +61,7 @@ module Pod
             end
 
             Pod::Generator::AppTargetHelper.add_app_host_main_file(project, app_host_target, platform_name, @group, name)
-            Pod::Generator::AppTargetHelper.add_launchscreen_storyboard(project, app_host_target, @group, name) if platform == :ios
+            Pod::Generator::AppTargetHelper.add_launchscreen_storyboard(project, app_host_target, @group, deployment_target, name) if platform == :ios
             additional_entries = platform == :ios ? ADDITIONAL_IOS_INFO_PLIST_ENTRIES : {}
             create_info_plist_file_with_sandbox(sandbox, app_host_info_plist_path, app_host_target, '1.0.0', platform,
                                                 :appl, additional_entries)

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

@@ -126,7 +126,6 @@ module Pod
           # @return [Boolean] Whether the target should build an Info.plist file
           #
           def skip_info_plist?(native_target)
-            return true if target.static_framework?
             existing_setting = native_target.resolved_build_setting('INFOPLIST_FILE', true).values.compact
             !existing_setting.empty?
           end
@@ -665,7 +664,8 @@ module Pod
               linked_path = target.module_map_path
               if path != linked_path
                 linked_path.dirname.mkpath
-                FileUtils.ln_sf(path, linked_path)
+                source = path.relative_path_from(linked_path.dirname)
+                FileUtils.ln_sf(source, linked_path)
               end
 
               relative_path = target.module_map_path.relative_path_from(sandbox.root).to_s

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

@@ -163,7 +163,8 @@ module Pod
               linked_path = target.module_map_path
               if path != linked_path
                 linked_path.dirname.mkpath
-                FileUtils.ln_sf(path, linked_path)
+                source = path.relative_path_from(linked_path.dirname)
+                FileUtils.ln_sf(source, linked_path)
               end
 
               relative_path_string = target.module_map_path.relative_path_from(sandbox.root).to_s
@@ -199,7 +200,8 @@ module Pod
               linked_path = target.umbrella_header_path
               if path != linked_path
                 linked_path.dirname.mkpath
-                FileUtils.ln_sf(path, linked_path)
+                source = path.relative_path_from(linked_path.dirname)
+                FileUtils.ln_sf(source, linked_path)
               end
 
               acl = target.requires_frameworks? ? 'Public' : 'Project'

data/lib/cocoapods/target/build_settings.rb

@@ -512,11 +512,15 @@ module Pod
         define_build_settings_method :frameworks, :memoized => true, :sorted => true, :uniqued => true do
           return [] if (!target.requires_frameworks? || target.static_framework?) && !test_xcconfig?
 
-          frameworks = vendored_dynamic_frameworks.map { |l| File.basename(l, '.framework') }
-          frameworks.concat vendored_static_frameworks.map { |l| File.basename(l, '.framework') } unless test_xcconfig?
-          frameworks.concat consumer_frameworks
-          frameworks.concat dependent_targets.flat_map { |pt| pt.build_settings.dynamic_frameworks_to_import }
-          frameworks.concat dependent_targets.flat_map { |pt| pt.build_settings.static_frameworks_to_import } if test_xcconfig?
+          frameworks = []
+          if test_xcconfig? || (target.should_build? && target.requires_frameworks? && !target.static_framework?)
+            frameworks.concat vendored_static_frameworks.map { |l| File.basename(l, '.framework') }
+          end
+          if test_xcconfig?
+            frameworks.concat consumer_frameworks
+            frameworks.concat vendored_dynamic_frameworks.map { |l| File.basename(l, '.framework') }
+            frameworks.concat dependent_targets.flat_map { |pt| pt.build_settings.frameworks_to_import }
+          end
           frameworks
         end
 
@@ -538,8 +542,7 @@ module Pod
 
         # @return [Array<String>]
         define_build_settings_method :weak_frameworks, :memoized => true do
-          return [] if (!target.requires_frameworks? || target.static_framework?) && !test_xcconfig?
-
+          return [] unless test_xcconfig?
           weak_frameworks = spec_consumers.flat_map(&:weak_frameworks)
           weak_frameworks.concat dependent_targets.flat_map { |pt| pt.build_settings.weak_frameworks_to_import }
           weak_frameworks
@@ -602,15 +605,24 @@ module Pod
         define_build_settings_method :libraries, :memoized => true, :sorted => true, :uniqued => true do
           return [] if (!target.requires_frameworks? || target.static_framework?) && !test_xcconfig?
 
-          libraries = libraries_to_import.dup
-          libraries.concat dependent_targets.flat_map { |pt| pt.build_settings.dynamic_libraries_to_import }
-          libraries.concat dependent_targets.flat_map { |pt| pt.build_settings.static_libraries_to_import } if 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 libraries_to_import
+          end
+          if test_xcconfig?
+            libraries.concat dependent_targets.flat_map { |pt| pt.build_settings.dynamic_libraries_to_import }
+            libraries.concat dependent_targets.flat_map { |pt| pt.build_settings.static_libraries_to_import }
+          end
           libraries
         end
 
         # @return [Array<String>]
         define_build_settings_method :static_libraries_to_import, :memoized => true do
-          static_libraries_to_import = vendored_static_libraries.map { |l| File.basename(l, l.extname).sub(/\Alib/, '') }
+          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/, '') }
+          end
           static_libraries_to_import << target.product_basename if target.should_build? && !target.requires_frameworks?
           static_libraries_to_import
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.6.0.beta.2
+  version: 1.6.0.rc.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2019-01-24 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.beta.2
+        version: 1.6.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0.beta.2
+        version: 1.6.0.rc.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +207,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -217,7 +217,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -275,14 +275,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: gh_inspector
   requirement: !ruby/object:Gem::Requirement
@@ -534,7 +534,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 3
 summary: The Cocoa library package manager.