cocoapods-packing-cubes 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef6e4802dc5a9c6a4dc05b9a3ae063be59b3a8e61738d97da97b13462f7b7893
-  data.tar.gz: 73980c7c5a5e5f2ab0b5f015b37966c071056fec25937d5da043cca6bfaa8304
+  metadata.gz: 37b1756cf73aa013fc264aaa924365337be1d7246da4c7edacb6990040f02607
+  data.tar.gz: 436c333a1cd15abf7d12a925315cf3230e8f5d462c1e7ad6e52673a2a549e087
 SHA512:
-  metadata.gz: be490650b38e592becc59e7b858bb1a311a08b9db04782152282e47d2b3920ca072827419bbf749a6432f9746622413d75d07da2333cd82f08e7b5d4ffe66fa0
-  data.tar.gz: 18263c3bf2b02e95b070588e438617c7a2d175be61f43aa3f27abea66f2edc647ad1a703fc30c768280e4f34915fbc6bc8ce43d3f11e0f841ad3af6d27b3cfe2
+  metadata.gz: b6074a44d1d35cecb29818494623f37bea65b2e6085296b846e793d76a89e41065923d531b15de59ba80106d6896f68d06423a9e9595d38c8c93df4b4893aa1a
+  data.tar.gz: f4e1a45665a4810b73b63f7d090213e29f0ce29316acb86e32527166a6af932b77fab9886ee5f96245d64ab94441373e8546075f4efc4e8c6336119fe406fe61

data/lib/cocoapods_packing_cubes.rb

@@ -1,59 +1,19 @@
 # frozen_string_literal: true
 
 module CocoaPodsPackingCubes
-  if defined?(::Pod::Target::Type)
-    Type = ::Pod::Target::Type
-    NATIVE_TYPE_SUPPORT = true
-  else
-    class Type
-      def initialize(linkage: :static, packaging: :library)
-        @linkage = linkage
-        @packaging = packaging
-
-        case [linkage, packaging]
-        when %i[static library], %i[static framework], %i[dynamic framework]
-          # ok
-          nil
-        else
-          raise ::Pod::Informative, "Unsupported target build type: #{inspect}"
-        end
-      end
-
-      attr_reader :linkage, :packaging
-      protected :linkage, :packaging
-
-      def ==(other)
-        linkage == other.linkage &&
-          packaging == other.packaging
-      end
-      alias eql? ==
-
-      def hash
-        linkage.hash ^ packaging.hash
-      end
-
-      %i[static dynamic].each_with_index do |linkage, index|
-        define_method("#{linkage}?") { linkage == @linkage }
-        %i[library framework].each do |packaging|
-          if index.zero?
-            define_method("#{packaging}?") { packaging == @packaging }
-          end
-
-          define_method("#{linkage}_#{packaging}?") do
-            linkage == @linkage && packaging == @packaging
-          end
-        end
-      end
+  def self.warn_for_outdated_cocoapods
+    @warn_for_outdated_cocoapods ||= begin
+      Pod::UI.warn '[cocoapods-packing-cubes] Pod::Target::BuildType must be defined, either:',
+                   ['Update to CocoaPods master or 1.6.0+', 'Downgrade to packing cubes < 0.3']
+      true
     end
-    NATIVE_TYPE_SUPPORT = false
   end
 
   module PodTargetMixin
-    attr_reader :type
-
     def initialize(*)
       super
 
+      return CocoaPodsPackingCubes.warn_for_outdated_cocoapods unless defined?(::Pod::Target::BuildType) && !packing_cube.empty?
       compute_packing_cube_override_type
       compute_packing_cube_override_defines_module
     end
@@ -65,36 +25,18 @@ module CocoaPodsPackingCubes
     end
 
     def compute_packing_cube_override_type
-      packaging = packing_cube.fetch('packaging') do
-        host_requires_frameworks? ? :framework : :library
-      end.to_sym
-      linkage = packing_cube.fetch('linkage') do
-        !host_requires_frameworks? || root_spec.static_framework ? :static : :dynamic
-      end.to_sym
+      return if packing_cube.empty?
+
+      linkage = packing_cube.fetch('linkage') { build_type.linkage }.to_sym
+      packaging = packing_cube.fetch('packaging') { build_type.packaging }.to_sym
 
-      @type = ::CocoaPodsPackingCubes::Type.new(linkage: linkage, packaging: packaging)
+      @build_type = ::Pod::Target::BuildType.new(linkage: linkage, packaging: packaging)
     end
 
     def compute_packing_cube_override_defines_module
       return unless packing_cube.key?('defines_module')
-      @defines_module = packing_cube['defines_module']
-    end
-
-    def static_framework?
-      type.static_framework?
-    end
 
-    def requires_frameworks?
-      # HACK: needed because CocoaPods, pre-introduction of the `type` type/attr,
-      # would check #requires_frameworks? instead of #host_requires_frameworks?
-      # for finding the PodTarget to set as a dependency of another PodTarget.
-      if !::CocoaPodsPackingCubes::NATIVE_TYPE_SUPPORT && !packing_cube.empty? &&
-         caller_locations(1, 2).any? { |l| l.base_label == 'filter_dependencies' }
-
-        return super
-      end
-
-      type.framework?
+      @defines_module = packing_cube['defines_module']
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-packing-cubes
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Samuel Giddins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A CocoaPods plugin that allows customizing how individual pods are packaged