cocoapods-generate 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35db1cd62af064c53a195412974b4a053569388c8682557093088d2a22af56cb
-  data.tar.gz: 159f3e9e8258682bcd42592194bed3ca7ee95db66cabfe0dcc2a4ebf6945dcb6
+  metadata.gz: d8dd5896fe293bf4d05fd83c9caba0324b05f7b857abebb93369b816762a968f
+  data.tar.gz: f826e9c99158d30fa2ff14d6821ebd4f4c3d8dca538f9c7d36bc9d40c759eac0
 SHA512:
-  metadata.gz: e4036f2d71ecd321cc62449a2ec3f00c77e3bb29dbb89d16bafa20c1f8a74a1ac1810bbd99ffd43dceafbde806d7c80fe2a1477b38dcb021b9a1dbd9772dbce0
-  data.tar.gz: 4d1ee2f06a1a65e93469c926c675a42385b9f5bb887f31103e07d570ef2032850cbf25dc660a3bda4cb10a519f4ebb5b679ef5e52a9b9f42b5545bf162536de4
+  metadata.gz: 30e56968b0b6de1b50c61711d8493f9db0f2ada2f7fb95a71f4507b1ea2386c9c4d4fbc21cdbe9aa4bd464e5a8802318d91ff81ae766c9be87bee199727864ba
+  data.tar.gz: f3d0bccb1e79f54099116a1321ae25d8f3c497a906ec95821948905b2ac6286dfddeec35447ef601f82c8cb6abb0b0b60c11bec73b766f25ca68e6b037170b4c

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/lib/cocoapods/generate/installer.rb

@@ -117,7 +117,11 @@ module Pod
         end
             .tap do
               app_project.recreate_user_schemes do |scheme, target|
-                scheme.set_launch_target(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
             end
             .each do |target|
@@ -196,6 +200,14 @@ module Pod
         app_project.save
       end
 
+      def installation_result_from_target(target)
+        return unless target.respond_to?(:symbol_type)
+        library_product_types = %i[framework dynamic_library static_library]
+        return unless library_product_types.include? target.symbol_type
+
+        results_by_native_target[target]
+      end
+
       def remove_script_phase_from_target(native_target, script_phase_name)
         script_phase = native_target.shell_script_build_phases.find { |bp| bp.name && bp.name.end_with?(script_phase_name) }
         return unless script_phase.present?

data/lib/cocoapods/generate/podfile_generator.rb

@@ -56,6 +56,11 @@ module Pod
           self.defined_in_file = dir.join('Podfile.yaml')
 
           test_specs = spec.recursive_subspecs.select(&:test_specification?)
+          app_specs = if spec.respond_to?(:app_specification?)
+                        spec.recursive_subspecs.select(&:app_specification?)
+                      else
+                        []
+                      end
 
           # Stick all of the transitive dependencies in an abstract target.
           # This allows us to force CocoaPods to use the versions / sources / external sources
@@ -65,6 +70,8 @@ module Pod
             pods_for_transitive_dependencies = [spec.name]
                                                .concat(test_specs.map(&:name))
                                                .concat(test_specs.flat_map { |ts| ts.dependencies.flat_map(&:name) })
+                                               .concat(app_specs.map(&:name))
+                                               .concat(app_specs.flat_map { |as| as.dependencies.flat_map(&:name) })
 
             dependencies = generator
                            .transitive_dependencies_by_pod
@@ -82,7 +89,7 @@ module Pod
           end
 
           # Add platform-specific concrete targets that inherit the
-          # `pod` declaration for the local pod
+          # `pod` declaration for the local pod.
           spec.available_platforms.map(&:string_name).sort.each do |platform_name|
             target "App-#{platform_name}" do
               current_target_definition.swift_version = generator.swift_version if generator.swift_version
@@ -106,10 +113,13 @@ module Pod
 
           # This is the pod declaration for the local pod,
           # it will be inherited by the concrete target definitions below
-          pod spec.name,
-              path: spec.defined_in_file.relative_path_from(dir).to_s,
-              testspecs: test_specs.map { |s| s.name.sub(%r{^#{Regexp.escape spec.root.name}/}, '') }.sort,
-              **generator.dependency_compilation_kwargs(spec.name)
+          pod_options = generator.dependency_compilation_kwargs(spec.name)
+          pod_options[:path] = spec.defined_in_file.relative_path_from(dir).to_s
+          { testspecs: test_specs, appspecs: app_specs }.each do |key, specs|
+            pod_options[key] = specs.map { |s| s.name.sub(%r{^#{Regexp.escape spec.root.name}/}, '') }.sort unless specs.empty?
+          end
+
+          pod spec.name, **pod_options
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-generate
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Samuel Giddins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2018-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler