cocoapods-generate 1.4.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 067262b8308a92713c42f4ddbce02e2ccd49706d6c63fb362579b4940304787b
-  data.tar.gz: 3a3b21887162068fd52413481196ade377203cab85b6529577858fb3d6bae541
+  metadata.gz: 1ff4789b445c0e00d7e00d2808dd4ed69e0d02f5e43547ef710d83bcc0dbce62
+  data.tar.gz: cc8ab4c9925c136e06706ced54b25b419327a4d9b4625bfac7e17ed02b5f58a2
 SHA512:
-  metadata.gz: b12fabd58e79a33e9ecb3c997e2f26abacc8b049faf23e52a81121f46391355ffbbe247f488db7e326768be85510a4170bfed08498d0bb975579eff5a2e081fb
-  data.tar.gz: d908644512ac74a4e0748113ab7ed34459f4a7a0a3d9b45acc4abc4d7898740280a24e0981bc19d0583999d5081265b411cfc13b23b43eae94405aebd2a789cb
+  metadata.gz: 3bf5669db86616bdc81af45c12d51a7a4fc10b1f7168173394290632522a5e1e4a65c2c9f100573018022fd3feaac3599ec80f853f62b24384d0f6a5f77d0c3b
+  data.tar.gz: 003a8045475b4fc18dbf57e2c4bc12e2ade7b07da9d62b129870c52984f2ba2a27ce5eec00b6e7fa4f66e1cec43b149f433265422a3c194227ace7429c0b427f

data/LICENSE.md

@@ -0,0 +1,9 @@
+The MIT License (MIT)
+
+Copyright (c) 2019
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -47,6 +47,7 @@ Usage:
 
 Options:
 
+    --allow-root                           Allows CocoaPods to run as root
     --silent                               Show nothing
     --verbose                              Show more debugging information
     --no-ansi                              Show output without ANSI codes
@@ -62,6 +63,8 @@ Options:
                                            be used
     --use-libraries                        Whether to use libraries instead of
                                            frameworks
+    --generate-multiple-pod-projects       Whether to generate multiple Xcode projects
+    --incremental-installation             Whether to use incremental installation
     --gen-directory=PATH                   Path to generate workspaces in
     --auto-open                            Whether to automatically open the generated
                                            workspaces
@@ -69,11 +72,17 @@ Options:
                                            before generating
     --app-host-source-dir=DIR              A directory containing sources to use for
                                            the app host
-    --sources=SOURCE1,SOURCE2              The sources from which to pull dependant
+    --sources=SOURCE1,SOURCE2              The sources from which to pull dependent
                                            pods (defaults to all repos in the podfile
                                            if using the podfile, else all available
                                            repos). Can be a repo name or URL. Multiple
                                            sources must be comma-delimited.
+    --local-sources=SOURCE1,SOURCE2        Paths from which to find local podspecs for
+                                           transitive dependencies. Multiple
+                                           local-sources must be comma-delimited.
+    --platforms=ios,macos                  Limit to specific platforms. Default is all
+                                           platforms supported by the podspec.
+                                           Multiple platforms must be comma-delimited.
     --repo-update                          Force running `pod repo update` before
                                            install
     --use-default-plugins                  Whether installation should activate

data/VERSION

@@ -1 +1 @@
-1.4.0
+2.0.1

data/lib/cocoapods/command/gen.rb

@@ -86,10 +86,12 @@ module Pod
           path = dir + '.gen_config.yml'
           next unless path.file?
           Pod::Generate::Configuration.from_file(path)
-        end
+        end.compact
+
+        options.delete(:podspec_paths) if options[:podspec_paths].empty? && config_hashes.any? { |h| h.include?(:podspec_paths) }
 
         env = Generate::Configuration.from_env(ENV)
-        config_hashes.insert(-2, env)
+        config_hashes = [env] + config_hashes
         config_hashes << options
 
         configuration = config_hashes.compact.each_with_object({}) { |e, h| h.merge!(e) }

data/lib/cocoapods/generate/configuration.rb

@@ -178,10 +178,25 @@ module Pod
       # installer options
       option :sources, ArrayOf.new(String),
              'if use_podfile && podfile then ::Pod::Installer::Analyzer.new(:sandbox, podfile).sources.map(&:url) else pod_config.sources_manager.all.map(&:url) end',
-             'The sources from which to pull dependant pods (defaults to all repos in the podfile if using the podfile, else all available repos). Can be a repo name or URL. Multiple sources must be comma-delimited.',
+             'The sources from which to pull dependent pods (defaults to all repos in the podfile if using the podfile, else all available repos). Can be a repo name or URL. Multiple sources must be comma-delimited.',
              'SOURCE1,SOURCE2',
              ->(_) { nil },
              ->(sources) { Array(sources).flat_map { |s| s.split(',') } }
+      option :local_sources, ArrayOf.new(String),
+             [],
+             'Paths from which to find local podspecs for transitive dependencies. Multiple local-sources must be comma-delimited.',
+             'SOURCE1,SOURCE2',
+             ->(_) { nil },
+             ->(local_sources) { Array(local_sources).flat_map { |s| s.split(',') } }
+      option :platforms, ArrayOf.new(String),
+             nil,
+             'Limit to specific platforms. Default is all platforms supported by the podspec. Multiple platforms must be comma-delimited.',
+             'ios,macos',
+             lambda { |platforms|
+               valid_platforms = Platform.all.map { |p| p.string_name.downcase }
+               valid_platforms unless (platforms - valid_platforms).empty?
+             }, # validates platforms is a subset of Platform.all
+             ->(platforms) { Array(platforms).flat_map { |s| s.split(',') } }
       option :repo_update, BOOLEAN, 'false', 'Force running `pod repo update` before install', nil, nil, coerce_to_bool
       option :use_default_plugins, BOOLEAN, 'false', 'Whether installation should activate default plugins', nil, nil, coerce_to_bool
       option :deterministic_uuids, BOOLEAN, 'false', 'Whether installation should use deterministic UUIDs for pods projects', nil, nil, coerce_to_bool
@@ -301,6 +316,19 @@ module Pod
         !use_libraries?
       end
 
+      # @return [String] The project name to use for generating this workspace.
+      #
+      # @param [Specification] spec
+      #        the specification to generate project name for.
+      #
+      def project_name_for_spec(spec)
+        project_name = spec.name.dup
+        # When using multiple Xcode project the project name will collide with the actual .xcodeproj meant for the pod
+        # that we are generating the workspace for.
+        project_name << 'Sample' if generate_multiple_pod_projects?
+        project_name
+      end
+
       # @return [Array<Specification>] the podspecs found at the given paths.
       #         This method will download specs from URLs and traverse a directory's children.
       #
@@ -325,7 +353,7 @@ module Pod
           elsif path.directory?
             glob = Pathname.glob(path + '*.podspec{.json,}')
             next StandardError.new "no specs found in #{UI.path path}" if glob.empty?
-            glob.map { |f| Pod::Specification.from_file(f) }
+            glob.map { |f| Pod::Specification.from_file(f) }.sort_by(&:name)
           else
             Pod::Specification.from_file(path)
           end

data/lib/cocoapods/generate/installer.rb

@@ -4,18 +4,6 @@ module Pod
     # given a configuration and a generated podfile.
     #
     class Installer
-      # A subclass of the CocoaPods installer that vends analyzer classes
-      # that skip validating podfiles
-      #
-      class InstallerNoValidatePodfile < ::Pod::Installer
-        def create_analyzer(*)
-          super.tap do |analyzer|
-            def analyzer.validate_podfile!; end
-          end
-        end
-      end
-      private_constant :InstallerNoValidatePodfile
-
       # @return [Configuration]
       #         the configuration to use when installing
       #
@@ -63,15 +51,25 @@ module Pod
 
           installer = nil
           UI.section 'Installing...' do
-            configuration.pod_config.with_changes(installation_root: install_directory, podfile: podfile, lockfile: configuration.lockfile, sandbox: nil, sandbox_root: install_directory, podfile_path: podfile.defined_in_file, silent: !configuration.pod_config.verbose?, verbose: false, lockfile_path: nil) do
-              installer = InstallerNoValidatePodfile.new(configuration.pod_config.sandbox, podfile, configuration.lockfile)
+            configuration.pod_config.with_changes(installation_root: install_directory, podfile: podfile,
+                                                  lockfile: configuration.lockfile, sandbox: nil,
+                                                  sandbox_root: install_directory + 'Pods',
+                                                  podfile_path: podfile.defined_in_file,
+                                                  silent: !configuration.pod_config.verbose?, verbose: false,
+                                                  lockfile_path: nil) do
+              installer = ::Pod::Installer.new(configuration.pod_config.sandbox, podfile, configuration.lockfile)
               installer.use_default_plugins = configuration.use_default_plugins
               installer.install!
             end
           end
 
           UI.section 'Performing post-installation steps' do
-            perform_post_install_steps(open_app_project, installer)
+            should_perform_post_install = if installer.respond_to?(:generated_aggregate_targets) # CocoaPods 1.7.0
+                                            !installer.generated_aggregate_targets.empty?
+                                          else
+                                            true
+                                          end
+            perform_post_install_steps(open_app_project, installer) if should_perform_post_install
           end
 
           print_post_install_message
@@ -91,7 +89,7 @@ module Pod
       end
 
       def open_app_project(recreate: false)
-        app_project_path = install_directory.join("#{spec.name}.xcodeproj")
+        app_project_path = install_directory.join("#{configuration.project_name_for_spec(spec)}.xcodeproj")
         if !recreate && app_project_path.exist?
           Xcodeproj::Project.open(app_project_path)
         else
@@ -104,30 +102,40 @@ module Pod
       # @return [Xcodeproj::Project]
       #
       def create_app_project
-        app_project = open_app_project(recreate: true)
-
-        spec.available_platforms.map do |platform|
-          consumer = spec.consumer(platform)
-          target_name = "App-#{Platform.string_name(consumer.platform_name)}"
-          native_app_target = Pod::Generator::AppTargetHelper.add_app_target(app_project, consumer.platform_name, deployment_target(consumer), target_name)
-          # Temporarily set Swift version to pass validator checks for pods which do not specify Swift version.
-          # It will then be re-set again within #perform_post_install_steps.
-          Pod::Generator::AppTargetHelper.add_swift_version(native_app_target, Pod::Validator::DEFAULT_SWIFT_VERSION)
-          native_app_target
+        app_project = open_app_project(recreate: !configuration.incremental_installation?)
+
+        spec_platforms = spec.available_platforms.flatten.reject do |platform|
+          !configuration.platforms.nil? && !configuration.platforms.include?(platform.string_name.downcase)
         end
-            .tap do
-              app_project.recreate_user_schemes do |scheme, target|
-                installation_result = installation_result_from_target(target)
-                next unless installation_result
-                installation_result.test_native_targets.each do |test_native_target|
-                  scheme.add_test_target(test_native_target)
-                end
+
+        if spec_platforms.empty?
+          Pod::Command::Gen.help! Pod::StandardError.new "No available platforms in #{spec.name}.podspec match requested platforms: #{configuration.platforms}"
+        end
+
+        spec_platforms
+          .map do |platform|
+            consumer = spec.consumer(platform)
+            target_name = "App-#{Platform.string_name(consumer.platform_name)}"
+            next if app_project.targets.map(&:name).include? target_name
+            native_app_target = Pod::Generator::AppTargetHelper.add_app_target(app_project, consumer.platform_name,
+                                                                               deployment_target(consumer), target_name)
+            # Temporarily set Swift version to pass validator checks for pods which do not specify Swift version.
+            # It will then be re-set again within #perform_post_install_steps.
+            Pod::Generator::AppTargetHelper.add_swift_version(native_app_target, Pod::Validator::DEFAULT_SWIFT_VERSION)
+            native_app_target
+          end
+          .compact.tap do
+            app_project.recreate_user_schemes do |scheme, target|
+              installation_result = installation_result_from_target(target)
+              next unless installation_result
+              installation_result.test_native_targets.each do |test_native_target|
+                scheme.add_test_target(test_native_target)
               end
             end
-            .each do |target|
-              Xcodeproj::XCScheme.share_scheme(app_project.path, target.name)
-            end
-
+          end
+          .each do |target|
+            Xcodeproj::XCScheme.share_scheme(app_project.path, target.name) if target
+          end
         app_project.save
       end
 
@@ -145,7 +153,10 @@ module Pod
           remove_script_phase_from_target(native_app_target, 'Check Pods Manifest.lock')
 
           pod_target = installer.pod_targets.find { |pt| pt.platform.name == native_app_target.platform_name && pt.pod_name == spec.name }
-          raise "unable to find a pod target for #{native_app_target} / #{spec}" unless pod_target
+          raise "Unable to find a pod target for #{native_app_target} / #{spec}" unless pod_target
+
+          native_app_target.source_build_phase.clear
+          native_app_target.resources_build_phase.clear
 
           if (app_host_source_dir = configuration.app_host_source_dir)
             relative_app_host_source_dir = app_host_source_dir.relative_path_from(installer.sandbox.root)
@@ -164,6 +175,14 @@ module Pod
                   end
 
                 next
+              elsif file.to_s.end_with?('-Bridging-Header.h')
+                native_app_target.build_configurations.each do |bc|
+                  if (old_bridging_header = bc.build_settings['SWIFT_OBJC_BRIDGING_HEADER'])
+                    raise Informative, "Conflicting Swift ObjC bridging headers specified, got #{old_bridging_header} and #{relative_path}. Only one `-Bridging-Header.h` file may be specified in the app host source dir."
+                  end
+
+                  bc.build_settings['SWIFT_OBJC_BRIDGING_HEADER'] = relative_path.to_s
+                end
               end
 
               group = groups[relative_path.dirname]
@@ -171,9 +190,21 @@ module Pod
               native_app_target.add_file_references([source_file_ref])
             end
           elsif Pod::Generator::AppTargetHelper.method(:add_app_project_import).arity == -5 # CocoaPods >= 1.6
-            Pod::Generator::AppTargetHelper.add_app_project_import(app_project, native_app_target, pod_target, pod_target.platform.name, native_app_target.name)
+            # If we are doing incremental installation then the file might already be there.
+            platform_name = Platform.string_name(native_app_target.platform_name)
+            group = group_for_platform_name(app_project, platform_name)
+            main_file_ref = group.files.find { |f| f.display_name == 'main.m' }
+            if main_file_ref.nil?
+              Pod::Generator::AppTargetHelper.add_app_project_import(app_project, native_app_target, pod_target,
+                                                                     pod_target.platform.name, native_app_target.name)
+            else
+              native_app_target.add_file_references([main_file_ref])
+            end
           else
-            Pod::Generator::AppTargetHelper.add_app_project_import(app_project, native_app_target, pod_target, pod_target.platform.name, pod_target.requires_frameworks?, native_app_target.name)
+            Pod::Generator::AppTargetHelper.add_app_project_import(app_project, native_app_target, pod_target,
+                                                                   pod_target.platform.name,
+                                                                   pod_target.requires_frameworks?,
+                                                                   native_app_target.name)
           end
 
           # Set `PRODUCT_BUNDLE_IDENTIFIER`
@@ -183,7 +214,7 @@ module Pod
 
           case native_app_target.platform_name
           when :ios
-            make_ios_app_launchable(installer, app_project, native_app_target)
+            make_ios_app_launchable(app_project, native_app_target)
           end
 
           Pod::Generator::AppTargetHelper.add_swift_version(native_app_target, pod_target.swift_version) unless pod_target.swift_version.blank?
@@ -237,9 +268,10 @@ module Pod
           .flat_map(&:test_native_targets)
           .group_by(&:platform_name)
 
+        workspace_path = install_directory + "#{spec.name}.xcworkspace"
         Xcodeproj::Plist.write_to_path(
           { 'IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded' => false },
-          app_project.path.sub_ext('.xcworkspace').join('xcshareddata').tap(&:mkpath).join('WorkspaceSettings.xcsettings')
+          workspace_path.join('xcshareddata').tap(&:mkpath).join('WorkspaceSettings.xcsettings')
         )
 
         test_native_targets.each do |platform_name, test_targets|
@@ -264,18 +296,17 @@ module Pod
         end
       end
 
-      def make_ios_app_launchable(installer, app_project, native_app_target)
+      def make_ios_app_launchable(app_project, native_app_target)
         platform_name = Platform.string_name(native_app_target.platform_name)
-        generated_source_dir = installer.sandbox.root.join('App', platform_name).tap(&:mkpath)
+        generated_source_dir = install_directory.join("App-#{platform_name}").tap(&:mkpath)
 
         # Add `LaunchScreen.storyboard`
         launch_storyboard = generated_source_dir.join('LaunchScreen.storyboard')
         launch_storyboard.write <<-XML.strip_heredoc
               <?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">
+              <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="Safe area layout guides" minToolsVersion="9.0"/>
                   <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
                 </dependencies>
                 <scenes>
@@ -287,7 +318,6 @@ module Pod
                           <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"/>
-                          <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
                         </view>
                       </viewController>
                       <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -329,12 +359,17 @@ module Pod
         Xcodeproj::Plist.write_to_path(info_plist_contents, info_plist_path)
 
         native_app_target.build_configurations.each do |bc|
-          bc.build_settings['INFOPLIST_FILE'] = "${SRCROOT}/App/#{platform_name}/Info.plist"
+          bc.build_settings['INFOPLIST_FILE'] = "${SRCROOT}/App-#{platform_name}/Info.plist"
         end
 
-        group = app_project.main_group.find_subpath("App-#{platform_name}", true)
-        group.new_file(info_plist_path)
-        native_app_target.resources_build_phase.add_file_reference group.new_file(launch_storyboard)
+        group = group_for_platform_name(app_project, platform_name)
+        group.files.find { |f| f.display_name == 'Info.plist' } || group.new_file(info_plist_path)
+        launch_storyboard_file_ref = group.files.find { |f| f.display_name == 'LaunchScreen.storyboard' } || group.new_file(launch_storyboard)
+        native_app_target.resources_build_phase.add_file_reference(launch_storyboard_file_ref)
+      end
+
+      def group_for_platform_name(project, platform_name, should_create = true)
+        project.main_group.find_subpath("App-#{platform_name}", should_create)
       end
 
       def print_post_install_message

data/lib/cocoapods/generate/podfile_generator.rb

@@ -30,20 +30,21 @@ module Pod
       def podfile_for_spec(spec)
         generator = self
         dir = configuration.gen_dir_for_pod(spec.name)
+        project_name = configuration.project_name_for_spec(spec)
 
         Pod::Podfile.new do
-          project "#{spec.name}.xcodeproj"
+          project "#{project_name}.xcodeproj"
           workspace "#{spec.name}.xcworkspace"
 
           plugin 'cocoapods-generate'
 
           install! 'cocoapods', generator.installation_options
 
-          generator.configuration.podfile_plugins.each do |name, options|
+          generator.podfile_plugins.each do |name, options|
             plugin(*[name, options].compact)
           end
 
-          use_frameworks!(generator.configuration.use_frameworks?)
+          use_frameworks!(generator.use_frameworks_value)
 
           if (supported_swift_versions = generator.supported_swift_versions)
             supports_swift_versions(supported_swift_versions)
@@ -54,7 +55,7 @@ module Pod
             source(source_url)
           end
 
-          self.defined_in_file = dir.join('Podfile.yaml')
+          self.defined_in_file = dir.join('CocoaPods.podfile.yaml')
 
           test_specs = spec.recursive_subspecs.select(&:test_specification?)
           app_specs = if spec.respond_to?(:app_specification?)
@@ -91,7 +92,11 @@ module Pod
 
           # Add platform-specific concrete targets that inherit the
           # `pod` declaration for the local pod.
-          spec.available_platforms.map(&:string_name).sort.each do |platform_name|
+          spec_platform_names = spec.available_platforms.map(&:string_name).flatten.each.reject do |platform_name|
+            !generator.configuration.platforms.nil? && !generator.configuration.platforms.include?(platform_name.downcase)
+          end
+
+          spec_platform_names.sort.each do |platform_name|
             target "App-#{platform_name}" do
               current_target_definition.swift_version = generator.swift_version if generator.swift_version
             end
@@ -121,7 +126,45 @@ module Pod
           end
 
           pod spec.name, **pod_options
+
+          # Implement local-sources option to set up dependencies to podspecs in the local filesystem.
+          next if generator.configuration.local_sources.empty?
+          generator.transitive_local_dependencies(spec, generator.configuration.local_sources).sort_by(&:first).each do |dependency, podspec_file|
+            pod_options = generator.dependency_compilation_kwargs(dependency.name)
+            pod_options[:path] = if podspec_file[0] == '/' # absolute path
+                                   podspec_file
+                                 else
+                                   '../../' + podspec_file
+                                 end
+            pod dependency.name, **pod_options
+          end
+        end
+      end
+
+      def transitive_local_dependencies(spec, paths, found_podspecs: {}, include_non_library_subspecs: true)
+        if include_non_library_subspecs
+          non_library_specs = spec.recursive_subspecs.select do |ss|
+            ss.test_specification? || (ss.respond_to?(:app_specification?) && ss.app_specification?)
+          end
+          non_library_specs.each do |subspec|
+            transitive_local_dependencies(subspec, paths, found_podspecs: found_podspecs, include_non_library_subspecs: false)
+          end
+        end
+        spec.dependencies.each do |dependency|
+          next if found_podspecs.key?(dependency)
+          found_podspec_file = nil
+          name = dependency.name.split('/')[0]
+          paths.each do |path|
+            podspec_file = File.join(path, name + '.podspec')
+            next unless File.file?(podspec_file)
+            found_podspec_file = podspec_file
+            break
+          end
+          next unless found_podspec_file
+          found_podspecs[dependency] = found_podspec_file.sub(%r{\A\./}, '')
+          transitive_local_dependencies(Pod::Specification.from_file(found_podspec_file), paths, found_podspecs: found_podspecs)
         end
+        found_podspecs
       end
 
       # @return [Boolean]
@@ -151,6 +194,27 @@ module Pod
         end
       end
 
+      # @return [Boolean, Hash]
+      #         the value to use for `use_frameworks!` DSL directive
+      #
+      def use_frameworks_value
+        return configuration.use_frameworks? unless configuration.use_podfile?
+        use_framework_values = target_definition_list.map do |target_definition|
+          if target_definition.respond_to?(:build_type) # CocoaPods >= 1.9
+            build_type = target_definition.build_type
+            if build_type.static_library?
+              false
+            else
+              { linkage: build_type == BuildType.dynamic_framework ? :dynamic : :static }
+            end
+          else
+            target_definition.uses_frameworks?
+          end
+        end.uniq
+        raise Informative, 'Multiple use_frameworks! values detected in user Podfile.' unless use_framework_values.count == 1
+        use_framework_values.first
+      end
+
       # @return [Hash]
       #         a hash with "compilation"-related dependency options for the `pod` DSL method
       #
@@ -276,6 +340,12 @@ module Pod
         installation_options
       end
 
+      def podfile_plugins
+        configuration.podfile_plugins.merge('cocoapods-disable-podfile-validations' => { 'no_abstract_only_pods' => true }) do |_key, old_value, new_value|
+          old_value.merge(new_value)
+        end
+      end
+
       private
 
       # @return [Array<Podfile::TargetDefinition>]
@@ -309,6 +379,7 @@ module Pod
       #
       def modular_headers?(pod_name)
         return true if configuration.use_modular_headers?
+        return false unless configuration.use_podfile?
         target_definitions_for_pod(pod_name).all? do |target_definition|
           target_definition.build_pod_as_module?(pod_name)
         end

data/lib/cocoapods_plugin.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if Pod::VERSION >= '1.5.0'
+if Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.5.0')
   require 'cocoapods/command/gen'
 else
   Pod::UI.warn 'cocoapods-generate requires CocoaPods >= 1.5.0'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-generate
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Samuel Giddins
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2020-11-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: cocoapods-disable-podfile-validations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +73,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CODE_OF_CONDUCT.md
+- LICENSE.md
 - README.md
 - VERSION
 - lib/cocoapods/command/gen.rb
@@ -68,9 +83,10 @@ files:
 - lib/cocoapods/generate/podfile_generator.rb
 - lib/cocoapods_plugin.rb
 homepage: https://github.com/square/cocoapods-generate
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -85,8 +101,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.0.1
+signing_key:
 specification_version: 4
 summary: Generates Xcode workspaces from a podspec.
 test_files: []