xcframework_converter 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77324350e0b69d68739d71e4e2bd510b2c46e82076d82c066eb1af2ab7019ff0
-  data.tar.gz: dd8c817ba142772da87f18c46fffe50f32e2bad22d4bb8a9e3101650b38818a0
+  metadata.gz: 7a1169fa0a3c860b9ddffd50b22592d95ba42d5f32a1f97dbc7507827491ac47
+  data.tar.gz: 05b3b160406d9b1db0db39cc0c999e4c5370d08be44e5dbd5f069089751ab890
 SHA512:
-  metadata.gz: e7a7693803108e192822db1f4ab0de16bed32d4dc134dd3a69b1b6e54eab4e185e4d466d0626ecd46adc4c0bee677de8a9b8ca28d99485a0f5975147133cd94b
-  data.tar.gz: 59a9cac8d54309ddd9efea3901425ad5499cccac741cd6d35cb4a493794a8cf35d083ad63ba6e0528065cd717ee1521c7a8794cd445d2093813f65336af9209e
+  metadata.gz: 4356364e00c34af6f9a817d9a3bea2411f46ab0fee145586bbb48d9f1ffa23335a1728970535ea2e8e94559eae15cb3de4abecce8c983fa1b9b653235878a50e
+  data.tar.gz: a29311d0abee698408d037bbca8ebba0a9603e2eb9c4851c4b74c2581688a324fe529f26a374c04ea29405a45174931eff113362e99edf460b953dfb66364f8a

data/bin/xcfconvert

@@ -5,8 +5,10 @@ require 'bundler/setup'
 require 'xcframework_converter'
 
 if ARGV.empty?
-  warn 'Usage: xcfconvert <path/to/Framework.framework>'
+  warn 'Usage: xcfconvert <path/to/Framework.framework> [ios|tvos|watchos]'
   exit 1
 end
 
-XCFrameworkConverter.convert_framework_to_xcframework(Pathname.new(ARGV[0]).realpath)
+path = Pathname.new(ARGV.shift).realpath
+platform = ARGV.shift&.to_sym || :ios
+XCFrameworkConverter.convert_framework_to_xcframework(path, platform)

data/lib/xcframework_converter/creation.rb

@@ -20,21 +20,24 @@ module XCFrameworkConverter
       Pathname.new(__FILE__).dirname.join('../xcframework_template.plist')
     end
 
-    def convert_framework_to_xcframework(path)
+    def convert_framework_to_xcframework(path, platform)
       plist = Xcodeproj::Plist.read_from_path(plist_template_path)
       xcframework_path = Pathname.new(path).sub_ext('.xcframework')
       xcframework_path.mkdir
       plist['AvailableLibraries'].each do |slice|
-        slice_path = xcframework_path.join(slice['LibraryIdentifier'])
+        slice_library_identifier = slice['LibraryIdentifier'].sub('platform', platform.to_s)
+        slice_path = xcframework_path.join(slice_library_identifier)
         slice_path.mkdir
         slice['LibraryPath'] = File.basename(path)
+        slice['SupportedPlatform'] = platform.to_s
+        slice['LibraryIdentifier'] = slice_library_identifier
         FileUtils.cp_r(path, slice_path)
       end
       Xcodeproj::Plist.write_to_path(plist, xcframework_path.join('Info.plist'))
       FileUtils.rm_rf(path)
       final_framework = Pod::Xcode::XCFramework.open_xcframework(xcframework_path)
       final_framework.slices.each do |slice|
-        ArmPatcher.patch_arm_binary(slice) if slice.platform == :ios && slice.platform_variant == :simulator
+        ArmPatcher.patch_arm_binary(slice) if slice.platform == platform && slice.platform_variant == :simulator
         ArmPatcher.cleanup_unused_archs(slice)
       end
     end

data/lib/xcframework_converter/patching.rb

@@ -18,18 +18,33 @@ module XCFrameworkConverter
   class << self
     def patch_xcframework(xcframework_path)
       xcframework = Pod::Xcode::XCFramework.open_xcframework(xcframework_path)
+      slices_to_convert = xcframework.slices.select do |slice|
+        slice.platform != :osx &&
+          slice.platform_variant != :simulator &&
+          slice.supported_archs.include?('arm64')
+      end
+
+      slices_to_convert.each do |slice|
+        patch_xcframework_impl(xcframework_path, slice.platform.name)
+      end
+    end
+
+    private
+
+    def patch_xcframework_impl(xcframework_path, platform)
+      xcframework = Pod::Xcode::XCFramework.open_xcframework(xcframework_path)
 
       return nil if xcframework.slices.any? do |slice|
-        slice.platform == :ios &&
+        slice.platform == platform &&
         slice.platform_variant == :simulator &&
         slice.supported_archs.include?('arm64')
       end
 
       original_arm_slice_identifier = xcframework.slices.find do |slice|
-        slice.platform == :ios && slice.supported_archs.include?('arm64')
+        slice.platform == platform && slice.supported_archs.include?('arm64')
       end.identifier
 
-      patched_arm_slice_identifier = 'ios-arm64-simulator'
+      patched_arm_slice_identifier = "#{platform}-arm64-simulator"
 
       warn "Will patch #{xcframework_path}: #{original_arm_slice_identifier} -> #{patched_arm_slice_identifier}"
 

data/lib/xcframework_converter/version.rb

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

data/lib/xcframework_converter.rb

@@ -39,8 +39,8 @@ module XCFrameworkConverter
           after_rename = before_rename.map { |f| Pathname.new(f).sub_ext('.xcframework').to_s }
           proxy = Pod::Specification::DSL::PlatformProxy.new(spec, platform.symbolic_name)
           proxy.vendored_frameworks = consumer.vendored_frameworks - before_rename + after_rename
-          before_rename.map { |f| pod_path.join(f) }
-        end.flatten.uniq
+          before_rename.map { |f| [pod_path.join(f), platform.symbolic_name] }
+        end.flatten(1).uniq
 
         convert_xcframeworks_if_present(frameworks_to_convert)
 
@@ -53,8 +53,8 @@ module XCFrameworkConverter
     end
 
     def convert_xcframeworks_if_present(frameworks_to_convert)
-      frameworks_to_convert.each do |path|
-        convert_framework_to_xcframework(path) if Dir.exist?(path)
+      frameworks_to_convert.each do |path, platform|
+        convert_framework_to_xcframework(path, platform) if Dir.exist?(path)
       end
     end
 
@@ -65,21 +65,31 @@ 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
+
       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')
+      platforms = %w[
+        iphonesimulator
+        appletvsimulator
+        watchsimulator
+      ]
+
+      (xcconfigs.product platforms).each do |xcconfig, platform|
+        excluded_archs_key = "EXCLUDED_ARCHS[sdk=#{platform}*]"
+        inlcuded_arch_key = "VALID_ARCHS[sdk=#{platform}*]"
+
+        excluded_arm = xcconfig[excluded_archs_key]&.include?('arm64')
+        not_inlcuded_arm = xcconfig[inlcuded_arch_key] && !xcconfig[inlcuded_arch_key].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*]')
+        xcconfig.delete(excluded_archs_key)
+        xcconfig.delete(inlcuded_arch_key)
       end
     end
 

data/lib/xcframework_template.plist

@@ -6,7 +6,7 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>platform-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>Placeholder.framework</string>
 			<key>SupportedArchitectures</key>
@@ -21,7 +21,7 @@
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_armv7</string>
+			<string>platform-arm64_armv7</string>
 			<key>LibraryPath</key>
 			<string>Placeholder.framework</string>
 			<key>SupportedArchitectures</key>
@@ -30,7 +30,7 @@
 				<string>armv7</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>platform</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcframework_converter
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Igor Makarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-23 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods