cocoapods-generate 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52f85405e2e27e0c197fac736a0f1c3d61f47e601238737f6082aa6913512c7c
-  data.tar.gz: 2fe15ee1fd79bd155bf94140fbe0a7bfbd2f318d355c43bac59b743e42da738e
+  metadata.gz: 444c04f0d19618e1220c68828b385d2a5360b63f359f6d5c97840c92ec4c82f5
+  data.tar.gz: 953c104741ea87c0629466cd2db8e6b27f2a9d3b395b7a18b76b714fec8d926c
 SHA512:
-  metadata.gz: db80754352a3a07467f11099713f58788fd1a342e54c7fd75e975b3bd73f3230980c07f271de56102a696d3e6663b29a1a21ed4efc38f8ca2bc7a5a62c06f600
-  data.tar.gz: 64c521033f329de4ad9d232ce147b33d25b885c70a020175e27e65c3ce639144d2cd27c6f864a08381b0b0d05b25488693b345b62ac641ad1a88483e70eb2fe3
+  metadata.gz: fdf382c8e04699dfb9c206fdc97fb892d39fd7b3d5403fa2118127c2caf92330bd7445b49bc38542ce67aae075002c412633ba09600a3682e20a797ae6d2bae5
+  data.tar.gz: 237a7ab95303b502f3f0e8b525a3c6f4f640031d55b5ceab88a963806b762f51b15c7197a23c779cae4fd39e54aecb5c47e9daa0a2e0f93b03f84fbaa26c05c7

data/README.md

@@ -79,6 +79,9 @@ Options:
     --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.5.0
+1.6.0

data/lib/cocoapods/generate/configuration.rb

@@ -188,6 +188,15 @@ module Pod
              '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

data/lib/cocoapods/generate/installer.rb

@@ -94,28 +94,34 @@ module Pod
       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
+        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
+
+        Pod::Command::Gen.help! Pod::StandardError.new "No available platforms in #{spec.name}.podspec match requested platforms: #{configuration.platforms}" if spec_platforms.empty?
+
+        spec_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
+          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
             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
 

data/lib/cocoapods/generate/podfile_generator.rb

@@ -91,7 +91,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
@@ -349,6 +353,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-generate
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Samuel Giddins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-disable-podfile-validations
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Generates Xcode workspaces from a podspec.