cocoapods 1.6.2 → 1.7.0.beta.1

data/lib/cocoapods/user_interface.rb

@@ -397,9 +397,9 @@ module Pod
 
       # @return [String] Wraps a string taking into account the width of the
       # terminal and an option indent. Adapted from
-      # http://blog.macromates.com/2006/wrapping-text-with-regular-expressions/
+      # https://macromates.com/blog/2006/wrapping-text-with-regular-expressions/
       #
-      # @param [String] txt     The string to wrap
+      # @param [String] string  The string to wrap
       #
       # @param [String] indent  The string to use to indent the result.
       #

data/lib/cocoapods/user_interface/error_report.rb

@@ -117,6 +117,9 @@ EOS
           inspector = GhInspector::Inspector.new 'cocoapods', 'cocoapods'
           message_delegate = UserInterface::InspectorReporter.new
           inspector.search_exception exception, message_delegate
+        rescue => e
+          warn "Searching for inspections failed: #{e}"
+          nil
         end
 
         private

data/lib/cocoapods/user_interface/inspector_reporter.rb

@@ -84,7 +84,7 @@ module Pod
         UI.puts ''
       end
 
-      # Taken from http://stackoverflow.com/questions/195740/how-do-you-do-relative-time-in-rails
+      # Taken from https://stackoverflow.com/questions/195740/how-do-you-do-relative-time-in-rails
       def pretty_date(date_string)
         date = Time.parse(date_string)
         a = (Time.now - date).to_i

data/lib/cocoapods/validator.rb

@@ -16,7 +16,7 @@ module Pod
 
     # The default version of Swift to use when linting pods
     #
-    DEFAULT_SWIFT_VERSION = '3.2'.freeze
+    DEFAULT_SWIFT_VERSION = '4.0'.freeze
 
     # The valid platforms for linting
     #
@@ -125,6 +125,7 @@ module Pod
       $stdout.flush
 
       perform_linting
+      warn_for_dot_swift_file_deprecation
       perform_extensive_analysis(a_spec) if a_spec && !quick
 
       UI.puts ' -> '.send(result_color) << (a_spec ? a_spec.to_s : file.basename.to_s)
@@ -298,22 +299,12 @@ module Pod
       @validation_dir ||= Pathname(Dir.mktmpdir(['CocoaPods-Lint-', "-#{spec.name}"]))
     end
 
-    # @return [String] the SWIFT_VERSION to use for validation.
+    # @return [String] The SWIFT_VERSION that should be used to validate the pod. This is set by passing the
+    # `--swift-version` parameter during validation.
     #
-    def swift_version
-      return @swift_version unless @swift_version.nil?
-      if (version = spec.swift_version) || (version = dot_swift_version)
-        @swift_version = version.to_s
-      else
-        DEFAULT_SWIFT_VERSION
-      end
-    end
-
-    # Set the SWIFT_VERSION that should be used to validate the pod.
-    #
-    attr_writer :swift_version
+    attr_accessor :swift_version
 
-    # @return [String] the SWIFT_VERSION in the .swift-version file or nil.
+    # @return [String] the SWIFT_VERSION within the .swift-version file or nil.
     #
     def dot_swift_version
       return unless file
@@ -322,6 +313,24 @@ module Pod
       swift_version_path.read.strip
     end
 
+    # @return [String] The derived Swift version to use for validation. The order of precedence is as follows:
+    #         - The `--swift-version` parameter is always checked first and honored if passed.
+    #         - The `swift_versions` DSL attribute within the podspec, in which case the latest version is always chosen.
+    #         - The Swift version within the `.swift-version` file if present.
+    #         - If none of the above are set then the `#DEFAULT_SWIFT_VERSION` is used.
+    #
+    def derived_swift_version
+      @derived_swift_version ||= begin
+        if !swift_version.nil?
+          swift_version
+        elsif version = spec.swift_versions.max || dot_swift_version
+          version.to_s
+        else
+          DEFAULT_SWIFT_VERSION
+        end
+      end
+    end
+
     # @return [Boolean] Whether any of the pod targets part of this validator use Swift or not.
     #
     def uses_swift?
@@ -341,6 +350,17 @@ module Pod
       @results.concat(linter.results.to_a)
     end
 
+    # Warns the user to delete the `.swift-version` file in favor of the `swift_versions` DSL attribute. This is
+    # intentionally not a lint warning since we do not want to break existing setups and instead just soft deprecate
+    # this slowly.
+    #
+    def warn_for_dot_swift_file_deprecation
+      if swift_version.nil? && (!spec.nil? && spec.swift_versions.empty?) && !dot_swift_version.nil?
+        UI.warn 'Usage of the `.swift_version` file has been deprecated! Please delete the file and use the ' \
+          "`swift_versions` attribute within your podspec instead.\n".yellow
+      end
+    end
+
     # Perform analysis for a given spec (or subspec)
     #
     def perform_extensive_analysis(spec)
@@ -447,43 +467,45 @@ module Pod
       return if spec.source.nil? || spec.source[:http].nil?
       url = URI(spec.source[:http])
       return if url.scheme == 'https' || url.scheme == 'file'
-      warning('http', "The URL (`#{url}`) doesn't use the encrypted HTTPs protocol. " \
+      warning('http', "The URL (`#{url}`) doesn't use the encrypted HTTPS protocol. " \
               'It is crucial for Pods to be transferred over a secure protocol to protect your users from man-in-the-middle attacks. '\
               'This will be an error in future releases. Please update the URL to use https.')
     end
 
-    # Performs validation for which version of Swift is used during validation.
+    # Performs validation for the version of Swift used during validation.
     #
-    # An error will be displayed if the user has provided a `swift_version` attribute within the podspec but is also
-    # using either  `--swift-version` parameter or a `.swift-version with a different Swift version.
+    # An error will be displayed if the user has provided a `swift_versions` attribute within the podspec but is also
+    # using either `--swift-version` parameter or a `.swift-version` file with a Swift version that is not declared
+    # within the attribute.
     #
     # The user will be warned that the default version of Swift was used if the following things are true:
     #   - The project uses Swift at all
     #   - The user did not supply a Swift version via a parameter
-    #   - There is no `swift_version` attribute set within the specification
+    #   - There is no `swift_versions` attribute set within the specification
     #   - There is no `.swift-version` file present either.
     #
     def validate_swift_version
       return unless uses_swift?
-      spec_swift_version = spec.swift_version
-      unless spec_swift_version.nil?
+      spec_swift_versions = spec.swift_versions.map(&:to_s)
+      unless spec_swift_versions.empty?
         message = nil
-        if !dot_swift_version.nil? && dot_swift_version != spec_swift_version.to_s
-          message = "Specification `#{spec.name}` specifies an inconsistent `swift_version` (`#{spec_swift_version}`) compared to the one present in your `.swift-version` file (`#{dot_swift_version}`). " \
-                    'Please remove the `.swift-version` file which is now deprecated and only use the `swift_version` attribute within your podspec.'
-        elsif !@swift_version.nil? && @swift_version != spec_swift_version.to_s
-          message = "Specification `#{spec.name}` specifies an inconsistent `swift_version` (`#{spec_swift_version}`) compared to the one passed during lint (`#{@swift_version}`)."
+        if !dot_swift_version.nil? && !spec_swift_versions.include?(dot_swift_version)
+          message = "Specification `#{spec.name}` specifies inconsistent `swift_versions` (#{spec_swift_versions.map { |s| "`#{s}`" }.to_sentence}) compared to the one present in your `.swift-version` file (`#{dot_swift_version}`). " \
+                    'Please remove the `.swift-version` file which is now deprecated and only use the `swift_versions` attribute within your podspec.'
+        elsif !swift_version.nil? && !spec_swift_versions.include?(swift_version)
+          message = "Specification `#{spec.name}` specifies inconsistent `swift_versions` (#{spec_swift_versions.map { |s| "`#{s}`" }.to_sentence}) compared to the one passed during lint (`#{swift_version}`)."
         end
         unless message.nil?
           error('swift', message)
           return
         end
       end
-      if @swift_version.nil? && spec_swift_version.nil? && dot_swift_version.nil?
+
+      if swift_version.nil? && spec_swift_versions.empty? && dot_swift_version.nil?
         warning('swift',
                 'The validator used ' \
-                "Swift #{DEFAULT_SWIFT_VERSION} by default because no Swift version was specified. " \
-                'To specify a Swift version during validation, add the `swift_version` attribute in your podspec. ' \
+                "Swift `#{DEFAULT_SWIFT_VERSION}` by default because no Swift version was specified. " \
+                'To specify a Swift version during validation, add the `swift_versions` attribute in your podspec. ' \
                 'Note that usage of the `--swift-version` parameter or a `.swift-version` file is now deprecated.')
       end
     end
@@ -524,7 +546,7 @@ module Pod
     def create_app_project
       app_project = Xcodeproj::Project.new(validation_dir + 'App.xcodeproj')
       app_target = Pod::Generator::AppTargetHelper.add_app_target(app_project, consumer.platform_name, deployment_target)
-      Pod::Generator::AppTargetHelper.add_swift_version(app_target, swift_version)
+      Pod::Generator::AppTargetHelper.add_swift_version(app_target, derived_swift_version)
       app_project.save
       app_project.recreate_user_schemes
     end
@@ -532,7 +554,7 @@ module Pod
     def add_app_project_import
       app_project = Xcodeproj::Project.open(validation_dir + 'App.xcodeproj')
       app_target = app_project.targets.first
-      pod_target = @installer.pod_targets.find { |pt| pt.pod_name == spec.root.name }
+      pod_target = validation_pod_target
       Pod::Generator::AppTargetHelper.add_app_project_import(app_project, app_target, pod_target, consumer.platform_name)
       Pod::Generator::AppTargetHelper.add_xctest_search_paths(app_target) if @installer.pod_targets.any? { |pt| pt.spec_consumers.any? { |c| c.frameworks.include?('XCTest') } }
       Pod::Generator::AppTargetHelper.add_empty_swift_file(app_project, app_target) if @installer.pod_targets.any?(&:uses_swift?)
@@ -542,6 +564,12 @@ module Pod
       Xcodeproj::XCScheme.share_scheme(@installer.pods_project.path, pod_target.label) if shares_pod_target_xcscheme?(pod_target)
     end
 
+    # Returns the pod target for the pod being validated. Installation must have occurred before this can be invoked.
+    #
+    def validation_pod_target
+      @installer.pod_targets.find { |pt| pt.pod_name == spec.root.name }
+    end
+
     # It creates a podfile in memory and builds a library containing the pod
     # for all available platforms with xcodebuild.
     #
@@ -560,11 +588,19 @@ module Pod
         native_target = pod_target_installation_result.native_target
         native_target.build_configuration_list.build_configurations.each do |build_configuration|
           (build_configuration.build_settings['OTHER_CFLAGS'] ||= '$(inherited)') << ' -Wincomplete-umbrella'
-          build_configuration.build_settings['SWIFT_VERSION'] = (pod_target.swift_version || swift_version) if pod_target.uses_swift?
+          if pod_target.uses_swift?
+            # The Swift version for the target being validated can be overridden by `--swift-version` or the
+            # `.swift-version` file so we always use the derived Swift version. For dependencies, we always use the
+            # Swift version they specify, unless they don't in which case it will be inferred by the target that is
+            # integrating them.
+            swift_version = pod_target == validation_pod_target ? derived_swift_version : pod_target.swift_version
+            build_configuration.build_settings['SWIFT_VERSION'] = swift_version
+          end
         end
-        pod_target_installation_result.test_specs_by_native_target.each do |test_native_target, test_specs|
-          if pod_target.uses_swift_for_test_spec?(test_specs.first)
+        pod_target_installation_result.test_specs_by_native_target.each do |test_native_target, test_spec|
+          if pod_target.uses_swift_for_spec?(test_spec)
             test_native_target.build_configuration_list.build_configurations.each do |build_configuration|
+              swift_version = pod_target == validation_pod_target ? derived_swift_version : pod_target.swift_version
               build_configuration.build_settings['SWIFT_VERSION'] = swift_version
             end
           end
@@ -606,8 +642,7 @@ module Pod
       else
         UI.message "\nBuilding with `xcodebuild`.\n".yellow do
           scheme = if skip_import_validation?
-                     pod_target = @installer.pod_targets.find { |pt| pt.pod_name == spec.root.name }
-                     pod_target.label if pod_target.should_build?
+                     validation_pod_target.label if validation_pod_target.should_build?
                    else
                      'App'
                    end
@@ -634,7 +669,7 @@ module Pod
         UI.warn "Skipping test validation with `xcodebuild` because it can't be found.\n".yellow
       else
         UI.message "\nTesting with `xcodebuild`.\n".yellow do
-          pod_target = @installer.pod_targets.find { |pt| pt.pod_name == spec.root.name }
+          pod_target = validation_pod_target
           consumer.spec.test_specs.each do |test_spec|
             if !test_spec.supported_on_platform?(consumer.platform_name)
               UI.warn "Skipping test spec `#{test_spec.name}` on platform `#{consumer.platform_name}` since it is not supported.\n".yellow
@@ -971,7 +1006,7 @@ module Pod
     # @param  [Platform] platform
     #         The platform to check
     #
-    # @param  [Specification] specification
+    # @param  [Specification] spec
     #         The specification which must support the provided platform
     #
     # @return [Bool] Whether the platform is supported by the specification

data/lib/cocoapods/version_metadata.rb

@@ -0,0 +1,7 @@
+module Pod
+  module VersionMetadata
+    def self.gem_version
+      Pod::VERSION
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0.beta.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-02-22 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.2
+        version: 1.7.0.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.7.0.beta.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -63,7 +63,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -419,6 +419,7 @@ files:
 - lib/cocoapods/command/outdated.rb
 - lib/cocoapods/command/repo.rb
 - lib/cocoapods/command/repo/add.rb
+- lib/cocoapods/command/repo/add_cdn.rb
 - lib/cocoapods/command/repo/lint.rb
 - lib/cocoapods/command/repo/list.rb
 - lib/cocoapods/command/repo/push.rb
@@ -455,6 +456,7 @@ files:
 - lib/cocoapods/generator/copy_resources_script.rb
 - lib/cocoapods/generator/dummy_source.rb
 - lib/cocoapods/generator/embed_frameworks_script.rb
+- lib/cocoapods/generator/file_list.rb
 - lib/cocoapods/generator/header.rb
 - lib/cocoapods/generator/info_plist_file.rb
 - lib/cocoapods/generator/module_map.rb
@@ -478,22 +480,42 @@ files:
 - lib/cocoapods/installer/podfile_validator.rb
 - lib/cocoapods/installer/post_install_hooks_context.rb
 - lib/cocoapods/installer/pre_install_hooks_context.rb
+- lib/cocoapods/installer/project_cache/project_cache.rb
+- lib/cocoapods/installer/project_cache/project_cache_analysis_result.rb
+- lib/cocoapods/installer/project_cache/project_cache_analyzer.rb
+- lib/cocoapods/installer/project_cache/project_cache_version.rb
+- lib/cocoapods/installer/project_cache/project_installation_cache.rb
+- lib/cocoapods/installer/project_cache/project_metadata_cache.rb
+- lib/cocoapods/installer/project_cache/target_cache_key.rb
+- lib/cocoapods/installer/project_cache/target_metadata.rb
+- lib/cocoapods/installer/sandbox_dir_cleaner.rb
+- lib/cocoapods/installer/sandbox_header_paths_installer.rb
 - lib/cocoapods/installer/source_provider_hooks_context.rb
+- lib/cocoapods/installer/target_uuid_generator.rb
 - lib/cocoapods/installer/user_project_integrator.rb
 - lib/cocoapods/installer/user_project_integrator/target_integrator.rb
 - lib/cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator.rb
 - lib/cocoapods/installer/xcode.rb
+- lib/cocoapods/installer/xcode/multi_pods_project_generator.rb
 - lib/cocoapods/installer/xcode/pods_project_generator.rb
+- lib/cocoapods/installer/xcode/pods_project_generator/aggregate_target_dependency_installer.rb
 - lib/cocoapods/installer/xcode/pods_project_generator/aggregate_target_installer.rb
 - lib/cocoapods/installer/xcode/pods_project_generator/app_host_installer.rb
 - lib/cocoapods/installer/xcode/pods_project_generator/file_references_installer.rb
+- lib/cocoapods/installer/xcode/pods_project_generator/pod_target_dependency_installer.rb
 - lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb
 - lib/cocoapods/installer/xcode/pods_project_generator/pod_target_integrator.rb
+- lib/cocoapods/installer/xcode/pods_project_generator/pods_project_writer.rb
+- lib/cocoapods/installer/xcode/pods_project_generator/project_generator.rb
 - lib/cocoapods/installer/xcode/pods_project_generator/target_installation_result.rb
 - lib/cocoapods/installer/xcode/pods_project_generator/target_installer.rb
 - lib/cocoapods/installer/xcode/pods_project_generator/target_installer_helper.rb
+- lib/cocoapods/installer/xcode/pods_project_generator_result.rb
+- lib/cocoapods/installer/xcode/single_pods_project_generator.rb
 - lib/cocoapods/installer/xcode/target_validator.rb
+- lib/cocoapods/native_target_extension.rb
 - lib/cocoapods/open-uri.rb
+- lib/cocoapods/podfile.rb
 - lib/cocoapods/project.rb
 - lib/cocoapods/resolver.rb
 - lib/cocoapods/resolver/lazy_specification.rb
@@ -508,12 +530,14 @@ files:
 - lib/cocoapods/target.rb
 - lib/cocoapods/target/aggregate_target.rb
 - lib/cocoapods/target/build_settings.rb
+- lib/cocoapods/target/build_type.rb
 - lib/cocoapods/target/framework_paths.rb
 - lib/cocoapods/target/pod_target.rb
 - lib/cocoapods/user_interface.rb
 - lib/cocoapods/user_interface/error_report.rb
 - lib/cocoapods/user_interface/inspector_reporter.rb
 - lib/cocoapods/validator.rb
+- lib/cocoapods/version_metadata.rb
 homepage: https://github.com/CocoaPods/CocoaPods
 licenses:
 - MIT