cocoapods-generate 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe3a4797a7c76c66418b58add0f315698b10c3f0ccfc736cec676865c0fcd7b2
-  data.tar.gz: e5071e101d5d54ac11ec94eb0226d7409cbedbff3edb6cd857eb01ddcfa0103b
+  metadata.gz: 067262b8308a92713c42f4ddbce02e2ccd49706d6c63fb362579b4940304787b
+  data.tar.gz: 3a3b21887162068fd52413481196ade377203cab85b6529577858fb3d6bae541
 SHA512:
-  metadata.gz: 40e0c9e09b5ce101c3d8747369361c4d796170fe120f435f80547fc8b01ec8d1f33a60e46de1167024e95b7c375702b9170d784d8b204a5b8b63a01760efc80f
-  data.tar.gz: 64252420f3628f13165255fcd82159df549fd07e234c929e6bf4cb58086d81a71c83ceb1bc31bc1d59914f3f600f46f59c751941bac5ca4543b5dbb0e1288376
+  metadata.gz: b12fabd58e79a33e9ecb3c997e2f26abacc8b049faf23e52a81121f46391355ffbbe247f488db7e326768be85510a4170bfed08498d0bb975579eff5a2e081fb
+  data.tar.gz: d908644512ac74a4e0748113ab7ed34459f4a7a0a3d9b45acc4abc4d7898740280a24e0981bc19d0583999d5081265b411cfc13b23b43eae94405aebd2a789cb

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.4.0

data/lib/cocoapods/generate/configuration.rb

@@ -149,6 +149,9 @@ module Pod
 
       option :use_libraries, BOOLEAN, 'false', 'Whether to use libraries instead of frameworks', nil, nil, coerce_to_bool
 
+      option :generate_multiple_pod_projects, BOOLEAN, 'false', 'Whether to generate multiple Xcode projects', nil, nil, coerce_to_bool
+      option :incremental_installation, BOOLEAN, 'false', 'Whether to use incremental installation', nil, nil, coerce_to_bool
+
       option :gen_directory, [String, Pathname], 'Pathname("gen").expand_path', 'Path to generate workspaces in', 'PATH', ->(path) { 'path is file' if path.file? }, coerce_to_pathname
       option :auto_open, BOOLEAN, 'false', 'Whether to automatically open the generated workspaces', nil, nil, coerce_to_bool
       option :clean, BOOLEAN, 'false', 'Whether to clean the generated directories before generating', nil, nil, coerce_to_bool

data/lib/cocoapods/generate/installer.rb

@@ -192,7 +192,13 @@ module Pod
           end
 
           # Share the pods xcscheme only if it exists. For pre-built vendored pods there is no xcscheme generated.
-          Xcodeproj::XCScheme.share_scheme(installer.pods_project.path, pod_target.label) if File.exist?(installer.pods_project.path + pod_target.label)
+          if installer.respond_to?(:generated_projects) # CocoaPods 1.7.0
+            installer.generated_projects.each do |project|
+              Xcodeproj::XCScheme.share_scheme(project.path, pod_target.label) if File.exist?(project.path + pod_target.label)
+            end
+          elsif File.exist?(installer.pods_project.path + pod_target.label)
+            Xcodeproj::XCScheme.share_scheme(installer.pods_project.path, pod_target.label)
+          end
 
           add_test_spec_schemes_to_app_scheme(installer, app_project)
         end

data/lib/cocoapods/generate/podfile_generator.rb

@@ -37,10 +37,7 @@ module Pod
 
           plugin 'cocoapods-generate'
 
-          install! 'cocoapods',
-                   deterministic_uuids: generator.configuration.deterministic_uuids?,
-                   share_schemes_for_development_pods: generator.configuration.share_schemes_for_development_pods?,
-                   warn_for_multiple_pod_sources: generator.configuration.warn_for_multiple_pod_sources?
+          install! 'cocoapods', generator.installation_options
 
           generator.configuration.podfile_plugins.each do |name, options|
             plugin(*[name, options].compact)
@@ -48,6 +45,10 @@ module Pod
 
           use_frameworks!(generator.configuration.use_frameworks?)
 
+          if (supported_swift_versions = generator.supported_swift_versions)
+            supports_swift_versions(supported_swift_versions)
+          end
+
           # Explicitly set sources
           generator.configuration.sources.each do |source_url|
             source(source_url)
@@ -96,7 +97,7 @@ module Pod
             end
           end
 
-          # this block hash to come _before_ inhibit_all_warnings! / use_modular_headers!,
+          # this block has to come _before_ inhibit_all_warnings! / use_modular_headers!,
           # and the local `pod` declaration
           current_target_definition.instance_exec do
             transitive_dependencies = children.find { |c| c.name == 'Transitive Dependencies' }
@@ -246,6 +247,35 @@ module Pod
         @swift_version ||= target_definition_list.map(&:swift_version).compact.max
       end
 
+      def supported_swift_versions
+        return unless configuration.use_podfile?
+        return if target_definition_list.empty?
+        return unless target_definition_list.first.respond_to?(:swift_version_requirements)
+        target_definition_list.reduce(nil) do |supported_swift_versions, target_definition|
+          target_swift_versions = target_definition.swift_version_requirements
+          next supported_swift_versions unless target_swift_versions
+          Array(target_swift_versions) | Array(supported_swift_versions)
+        end
+      end
+
+      def installation_options
+        installation_options = {
+          deterministic_uuids: configuration.deterministic_uuids?,
+          share_schemes_for_development_pods: configuration.share_schemes_for_development_pods?,
+          warn_for_multiple_pod_sources: configuration.warn_for_multiple_pod_sources?
+        }
+
+        if Pod::Installer::InstallationOptions.all_options.include?('generate_multiple_pod_projects')
+          installation_options[:generate_multiple_pod_projects] = configuration.generate_multiple_pod_projects?
+        end
+
+        if Pod::Installer::InstallationOptions.all_options.include?('incremental_installation')
+          installation_options[:incremental_installation] = configuration.incremental_installation?
+        end
+
+        installation_options
+      end
+
       private
 
       # @return [Array<Podfile::TargetDefinition>]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-generate
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Samuel Giddins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2019-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,8 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Generates Xcode workspaces from a podspec.