cocoapods-generate 2.2.3 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4bfa2c31a2e64dd3923f9413cac796a3857e8693c1e4b437dd8d6caa118cfd5
-  data.tar.gz: 83a3ab70639016cfb600c0958d79288dfbaad3d9df8a43d0f50e11edfc52fc53
+  metadata.gz: '08f2297098adcd3db0c24d515ba15c1591fb39cc243ae6034d909caf43ba3419'
+  data.tar.gz: 3b6311b4cce77ab5f4c7d69fe2c883025997b036309c530d94d371fe92a38d37
 SHA512:
-  metadata.gz: a5ac204b50794cb297184858ddba52a80357dd6da2c5f22654a27e8baabbca14e5903837b6c4789385c3fa5d11b9de3f00fb2089e27c06fb0102bc5652720e4f
-  data.tar.gz: 62ec11956e6af98a32665665f9db92fd9b57175edeb4d17dace834e248025060afdf1e68758bad6b0b5e7ab959a91cf4b6f92c8ff0901d3b47ab3d0de61bed58
+  metadata.gz: 6994f22f83a606146190ef561c30f4f94aa152cdfb551daf7d7c22345cc5bfec75273e742a89e8cf71c020031428bc73b3749ff5fcdc1f0b9defb9fadabd5ce8
+  data.tar.gz: 87e10686c0f4c8f9f1c06a8ef17bf3b3fc39237970e85847c31f8a7a7937dd243767788d6af607edf7625dce028507289b79953670fe75349a7a4247425e40d1

data/VERSION

@@ -1 +1 @@
-2.2.3
+2.2.5

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|
@@ -395,12 +397,12 @@ 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)
+      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"
+          bc.build_settings['GENERATE_INFOPLIST_FILE'] = 'YES'
         end
       end
 
@@ -442,7 +444,7 @@ module Pod
         source_file.open('w') do |f|
           f << import_statements.join("\n")
           f << "\n" unless import_statements.empty?
-          f << "int main() { return 0; }\n"
+          f << "int main(void) { return 0; }\n"
         end
 
         source_file

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-generate
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.5
 platform: ruby
 authors:
 - Samuel Giddins
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-14 00:00:00.000000000 Z
+date: 2023-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-disable-podfile-validations
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Generates Xcode workspaces from a podspec.