xcframework_converter 0.2.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 105e63e07d147cd791c478f9351e73e1f71bbd861160b5a1391d99c7c0affc9d
-  data.tar.gz: cf2e6a358aeb0a7018d06a2bf48382ab01d768eb870589da0abddab7044278e3
+  metadata.gz: b4026adcb50f4a5beae016b1df87c2b95c84062d3ddb5f4aa480127ef334d0ef
+  data.tar.gz: 6b4b75587762fa609056196b16c2560065db7351924dafe4915ca158a10fb1d0
 SHA512:
-  metadata.gz: fe005277c05790de2d906188fbc0ab3818b9dd27980bf68bdeb2e56ec3ef2f0184fc61224ddeb32c29689ad316f3179eb51dd4a3345bf423bdd7cd5d75569697
-  data.tar.gz: '0805b456eebbfc655bd5991c001b241b29bf614f154615be67be7124d3bc1fc95532a0612647ac1d56e05d10373c97c7f6e14489adb68481e24e6b5a03ff89c6'
+  metadata.gz: c9460cf57bfb886843148ae1353759c57149ff4de6d1963f363e094354bf2290277e1c4bc409c259ee968a65cee3f97190754717d0a9ad4871dac957276705fe
+  data.tar.gz: 0c63408a190166c3f9ca44de4734497e91ff57c1574738647e3eebe7ca6a07deba9d6deacb16a9fcc04d8e39e7f80cd8989c3b8d146a5c501e6f796646a66d9b

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/patching.rb

@@ -31,7 +31,7 @@ module XCFrameworkConverter
 
       patched_arm_slice_identifier = 'ios-arm64-simulator'
 
-      STDERR.puts "Will patch #{xcframework_path}: #{original_arm_slice_identifier} -> #{patched_arm_slice_identifier}"
+      warn "Will patch #{xcframework_path}: #{original_arm_slice_identifier} -> #{patched_arm_slice_identifier}"
 
       plist = xcframework.plist
       slice_plist_to_add = plist['AvailableLibraries'].find { |s| s['LibraryIdentifier'] == original_arm_slice_identifier }.dup

data/lib/xcframework_converter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module XCFrameworkConverter
-  VERSION = '0.2.0'
+  VERSION = '0.3.2'
 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,33 +42,48 @@ module XCFrameworkConverter
           before_rename.map { |f| pod_path.join(f) }
         end.flatten.uniq
 
-        convert_xcframeworks_if_present(spec, 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
-      remove_troublesome_xcconfig_items(spec) unless frameworks_to_convert.empty?
     end
 
-    def patch_xcframeworks_if_needed(spec, xcframeworks)
-      patched = xcframeworks.map do |path|
-        next nil unless Dir.exist?(path)
-
-        patch_xcframework(path)
-      end.compact
-      remove_troublesome_xcconfig_items(spec) unless patched.empty?
+    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.0
+  version: 0.3.2
 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