cocoapods 1.8.4 → 1.9.0.beta.1

data/lib/cocoapods/user_interface/error_report.rb

@@ -175,10 +175,8 @@ EOS
             if source.is_a?(Pod::CDNSource)
               "#{repo.basename} - CDN - #{source.url}"
             elsif source.git?
-              Dir.chdir(repo) do
-                sha = `git rev-parse HEAD 2>&1`.strip
-                "#{repo.basename} - git - #{source.url} @ #{sha}"
-              end
+              sha = git_hash(source)
+              "#{repo.basename} - git - #{source.url} @ #{sha}"
             else
               "#{repo.basename} - #{source.type}"
             end
@@ -188,6 +186,18 @@ EOS
         def original_command
           "#{$PROGRAM_NAME} #{ARGV.join(' ')}"
         end
+
+        private
+
+        # @param [Source] source
+        #        a git source
+        #
+        # @return [String] the current git SHA
+        def git_hash(source)
+          Dir.chdir(source.repo) do
+            `git rev-parse HEAD 2>&1`
+          end
+        end
       end
     end
   end

data/lib/cocoapods/validator.rb

@@ -39,6 +39,7 @@ module Pod
     #         the platforms to lint.
     #
     def initialize(spec_or_path, source_urls, platforms = [])
+      @use_frameworks = true
       @linter = Specification::Linter.new(spec_or_path)
       @source_urls = if @linter.spec && @linter.spec.dependencies.empty? && @linter.spec.recursive_subspecs.all? { |s| s.dependencies.empty? }
                        []
@@ -57,6 +58,7 @@ module Pod
         end
         result
       end
+      @use_frameworks = true
     end
 
     #-------------------------------------------------------------------------#

data/lib/cocoapods/xcode.rb

@@ -0,0 +1,7 @@
+module Pod
+  module Xcode
+    autoload :LinkageAnalyzer, 'cocoapods/xcode/linkage_analyzer'
+    autoload :XCFramework, 'cocoapods/xcode/xcframework'
+    autoload :FrameworkPaths, 'cocoapods/xcode/framework_paths'
+  end
+end

data/lib/cocoapods/{target → xcode}/framework_paths.rb

@@ -1,5 +1,5 @@
 module Pod
-  class Target
+  module Xcode
     class FrameworkPaths
       # @return [String] the path to the .framework
       #
@@ -36,6 +36,19 @@ module Pod
       def all_paths
         [source_path, dsym_path, bcsymbolmap_paths].flatten.compact
       end
+
+      # @param [Pathname] path the path to the `.framework` bundle
+      #
+      # @return [FrameworkPaths] the path of the framework with dsym & bcsymbolmap paths, if found
+      #
+      def self.from_path(path)
+        dsym_name = "#{path.basename}.dSYM"
+        dsym_path = Pathname.new("#{path.dirname}/#{dsym_name}")
+        dsym_path = nil unless dsym_path.exist?
+        bcsymbolmap_paths = Pathname.glob(path.dirname, '*.bcsymbolmap')
+
+        FrameworkPaths.new(path, dsym_path, bcsymbolmap_paths)
+      end
     end
   end
 end

data/lib/cocoapods/xcode/linkage_analyzer.rb

@@ -0,0 +1,22 @@
+require 'macho'
+
+module Pod
+  module Xcode
+    class LinkageAnalyzer
+      # @param  [Pathname] binary
+      #         The file to be checked for being a dynamic Mach-O binary.
+      #
+      # @return [Boolean] Whether `binary` can be dynamically linked.
+      #
+      def self.dynamic_binary?(binary)
+        @cached_dynamic_binary_results ||= {}
+        return @cached_dynamic_binary_results[binary] unless @cached_dynamic_binary_results[binary].nil?
+        return false unless binary.file?
+
+        @cached_dynamic_binary_results[binary] = MachO.open(binary).dylib?
+      rescue MachO::MachOError
+        @cached_dynamic_binary_results[binary] = false
+      end
+    end
+  end
+end

data/lib/cocoapods/xcode/xcframework.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require 'cocoapods/xcode/xcframework/xcframework_slice'
+
+module Pod
+  module Xcode
+    class XCFramework
+      # @return [Pathname] path the path to the .xcframework on disk
+      #
+      attr_reader :path
+
+      # @return [Pod::Version] the format version of the .xcframework
+      #
+      attr_reader :format_version
+
+      # @return [Array<XCFramework::Slice>] the slices contained inside this .xcframework
+      #
+      attr_reader :slices
+
+      # @return [Hash] the contents of the parsed plist
+      #
+      attr_reader :plist
+
+      # Initializes an XCFramework instance with a path on disk
+      #
+      # @param [Pathname, String] path
+      #        The path to the .xcframework on disk
+      #
+      # @return [XCFramework] the xcframework at the given path
+      #
+      def initialize(path)
+        @path = Pathname.new(path).tap do |p|
+          raise 'Absolute path is required' unless p.absolute?
+        end
+
+        @plist = Xcodeproj::Plist.read_from_path(plist_path)
+        parse_plist_contents
+      end
+
+      # @return [Pathname] the path to the Info.plist
+      #
+      def plist_path
+        path + 'Info.plist'
+      end
+
+      # @return [String] the basename of the framework
+      #
+      def name
+        File.basename(path, '.xcframework')
+      end
+
+      # @return [Boolean] true if any slices use dynamic linkage
+      #
+      def includes_dynamic_slices?
+        slices.any? { |slice| Xcode::LinkageAnalyzer.dynamic_binary?(slice.binary_path) }
+      end
+
+      # @return [Boolean] true if any slices use dynamic linkage
+      #
+      def includes_static_slices?
+        slices.any? { |slice| !Xcode::LinkageAnalyzer.dynamic_binary?(slice.binary_path) }
+      end
+
+      private
+
+      def parse_plist_contents
+        @format_version = Pod::Version.new(plist['XCFrameworkFormatVersion'])
+        @slices = plist['AvailableLibraries'].map do |library|
+          identifier = library['LibraryIdentifier']
+          relative_path = library['LibraryPath']
+          archs = library['SupportedArchitectures']
+          platform_name = library['SupportedPlatform']
+          platform_variant = library['SupportedPlatformVariant']
+
+          slice_path = path.join(identifier).join(relative_path)
+          XCFramework::Slice.new(slice_path, identifier, archs, platform_name, platform_variant)
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/xcode/xcframework/xcframework_slice.rb

@@ -0,0 +1,51 @@
+module Pod
+  module Xcode
+    class XCFramework
+      class Slice
+        # @return [Pathname] the path to the .framework root of this framework slice
+        #
+        attr_reader :path
+
+        # @return [Array<String>] list of supported architectures
+        #
+        attr_reader :supported_archs
+
+        # @return [String] the framework identifier
+        #
+        attr_reader :identifier
+
+        # @return [Platform] the supported platform
+        #
+        attr_reader :platform
+
+        # @return [Symbol] the platform variant. Either :simulator or nil
+        #
+        attr_reader :platform_variant
+
+        def initialize(path, identifier, archs, platform, platform_variant = nil)
+          @path = path
+          @identifier = identifier
+          @supported_archs = archs
+          @platform = Pod::Platform.new(platform)
+          @platform_variant = platform_variant.to_sym unless platform_variant.nil?
+        end
+
+        # @return [String] the name of the framework
+        #
+        def name
+          @name ||= File.basename(path, '.framework')
+        end
+
+        def simulator_variant?
+          @platform_variant == :simulator
+        end
+
+        # @return [Pathname] the path to the bundled binary
+        #
+        def binary_path
+          path + name
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.9.0.beta.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2019-12-16 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.8.4
+        version: 1.9.0.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.9.0.beta.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +207,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.1
+        version: 1.14.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -217,7 +217,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.1
+        version: 1.14.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -460,6 +460,7 @@ files:
 - lib/cocoapods/generator/info_plist_file.rb
 - lib/cocoapods/generator/module_map.rb
 - lib/cocoapods/generator/prefix_header.rb
+- lib/cocoapods/generator/prepare_artifacts_script.rb
 - lib/cocoapods/generator/umbrella_header.rb
 - lib/cocoapods/hooks_manager.rb
 - lib/cocoapods/installer.rb
@@ -529,14 +530,17 @@ 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
+- lib/cocoapods/xcode.rb
+- lib/cocoapods/xcode/framework_paths.rb
+- lib/cocoapods/xcode/linkage_analyzer.rb
+- lib/cocoapods/xcode/xcframework.rb
+- lib/cocoapods/xcode/xcframework/xcframework_slice.rb
 homepage: https://github.com/CocoaPods/CocoaPods
 licenses:
 - MIT

data/lib/cocoapods/target/build_type.rb

@@ -1,139 +0,0 @@
-module Pod
-  class Target
-    class BuildType
-      # @return [Array<Symbol>] known packaging options.
-      #
-      KNOWN_PACKAGING_OPTIONS = %i(library framework).freeze
-
-      # @return [Array<Symbol>] known linking options.
-      #
-      KNOWN_LINKAGE_OPTIONS = %i(static dynamic).freeze
-
-      # @return [Symbol] the packaging for this build type, one of KNOWN_PACKAGING_OPTIONS
-      #
-      attr_reader :packaging
-
-      # @return [Symbol] the linkage for this build type, one of KNOWN_LINKAGE_OPTIONS
-      #
-      attr_reader :linkage
-
-      attr_reader :hash
-
-      def initialize(linkage: :static, packaging: :library)
-        raise ArgumentError, "Invalid linkage option #{linkage.inspect}, valid options are #{KNOWN_LINKAGE_OPTIONS.inspect}" unless KNOWN_LINKAGE_OPTIONS.include?(linkage)
-        raise ArgumentError, "Invalid packaging option #{packaging.inspect}, valid options are #{KNOWN_PACKAGING_OPTIONS.inspect}" unless KNOWN_PACKAGING_OPTIONS.include?(packaging)
-
-        @packaging = packaging
-        @linkage = linkage
-        @hash = packaging.hash ^ linkage.hash
-      end
-
-      # @param  [Specification] spec
-      #         the specification to infer the build type from
-      #
-      # @param  [Boolean] host_requires_frameworks
-      #         whether the host target definition specified `use_frameworks!`
-      #
-      # @return [BuildType] the appropriate build type for the given spec,
-      #         based on whether the host target definition requires frameworks.
-      #
-      def self.infer_from_spec(spec, host_requires_frameworks: false)
-        if host_requires_frameworks
-          root_spec = spec && spec.root
-          if root_spec && root_spec.static_framework
-            static_framework
-          else
-            dynamic_framework
-          end
-        else
-          static_library
-        end
-      end
-
-      # @return [BuildType] the build type for a dynamic library
-      #
-      def self.dynamic_library
-        new(:linkage => :dynamic, :packaging => :library)
-      end
-
-      # @return [BuildType] the build type for a static library
-      #
-      def self.static_library
-        new(:linkage => :static, :packaging => :library)
-      end
-
-      # @return [BuildType] the build type for a dynamic framework
-      #
-      def self.dynamic_framework
-        new(:linkage => :dynamic, :packaging => :framework)
-      end
-
-      # @return [BuildType] the build type for a static framework
-      #
-      def self.static_framework
-        new(:linkage => :static, :packaging => :framework)
-      end
-
-      # @return [Boolean] whether the target is built dynamically
-      #
-      def dynamic?
-        linkage == :dynamic
-      end
-
-      # @return [Boolean] whether the target is built statically
-      #
-      def static?
-        linkage == :static
-      end
-
-      # @return [Boolean] whether the target is built as a framework
-      #
-      def framework?
-        packaging == :framework
-      end
-
-      # @return [Boolean] whether the target is built as a library
-      #
-      def library?
-        packaging == :library
-      end
-
-      # @return [Boolean] whether the target is built as a dynamic framework
-      #
-      def dynamic_framework?
-        dynamic? && framework?
-      end
-
-      # @return [Boolean] whether the target is built as a dynamic library
-      #
-      def dynamic_library?
-        dynamic? && library?
-      end
-
-      # @return [Boolean] whether the target is built as a static framework
-      #
-      def static_framework?
-        static? && framework?
-      end
-
-      # @return [Boolean] whether the target is built as a static library
-      #
-      def static_library?
-        static? && library?
-      end
-
-      def to_s
-        "#{linkage} #{packaging}"
-      end
-
-      def inspect
-        "#<#{self.class} linkage=#{linkage} packaging=#{packaging}>"
-      end
-
-      def ==(other)
-        linkage == other.linkage &&
-            packaging == other.packaging
-      end
-    end
-  end
-end