xcframework_converter 0.2.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5109f0543cf6df9ebebacdcdc107e1a9bdfc11e365d918d62775678a9742a51a
-  data.tar.gz: 76cbc87f54d47b30e6c371f72c6855439e359eb620c0971821985b8c5697ad42
+  metadata.gz: 9b2d19f2b78a5ddedb9c26708a8ead42cfe3a76a21dfeeb244f6f9e49f835ef2
+  data.tar.gz: 5334b7a2cea325d36a5e15ca30cd14aafd47c49a40f99fb0ff5e2ff45094edd9
 SHA512:
-  metadata.gz: 3a5650ef13956e95ee516e8d226afa1f282baf3c6268ea52b267c9fb0b5854aa6fc60a9bdf14e315e2274642f584c493da1231f111959f7494875a8d28dc253a
-  data.tar.gz: 545cff6294e8dc3734d0599a03dd40f48e0b1016bd7df06e0efba44e9b297373d64cded2c84004961cd3504b0aed9e2d7595ceda162a0f85d36abc8a318efabd
+  metadata.gz: 519151d17e2cb3aa6c4140ee9bf4c05b55b4deb1582508271d99e6d9fb26a4f8c450b60b9f9b3c9ed590d8fd7c7b352ec1624e5a294b3a31700bf74a626c4205
+  data.tar.gz: fc7b29d598afe23fc1d3047dcc2446bb160986da8b8297b81ef9b8103e18635104f0ea043898c4c7ff3d27b03e1a38c673ece942c8b084bbc1292d0ab9eccd40

data/bin/xcfpatch

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'xcframework_converter'
+
+if ARGV.empty?
+  warn 'Usage: xcfpatch <path/to/XCFramework.xcframework>'
+  exit 1
+end
+
+XCFrameworkConverter.patch_xcframework(Pathname.new(ARGV[0]).realpath)

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.2.1'
+  VERSION = '0.3.3'
 end

data/lib/xcframework_converter.rb

@@ -29,7 +29,7 @@ module XCFrameworkConverter
                   .map { |f| pod_path.join(f) }
         end.flatten.uniq
 
-        patch_xcframeworks_if_needed(spec, xcframeworks_to_patch)
+        patch_xcframeworks_if_needed(xcframeworks_to_patch)
 
         frameworks_to_convert = spec.available_platforms.map do |platform|
           consumer = Pod::Specification::Consumer.new(spec, platform)
@@ -42,31 +42,50 @@ module XCFrameworkConverter
           before_rename.map { |f| pod_path.join(f) }
         end.flatten.uniq
 
-        convert_xcframeworks_if_present(spec, frameworks_to_convert)
+        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(spec, frameworks_to_convert)
+    def convert_xcframeworks_if_present(frameworks_to_convert)
       frameworks_to_convert.each do |path|
         convert_framework_to_xcframework(path) if Dir.exist?(path)
       end
     end
 
-    def patch_xcframeworks_if_needed(spec, xcframeworks)
+    def patch_xcframeworks_if_needed(xcframeworks)
       xcframeworks.each do |path|
         patch_xcframework(path) if Dir.exist?(path)
       end
     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,66 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: xcframework_converter
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Igor Makarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-09 00:00:00.000000000 Z
+date: 2022-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.10.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.10.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.20.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.20.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.20'
 description: Convert an ancient .framework (dynamic or static) to an .xcframework.
   Add an arm64 Simulator patch.
 email:
 - igormaka@gmail.com
 executables:
 - xcfconvert
+- xcfpatch
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
 - bin/xcfconvert
+- bin/xcfpatch
 - lib/arm2sim.swift
 - lib/xcframework_converter.rb
 - lib/xcframework_converter/arm_patcher.rb