cocoapods-xcframework 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e585d673b3955cf72fabe8215902f92f47634ada97c293bd2acdf3a8e42a9622
-  data.tar.gz: 27d5a9e175c71b1701ec24bc0abaf31de9a57b396662574c08e5d485f81d085d
+  metadata.gz: 03bcb80dd7866167ac26bd68b27aa441079ab56b7508b123708aa3bb2d014bd7
+  data.tar.gz: af1b92eb7982834a3b24163e38e330a4e61a507beb51588aa84db321fefb7505
 SHA512:
-  metadata.gz: 62df3f2b4a90787a7101851ebe5e1d78dbac8685d7edf6e2e3543879cee31ff37c05d9365bfd08e95dbdb6acdf53a0f799397a916b1fcac02e68a244012ecf7c
-  data.tar.gz: ea585449d6726c1ac2c5a493dfce82cc04cf58f8bc3b848c35bd779517cd111f61f883163cc4bf248c9e7b0382f30fb5de912759699ecfcaf4b090238efc68a1
+  metadata.gz: 7b603436f5a79f74957eade0f2cbc18d6c6aa4eff461186a338522499df98e35cb9ec0ba07c6c766e5141d4348e59b175d82201fdba0a96ceb1a0b66d6a44278
+  data.tar.gz: d6e6d4721e635eef0d9ad30be3bf4fb8629d88eca559a09f8bda42150eb4cf2db890f771a91b55c3015aba66dea2a7bd994dc9210f23a36a8ce4d45c6fdf9857

data/lib/cocoapods-framework/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsFramework
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/cocoapods-framework/util/pod_util.rb

@@ -49,7 +49,7 @@ module Pod
       unless installer.nil? 
         installer.pods_project.targets.each do |target|
           target.build_configurations.each do |configuration|
-            # configuration.build_settings['CLANG_MODULES_AUTOLINK'] = 'NO'
+            configuration.build_settings['CLANG_MODULES_AUTOLINK'] = 'NO'
           end
         end
         installer.pods_project.save

data/lib/cocoapods-framework/xbuilder.rb

@@ -14,7 +14,7 @@ module Pod
       @sandbox_root = sandbox_root
       @spec = spec
       @configuration = configuration
-      @outputs = nil
+      @outputs = {}
     end
 
     def build
@@ -31,12 +31,29 @@ module Pod
       build_all_device defines
 
       collect_xc_frameworks
+
+      collect_bundles
     end
 
     def collect_xc_frameworks
       export_dir = "#{@sandbox_root}/export/**/#{@spec.name}.framework"
       frameworks = Pathname.glob(export_dir)
-      @outputs = create_xc_framework_by_frameworks frameworks
+      @outputs[:xcframework] = create_xc_framework_by_frameworks frameworks
+    end
+
+    def collect_bundles
+      ["iphoneos","macOS","appletvos","watchos"].each do |plat|
+        export_dir = "#{@sandbox_root}/export/*-#{plat}/**/#{@spec.name}.bundle"
+        Pathname.glob(export_dir).each do |bundle|
+          @outputs[:bundle] = "#{@sandbox_root}/bundle"
+          native_platform = to_native_platform plat
+          path = Pathname.new "#{@sandbox_root}/bundle/#{native_platform}"
+          if not path.exist?
+            path.mkpath
+          end
+          FileUtils.cp_r(Dir["#{bundle}"],"#{path}")
+        end
+      end
     end
 
     def create_xc_framework_by_frameworks frameworks
@@ -83,8 +100,10 @@ module Pod
         Pathname.new(target_dir).mkdir
       end
       outputs_xcframework target_dir
+      outputs_bundle target_dir
       new_spec_hash = generic_new_podspec_hash @spec
       new_spec_hash[:vendored_frameworks] = "#{@spec.name}.xcframework"
+      new_spec_hash[:resource_bundles] = find_bundles target_dir
       require 'json'
       spec_json = JSON.pretty_generate(new_spec_hash) << "\n"
       File.open("#{target_dir}/#{@spec.name}.podspec.json",'wb+') do |f|
@@ -92,15 +111,36 @@ module Pod
       end
       UI.puts "result export at :#{target_dir}"
       target_dir
+      exit -1
+    end
+    
+    def find_bundles target_dir
+      bundle_root = "#{target_dir}/bundle/"
+      bundle_name = "/#{@spec.name}.bundle"
+      pattern = "#{bundle_root}*#{bundle_name}"
+      result = {}
+      Pathname.glob(pattern).each do |bundle|
+        bundle_relative_path = bundle.to_s.gsub(bundle_root, "")
+        plat = bundle_relative_path.gsub(bundle_name,"")
+        result[plat] = "bundle/" + bundle_relative_path
+      end
+      puts result
+      result
     end
 
     def outputs_xcframework target_dir
-      command = "cp -rp #{@outputs} #{target_dir} 2>&1"
+      command = "cp -rp #{@outputs[:xcframework]} #{target_dir} 2>&1"
       output = `#{command}`.lines.to_a
       if $?.exitstatus != 0
         Pod::ErrorUtil.error_report command,output
         Process.exit -1
       end
     end
+
+    def outputs_bundle target_dir
+      if @outputs[:bundle]
+        FileUtils.cp_r(Dir[@outputs[:bundle]],target_dir)
+      end
+    end
   end
 end

data/lib/cocoapods-framework/xbuilder/xcodeproj_helper.rb

@@ -18,6 +18,17 @@ module Pod
         project.save
       end
 
+      def to_native_platform name
+        case name
+        when 'iphoneos' then 'ios'
+        when 'macOS' then 'osx'
+        when 'appletvos' then 'tvos'
+        when 'watchos' then 'watchos'
+        else
+          name
+        end
+      end
+
       private
       def xcode_sdks
         return @x_sdks if @x_sdks

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-xcframework
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - 戴易超
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2021-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods