xcframework_converter 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2df06815d507bcbbd8d8ea83882fe3c55463dcc9532063d4566f8d196e378ada
-  data.tar.gz: f49c4301fb89b90b1e30e77cbee37e175ea1d432a1c104f62131d689857d0a58
+  metadata.gz: b4026adcb50f4a5beae016b1df87c2b95c84062d3ddb5f4aa480127ef334d0ef
+  data.tar.gz: 6b4b75587762fa609056196b16c2560065db7351924dafe4915ca158a10fb1d0
 SHA512:
-  metadata.gz: bdcc77aeb67f7eb84dbb8c469186e27a730616f9fa2c51a9e6a7e9ca91f800b4563858c18fd3c93a91298b911241aad577f9e0ba8086ba198f19932368868701
-  data.tar.gz: ea641b22490269b45530b719ca48435092055ed5515b8cce8fe7b9ddc866567a418bdb16d6b463b3482319c664cabd49253f963864a16bfa705fa5dd6ab4faf6
+  metadata.gz: c9460cf57bfb886843148ae1353759c57149ff4de6d1963f363e094354bf2290277e1c4bc409c259ee968a65cee3f97190754717d0a9ad4871dac957276705fe
+  data.tar.gz: 0c63408a190166c3f9ca44de4734497e91ff57c1574738647e3eebe7ca6a07deba9d6deacb16a9fcc04d8e39e7f80cd8989c3b8d146a5c501e6f796646a66d9b

data/lib/arm2sim.swift

@@ -77,8 +77,10 @@ enum Transmogrifier {
         
         let offsetSections = sections.map { section -> section_64 in
             var section = section
-            section.offset += UInt32(offset)
-            section.reloff += section.reloff > 0 ? UInt32(offset) : 0
+            if section.flags != S_ZEROFILL {
+                section.offset += UInt32(offset)
+                section.reloff += section.reloff > 0 ? UInt32(offset) : 0
+            }
             return section
         }
         

data/lib/xcframework_converter/arm_patcher.rb

@@ -56,7 +56,9 @@ module XCFrameworkConverter
           file = MachO::MachOFile.new(object_file)
           sdk_version = file[:LC_VERSION_MIN_IPHONEOS].first.version_string.to_i
           `xcrun swift \"#{arm2sim_path}\" \"#{object_file}\" \"#{sdk_version}\" \"#{sdk_version}\"`
+          $stderr.printf '.'
         end
+        $stderr.puts
         `cd \"#{extracted_path_dir}\" ; ar crv \"#{extracted_path}\" *.o`
 
         `xcrun lipo \"#{slice.binary_path}\" -replace arm64 \"#{extracted_path}\" -output \"#{slice.binary_path}\"`

data/lib/xcframework_converter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module XCFrameworkConverter
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/lib/xcframework_converter.rb

@@ -42,10 +42,12 @@ module XCFrameworkConverter
           before_rename.map { |f| pod_path.join(f) }
         end.flatten.uniq
 
-        convert_xcframeworks_if_present(frameworks_to_convert)
+        remember_spec_as_patched(spec) unless frameworks_to_convert.empty?
 
         remove_troublesome_xcconfig_items(spec)
       end
+
+      warn "Specs with patched XCFrameworks: #{@patched_specs.sort.join(', ')}"
     end
 
     def convert_xcframeworks_if_present(frameworks_to_convert)
@@ -61,12 +63,27 @@ module XCFrameworkConverter
     end
 
     def remove_troublesome_xcconfig_items(spec)
-      # some pods put these as a way to NOT support arm64 sim
-      # may stop working if a pod decides to put these in a platform proxy
-      spec.attributes_hash['pod_target_xcconfig']&.delete('EXCLUDED_ARCHS[sdk=iphonesimulator*]')
-      spec.attributes_hash['user_target_xcconfig']&.delete('EXCLUDED_ARCHS[sdk=iphonesimulator*]')
-      spec.attributes_hash['pod_target_xcconfig']&.delete('VALID_ARCHS[sdk=iphonesimulator*]')
-      spec.attributes_hash['user_target_xcconfig']&.delete('VALID_ARCHS[sdk=iphonesimulator*]')
+      xcconfigs = %w[
+        pod_target_xcconfig
+        user_target_xcconfig
+      ].map { |key| spec.attributes_hash[key] }.compact
+
+      xcconfigs.each do |xcconfig|
+        # some pods put these as a way to NOT support arm64 sim
+        # may stop working if a pod decides to put these in a platform proxy
+        excluded_arm = xcconfig['EXCLUDED_ARCHS[sdk=iphonesimulator*]']&.include?('arm64')
+        not_inlcuded_arm = xcconfig['VALID_ARCHS[sdk=iphonesimulator*]'] && !xcconfig['VALID_ARCHS[sdk=iphonesimulator*]'].include?('arm64')
+
+        remember_spec_as_patched(spec) if excluded_arm || not_inlcuded_arm
+
+        xcconfig.delete('EXCLUDED_ARCHS[sdk=iphonesimulator*]')
+        xcconfig.delete('VALID_ARCHS[sdk=iphonesimulator*]')
+      end
+    end
+
+    def remember_spec_as_patched(spec)
+      @patched_specs ||= Set.new
+      @patched_specs << spec.root.name
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcframework_converter
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Igor Makarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods