gonative-cli 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f7a146a01493fb4d9c5549b04f0d50e94da9162261d88100ee07490621512f2
-  data.tar.gz: a6cdcb5036d748178bba4d3da3a850f175106ef2027f0d77ee28f74975f6f504
+  metadata.gz: 5711e0fe00d6ff54499bc81fd0fa237a7e98f1dc3ac64ef08a0e0b488524b2fb
+  data.tar.gz: 629786a400afa538d5259327d3ea971b1b497174f6e28318f2dc88687c7a0f8c
 SHA512:
-  metadata.gz: 7f03a1a4580410fea17325183c3dacb694c1107f75ca44a2364e60597926506558430b0359e7a1f439b50eaba1617c377d884d5132cc2582ca5e1ec9c6f6f595
-  data.tar.gz: 55f31f0dfaf30ecac9171c25b782329b241e9c34ffe58a902d38902304efdaa4cfd95486ff3e73bf3794f1af5dc2b5d9b0cb487203efe44304bf2fcba7fd27ed
+  metadata.gz: 31b03f07e20e077ea401b5e204080621609a4e29c137ae7a271f2890dfb44e8a8a7e3109167d2ff8192d3747464f82d04f2ae397cecb0daa8ff4536adc1f0f9c
+  data.tar.gz: 9751fae3c5b84b04b9c2f25d85f2d5ff097fcaec4f97ced4ef31072f229f3a65091e0f4f9c28c48f1724b9abd8a23d18d16effa55e36cbaf85366ab4365ae443

data/lib/gonative/plugins/ios/build_framework.rb

@@ -2,6 +2,7 @@
 
 require 'cocoapods'
 require 'shellwords'
+require 'tmpdir'
 require 'pathname'
 require 'xcodeproj'
 
@@ -105,6 +106,7 @@ module GoNative
         def patch_build_settings!(config)
           config.build_settings.delete('SWIFT_OBJC_BRIDGING_HEADER')
           config.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'YES'
+          config.build_settings['STRIP_INSTALLED_PRODUCT'] = 'NO' if config.build_settings['MACH_O_TYPE'] == 'staticlib'
           config.build_settings['MODULEMAP_FILE'] = modulemap_project_setting_path
         end
 
@@ -122,9 +124,15 @@ module GoNative
           FileUtils.rm_rf(simulator_archive_path)
           FileUtils.rm_rf(device_archive_path)
 
-          return if system(archive_commands)
+          if system(archive_commands)
+            [simulator_framework_path, device_framework_path].each { |path| prune_dependency_objects!(path) }
+            return if system(create_xcframework_command)
+          end
 
           raise Error, 'Error building framework with Tuist. Please run the generated archive commands manually to inspect the failure'
+        ensure
+          FileUtils.rm_rf(simulator_archive_path)
+          FileUtils.rm_rf(device_archive_path)
         end
 
         def archive_commands
@@ -139,14 +147,65 @@ module GoNative
               destination: "generic/platform=iOS",
               archive_path: device_archive_path,
               sdk: "iphoneos"
-            ),
-            create_xcframework_command,
-            %(rm -rf #{Shellwords.escape(simulator_archive_path)} #{Shellwords.escape(device_archive_path)})
+            )
           ].join(' && ')
         end
 
+        # Removes package product objects from a static framework archive, keeping the plugin's own.
+        def prune_dependency_objects!(framework_path)
+          binary = File.join(framework_path, plugin_name)
+          return unless `file -b #{Shellwords.escape(binary)}`.include?('ar archive')
+
+          archs = `lipo -archs #{Shellwords.escape(binary)}`.split
+          Dir.mktmpdir do |dir|
+            slices = archs.map do |arch|
+              slice = File.join(dir, "#{arch}.a")
+              if archs.size > 1
+                system("lipo #{Shellwords.escape(binary)} -thin #{arch} -output #{Shellwords.escape(slice)}") or
+                  raise Error, "Failed to extract #{arch} from #{binary}"
+              else
+                FileUtils.cp(binary, slice)
+              end
+
+              dependency_objects = `ar -t #{Shellwords.escape(slice)}`.split("\n").reject { |member| plugin_object?(member) }
+              unless dependency_objects.empty?
+                Utils::UI.info "Removing #{dependency_objects.size} dependency objects from #{arch} slice"
+                system("ar -d #{Shellwords.escape(slice)} #{dependency_objects.map { |m| Shellwords.escape(m) }.join(' ')}") &&
+                  system("ranlib #{Shellwords.escape(slice)}") or
+                  raise Error, "Failed to prune #{arch} slice of #{binary}"
+              end
+              slice
+            end
+
+            if slices.size > 1
+              system("lipo -create #{slices.map { |s| Shellwords.escape(s) }.join(' ')} -output #{Shellwords.escape(binary)}") or
+                raise Error, "Failed to recombine #{binary}"
+            else
+              FileUtils.cp(slices.first, binary)
+            end
+          end
+        end
+
+        def plugin_object?(member)
+          return true if member.start_with?('__.SYMDEF') || member.start_with?(plugin_name)
+
+          plugin_source_stems.any? { |stem| member == "#{stem}.o" || member.start_with?("#{stem}-") }
+        end
+
+        def plugin_source_stems
+          @plugin_source_stems ||= Dir.glob(File.join(classes_root_path, '**', '*.{swift,m,mm,c,cpp}'))
+            .map { |path| File.basename(path, '.*') }
+            .uniq
+        end
+
+        # Static frameworks produce no dSYM.
         def create_xcframework_command
-          %(xcodebuild -create-xcframework -framework #{Shellwords.escape(simulator_framework_path)} -debug-symbols #{Shellwords.escape(simulator_dsym_path)} -framework #{Shellwords.escape(device_framework_path)} -debug-symbols #{Shellwords.escape(device_dsym_path)} -output #{Shellwords.escape(xcframework_output_path)})
+          slices = [[simulator_framework_path, simulator_dsym_path], [device_framework_path, device_dsym_path]]
+          arguments = slices.map do |framework, dsym|
+            argument = "-framework #{Shellwords.escape(framework)}"
+            File.exist?(dsym) ? "#{argument} -debug-symbols #{Shellwords.escape(dsym)}" : argument
+          end
+          %(xcodebuild -create-xcframework #{arguments.join(' ')} -output #{Shellwords.escape(xcframework_output_path)})
         end
 
         def xcodebuild_archive_command(destination:, archive_path:, sdk:, archs_override: false)

data/lib/gonative/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GoNative
-  VERSION = '2.1.3'
+  VERSION = '2.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gonative-cli
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Hunaid Hassan