xcframework_converter 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73791ebb8115008970a6beb4f8365313af86757023c0e04046410be09c58bf11
-  data.tar.gz: d4f69fa6eba4f1f501b6dd382719efeb8a3ece77926b2b39a79c8e09e8ff2206
+  metadata.gz: c41a9ff61dd6eb5eb00492d2ed59d9a235a3d3085189bff9351d9d6ab175e548
+  data.tar.gz: b9784bac37bb57065f29a70bb8ec4a7ae19f6a6716375018d2253bb0d6c362cf
 SHA512:
-  metadata.gz: 33020857576ceb88146c5fed0d793e28daaf653f06ba904eb4f24a9cc56cf504edc7152aab68b249ab026d0e2f89aca32b2890d0e80b1f74613933f35da3d7e8
-  data.tar.gz: 8130336cd0406ee3386cf3b89fc2bf687d7b2ae20bacc46cb82986b5058f925e4a89e3f2b4c7ca0a0ddc5b5faf4275e70eb4f238929eaf0fc6344554b0723941
+  metadata.gz: f0b0c2d69c02d311046d6dcb2e465d0fe18b7e34409cf423f29fe473117232ab3b39c623a90709586d79d1b5caeb2d5be20986bd730b44e2b3da9809338cb7c0
+  data.tar.gz: dcab8fdcf810162e00b70b214bd43c41c61b852e294689c819c1d03a456bed13068cd16e7f9956cff42a19871ac1b8c97a6e77c6273686ef8f524fc69b8c09ec

data/lib/xcframework_converter/version.rb

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

data/lib/xcframework_converter.rb

@@ -17,30 +17,34 @@ module XCFrameworkConverter
   class << self
     def convert_frameworks_to_xcframeworks!(installer)
       installer.analysis_result.specifications.each do |spec|
-        next unless spec.attributes_hash['vendored_frameworks']
+        next if spec.source && spec.local?
 
-        frameworks = Array(spec.attributes_hash['vendored_frameworks'])
-        unconverted_frameworks = frameworks.select { |f| File.extname(f) == '.framework' }
-        next if unconverted_frameworks.empty?
-        next if spec.local?
+        frameworks_to_convert = spec.available_platforms.map do |platform|
+          consumer = Pod::Specification::Consumer.new(spec, platform)
+          before_rename = consumer.vendored_frameworks.select { |f| File.extname(f) == '.framework' }
+          next [] if before_rename.empty?
+
+          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
+        end.flatten.uniq
+        
+        next if frameworks_to_convert.empty?
 
         pod_path = installer.sandbox.pod_dir(Pod::Specification.root_name(spec.name))
-        convert_xcframeworks_if_present(pod_path)
+        convert_xcframeworks_if_present(frameworks_to_convert.map { |f| pod_path.join(f) })
 
-        converted_frameworks = unconverted_frameworks.map do |path|
-          Pathname.new(path).sub_ext('.xcframework').to_s
-        end
-        spec.attributes_hash['vendored_frameworks'] = frameworks - unconverted_frameworks + converted_frameworks
         # 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*]')
       end
     end
 
-    def convert_xcframeworks_if_present(pod_path)
-      unconverted_paths = Dir[pod_path.join('**/*.framework')] - Dir[pod_path.join('**/*.xcframework/**/*')]
-      unconverted_paths.each do |path|
-        convert_framework_to_xcframework(path)
+    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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcframework_converter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Igor Makarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-01 00:00:00.000000000 Z
+date: 2021-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods