cocoapods-generate 2.2.2 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ec807085c21de2232ba62daad8b1a5cb014904ac95082163de14e1ee46cc9fc
-  data.tar.gz: f03150d21af7d856c665e421ea98a37ec5114d622f0d775dc9e674a2c72ff5b3
+  metadata.gz: e678737eede01f12fa09ac0d4d64a23737ec7d659147d67a9e489bb64044709e
+  data.tar.gz: 82c0cf87922bed22879443ad965b8dd9795c6d0704fab11cbf2329570d4ce6ca
 SHA512:
-  metadata.gz: 620f5d4fb25024442f8e697b47bfa1d30f47933e06d5467ade270b25a00fdce9f2de492bbbd3706674893ae30cf4c9633d25420e356933cbb83df7cff9820d94
-  data.tar.gz: 5470965cdcdc8a68dba3bd14051ec0d6a819363b19440e2f1ad9ef42622036e839bb188a3e4eb2655b1a7d2739eda697382c1053d17a2078c71f02bbb3ff9d1c
+  metadata.gz: 458d65f261c92ff4fae69b24feab9693bc2f7a63503585b8dbdfc06aafd4e006a0a25556b6dd1d70a7213cb29a9a2d4668e4da8688dc1b628008f56fd23a0110
+  data.tar.gz: 90730f6a121011ee794f4c910135b47eee34ba177e1a1af620a6a96755d5d60f3a941b41179e25fbf9b17dc99cedabf5e3a11c5a0c618411fec2586eb8832478

data/VERSION

@@ -1 +1 @@
-2.2.2
+2.2.4

data/lib/cocoapods/generate/configuration.rb

@@ -210,6 +210,12 @@ module Pod
       option :use_modular_headers, BOOLEAN, 'false', 'Whether the target should be generated as a clang module, treating dependencies as modules, as if `use_modular_headers!` were specified. Will error if both this option and a podfile are specified', nil, nil, coerce_to_bool
       option :single_workspace, BOOLEAN, 'false', 'Whether to produce a single workspace for all podspecs specified.', nil, nil, coerce_to_bool
       option :xcode_version, Pod::Version, 'Pod::Version.new(\'9.3\')', 'The Xcode version to use for producing the consumer sample project', 'xcode_version', nil, coerce_to_version
+      option :external_source_pods, ArrayOf.new(HashOf.new(keys: [String], values: [ArrayOf.new(HashOf.new(keys: [String], values: [String]))])),
+             [],
+             nil,
+             nil,
+             nil,
+             ->(external_sources) { Array(external_sources) }
 
       options.freeze
       options.each do |o|

data/lib/cocoapods/generate/installer.rb

@@ -7,6 +7,8 @@ module Pod
       DEFAULT_XCODE_VERSION = '9.3'.freeze
 
       XCODE_VERSION_TO_OBJECT_VERSION = {
+        '14.0' => 56,
+        '13.0' => 55,
         '12.0' => 54,
         '11.4' => 53,
         '11.0' => 52,
@@ -185,7 +187,7 @@ module Pod
           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)
+            relative_app_host_source_dir = app_host_source_dir.relative_path_from(install_directory)
             groups = {}
 
             app_host_source_dir.find do |file|
@@ -234,9 +236,13 @@ module Pod
             bc.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = 'org.cocoapods-generate.${PRODUCT_NAME:rfc1034identifier}'
           end
 
-          case native_app_target.platform_name
+          case native_app_target.platform_name.to_sym
           when :ios
             make_ios_app_launchable(app_project, native_app_target)
+          when :osx
+            generate_infoplist_file(app_project, native_app_target)
+          when :tvos
+            generate_infoplist_file(app_project, native_app_target)
           end
 
           swift_version = pod_targets.map { |pt| Pod::Version.new(pt.swift_version) }.max.to_s
@@ -391,6 +397,15 @@ module Pod
         native_app_target.resources_build_phase.add_file_reference(launch_storyboard_file_ref)
       end
 
+      def generate_infoplist_file(_app_project, native_app_target)
+        # Starting in Xcode 14, there is an error when you build the macOS or
+        # tvOS app that is generated from cocoapods-generate. This implements
+        # the suggested change.
+        native_app_target.build_configurations.each do |bc|
+          bc.build_settings['GENERATE_INFOPLIST_FILE'] = 'YES'
+        end
+      end
+
       def group_for_platform_name(project, platform_name, should_create = true)
         project.main_group.find_subpath("App-#{platform_name}", should_create)
       end

data/lib/cocoapods/generate/podfile_generator.rb

@@ -31,6 +31,7 @@ module Pod
         generator = self
         dir = configuration.gen_dir_for_specs(specs)
         project_name = configuration.project_name_for_specs(specs)
+        external_source_pods = configuration.external_source_pods
 
         Pod::Podfile.new do
           project "#{project_name}.xcodeproj"
@@ -93,9 +94,19 @@ module Pod
                            .reject { |d| spec_names.include?(d.root_name) }
 
             dependencies.each do |dependency|
-              pod_args = generator.pod_args_for_dependency(self, dependency)
+              pod_args = generator.pod_args_for_podfile_dependency(self, dependency)
               pod(*pod_args)
             end
+
+            external_source_pods.each do |hash|
+              hash.each do |name, attrs|
+                next if spec_names.include?(name)
+
+                dependency = Dependency.new(name, attrs.first.deep_symbolize_keys)
+                pod_args = generator.pod_args_for_dependency(nil, dependency)
+                pod(*pod_args)
+              end
+            end
           end
 
           # Add platform-specific concrete targets that inherit the `pod` declaration for the local pod.
@@ -291,12 +302,23 @@ module Pod
       #
       # @param  [Dependency] dependency
       #
-      def pod_args_for_dependency(podfile, dependency)
+      def pod_args_for_podfile_dependency(podfile, dependency)
         dependency = podfile_dependencies[dependency.root_name]
                      .map { |dep| dep.dup.tap { |d| d.name = dependency.name } }
                      .push(dependency)
                      .reduce(&:merge)
+        pod_args_for_dependency(podfile, dependency)
+      end
 
+      # @return [Hash<String,Array<Dependency>>]
+      #         returns the arguments that should be passed to the Podfile DSL's
+      #         `pod` method.
+      #
+      # @param  [Podfile] podfile
+      #
+      # @param  [Dependency] dependency
+      #
+      def pod_args_for_dependency(podfile, dependency)
         options = dependency_compilation_kwargs(dependency.name)
         options[:source] = dependency.podspec_repo if dependency.podspec_repo
         options.update(dependency.external_source) if dependency.external_source

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-generate
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.4
 platform: ruby
 authors:
 - Samuel Giddins
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2023-02-10 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
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Generates Xcode workspaces from a podspec.