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

data/lib/cocoapods/target/framework_paths.rb

@@ -0,0 +1,36 @@
+module Pod
+  class Target
+    class FrameworkPaths
+      # @return [String] the path to the .framework
+      #
+      attr_reader :source_path
+
+      # @return [String, Nil] the dSYM path, if one exists
+      #
+      attr_reader :dsym_path
+
+      def initialize(source_path, dsym_path = nil)
+        @source_path = source_path
+        @dsym_path = dsym_path
+      end
+
+      def ==(other)
+        if other.class == self.class
+          other.source_path == @source_path && other.dsym_path == @dsym_path
+        else
+          false
+        end
+      end
+
+      alias eql? ==
+
+      def hash
+        if (dsym = dsym_path)
+          [source_path, dsym].hash
+        else
+          source_path.hash
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/target/pod_target.rb

@@ -1,3 +1,5 @@
+require 'cocoapods/target/framework_paths'
+
 module Pod
   # Stores the information relative to the target used to compile a single Pod.
   # A pod can have one or more activated spec, subspecs and test specs.
@@ -244,34 +246,27 @@ module Pod
       !test_specs.empty?
     end
 
-    # @return [Hash{String=>Array<Hash{Symbol=>String}>}] The vendored and non vendored framework paths this target
+    # @return [Hash{String=>Array<FrameworkPaths>}] The vendored and non vendored framework paths this target
     #         depends upon keyed by spec name. For the root spec and subspecs the framework path of the target itself
     #         is included.
     #
     def framework_paths
       @framework_paths ||= begin
         file_accessors.each_with_object({}) do |file_accessor, hash|
-          frameworks = []
-          file_accessor.vendored_dynamic_artifacts.map do |framework_path|
+          frameworks = file_accessor.vendored_dynamic_artifacts.map do |framework_path|
             relative_path_to_sandbox = framework_path.relative_path_from(sandbox.root)
-            framework = { :name => framework_path.basename.to_s,
-                          :input_path => "${PODS_ROOT}/#{relative_path_to_sandbox}",
-                          :output_path => "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{framework_path.basename}" }
+            framework_source = "${PODS_ROOT}/#{relative_path_to_sandbox}"
             # Until this can be configured, assume the dSYM file uses the file name as the framework.
             # See https://github.com/CocoaPods/CocoaPods/issues/1698
             dsym_name = "#{framework_path.basename}.dSYM"
             dsym_path = Pathname.new("#{framework_path.dirname}/#{dsym_name}")
-            if dsym_path.exist?
-              framework[:dsym_name] = dsym_name
-              framework[:dsym_input_path] = "${PODS_ROOT}/#{relative_path_to_sandbox}.dSYM"
-              framework[:dsym_output_path] = "${DWARF_DSYM_FOLDER_PATH}/#{dsym_name}"
-            end
-            frameworks << framework
+            dsym_source = if dsym_path.exist?
+                            "${PODS_ROOT}/#{relative_path_to_sandbox}.dSYM"
+                          end
+            FrameworkPaths.new(framework_source, dsym_source)
           end
           if !file_accessor.spec.test_specification? && should_build? && requires_frameworks? && !static_framework?
-            frameworks << { :name => product_name,
-                            :input_path => build_product_path('${BUILT_PRODUCTS_DIR}'),
-                            :output_path => "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{product_name}" }
+            frameworks << FrameworkPaths.new(build_product_path('${BUILT_PRODUCTS_DIR}'))
           end
           hash[file_accessor.spec.name] = frameworks
         end
@@ -517,11 +512,15 @@ module Pod
     # @param [Boolean] include_dependent_targets_for_test_spec
     #        whether to include header search paths for test dependent targets
     #
+    # @param [Boolean] include_private_headers
+    #        whether to include header search paths for private headers of this
+    #        target
+    #
     # @return [Array<String>] The set of header search paths this target uses.
     #
-    def header_search_paths(include_dependent_targets_for_test_spec: nil)
+    def header_search_paths(include_dependent_targets_for_test_spec: nil, include_private_headers: true)
       header_search_paths = []
-      header_search_paths.concat(build_headers.search_paths(platform, nil, false))
+      header_search_paths.concat(build_headers.search_paths(platform, nil, false)) if include_private_headers
       header_search_paths.concat(sandbox.public_headers.search_paths(platform, pod_name, uses_modular_headers?))
       dependent_targets = recursive_dependent_targets
       dependent_targets += recursive_test_dependent_targets(include_dependent_targets_for_test_spec) if include_dependent_targets_for_test_spec

data/lib/cocoapods/validator.rb

@@ -511,7 +511,8 @@ module Pod
     end
 
     def download_pod
-      podfile = podfile_from_spec(consumer.platform_name, deployment_target, use_frameworks, consumer.spec.test_specs.map(&:name), use_modular_headers)
+      test_spec_names = consumer.spec.test_specs.select { |ts| ts.supported_on_platform?(consumer.platform_name) }.map(&:name)
+      podfile = podfile_from_spec(consumer.platform_name, deployment_target, use_frameworks, test_spec_names, use_modular_headers)
       sandbox = Sandbox.new(config.sandbox_root)
       @installer = Installer.new(sandbox, podfile)
       @installer.use_default_plugins = false
@@ -635,10 +636,14 @@ module Pod
         UI.message "\nTesting with `xcodebuild`.\n".yellow do
           pod_target = @installer.pod_targets.find { |pt| pt.pod_name == spec.root.name }
           consumer.spec.test_specs.each do |test_spec|
-            scheme = @installer.target_installation_results.first[pod_target.name].native_target_for_spec(test_spec)
-            output = xcodebuild('test', scheme, 'Debug')
-            parsed_output = parse_xcodebuild_output(output)
-            translate_output_to_linter_messages(parsed_output)
+            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
+            else
+              scheme = @installer.target_installation_results.first[pod_target.name].native_target_for_spec(test_spec)
+              output = xcodebuild('test', scheme, 'Debug')
+              parsed_output = parse_xcodebuild_output(output)
+              translate_output_to_linter_messages(parsed_output)
+            end
           end
         end
       end
@@ -916,6 +921,14 @@ module Pod
       when :ios
         command += %w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator)
         command += Fourflusher::SimControl.new.destination(:oldest, 'iOS', deployment_target)
+        xcconfig = consumer.pod_target_xcconfig
+        if xcconfig
+          archs = xcconfig['VALID_ARCHS']
+          if archs && (archs.include? 'armv7') && !(archs.include? 'i386') && (archs.include? 'x86_64')
+            # Prevent Xcodebuild from testing the non-existent i386 simulator if armv7 is specified without i386
+            command += %w(ARCHS=x86_64)
+          end
+        end
       when :watchos
         command += %w(CODE_SIGN_IDENTITY=- -sdk watchsimulator)
         command += Fourflusher::SimControl.new.destination(:oldest, 'watchOS', deployment_target)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.6.0.beta.1
+  version: 1.6.0.beta.2
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-16 00:00:00.000000000 Z
+date: 2018-10-17 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.1
+        version: 1.6.0.beta.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0.beta.1
+        version: 1.6.0.beta.2
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +73,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -207,7 +207,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -217,7 +217,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -317,14 +317,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
@@ -491,6 +497,7 @@ files:
 - lib/cocoapods/project.rb
 - lib/cocoapods/resolver.rb
 - lib/cocoapods/resolver/lazy_specification.rb
+- lib/cocoapods/resolver/resolver_specification.rb
 - lib/cocoapods/sandbox.rb
 - lib/cocoapods/sandbox/file_accessor.rb
 - lib/cocoapods/sandbox/headers_store.rb
@@ -501,6 +508,7 @@ files:
 - lib/cocoapods/target.rb
 - lib/cocoapods/target/aggregate_target.rb
 - lib/cocoapods/target/build_settings.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