cocoapods-xcframework 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46213903938512037adf189a5077b72a22de58a58772079b6ed51e3d69819848
-  data.tar.gz: 4ca7fdc2a9eb9614a82ba357b97d109ee5c1039373432f3b6e93a2ccaa51a15c
+  metadata.gz: 524f3dacc9713030c4d5e2cd2d74d2ef6437a4301940484c12dd9596c89f85f5
+  data.tar.gz: 5eb3da5b46a72827d9af811173ac3c7b08f1403c6ea3310c4c9afc98dd4b0473
 SHA512:
-  metadata.gz: ed4aa32df78147ee139baa3041ff87bfd02b751a65062d8732361bca189478b0733f0df62be1ff6ad7dcdc6e1e0b5bce985a4996e2c1edae796aded3c6c8b7b4
-  data.tar.gz: 7b63fd3315add0ca97f5ac408bbd6a6fc2ef7bcc002f361abce8f042302c4321ecde12d8cb05db97211b854e94cb5de1a49fb8d86158f6e189fd2077c986fe91
+  metadata.gz: cfd6763d22e5d26f70c50daf23c4f6e872ab7748e1fbb91cde884df34f9997e83a55eb369710fe52aa4733043a6e0364e29e37dc644c5a9c5097ffd05b623b4e
+  data.tar.gz: 23380b32ba90686046afffa29fe2ca63c030e8a62b0fada553a9e28f5cc444ea074143638c0fc1c8cf8ea7b9291cf68289acf7d65e495805a119b6dcdd3690c0

data/lib/cocoapods-framework/command/framework.rb

@@ -32,7 +32,8 @@ module Pod
           ['--spec-sources=private,https://github.com/CocoaPods/Specs.git', 'The sources to pull dependent pods from (defaults to https://github.com/CocoaPods/Specs.git)'],
           ['--subspecs', 'Only include the given subspecs'],
           ['--use-modular-headers', 'pakcage uses modular headers during packaging'],
-          ['--no-static-library', 'package not use static library']
+          ['--no-static-library', 'package not use static library'],
+          ['--enalbe-bitcode', 'package enable bitcode']
         ].concat super
       end
 
@@ -46,6 +47,7 @@ module Pod
         @use_modular_headers = argv.option('use-modular-headers', true)
         @force = argv.flag?('force', true)
         @use_static_library = argv.flag?('static-library',true)
+        @enable_bitcode = argv.flag?('enable-bitcode',false)
         config.static_library_enable = @use_static_library
         super
       end
@@ -56,7 +58,7 @@ module Pod
       end
 
       def run
-        frameworker = Frameworker.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers)
+        frameworker = Frameworker.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers, @enable_bitcode)
         frameworker.run
       end
     end

data/lib/cocoapods-framework/frameworker.rb

@@ -3,7 +3,7 @@ module Pod
     include PodUtil
     include DirUtil
     include Config::Mixin
-    def initialize(name, source, spec_sources, subspecs, configuration, force, use_modular_headers)
+    def initialize(name, source, spec_sources, subspecs, configuration, force, use_modular_headers, enable_bitcode)
       @name = name
       @source = source
       @spec_sources = spec_sources
@@ -11,6 +11,7 @@ module Pod
       @configuration = configuration
       @force = force
       @use_modular_headers = use_modular_headers
+      @enable_bitcode = enable_bitcode
     end
 
     def run
@@ -36,7 +37,8 @@ module Pod
         spec,
         @subspecs,
         @spec_sources,
-        @use_modular_headers
+        @use_modular_headers,
+        @enable_bitcode
       )
 
       perform_build(

data/lib/cocoapods-framework/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsFramework
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

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

@@ -1,6 +1,21 @@
 module Pod
   module PodUtil
     include Config::Mixin
+
+    def to_native_platform name
+      case name
+      when 'iphoneos' then 'ios'
+      when 'macOS' then 'osx'
+      when 'appletvos' then 'tvos'
+      when 'watchos' then 'watchos'
+      when 'ios' then 'ios'
+      when 'macos' then 'osx'
+      when 'tvos' then 'tvos'
+      else
+        name
+      end
+    end
+
     def muti_config_with_file(path)
       return nil if path.nil?
       path = Pathname.new(path)
@@ -48,7 +63,7 @@ module Pod
       Sandbox.new(config.sandbox_root)
     end
 
-    def installation_root sandbox, spec, subspecs, sources,use_frameworks = true,use_modular_headers = true
+    def installation_root sandbox, spec, subspecs, sources,use_frameworks = true,use_modular_headers = true, enable_bitcode = false
         podfile = podfile_from_spec(
         @path,
         spec,
@@ -64,6 +79,9 @@ module Pod
 
       unless installer.nil? 
         installer.pods_project.targets.each do |target|
+          if enable_bitcode
+            configuration.build_settings['ENABLE_BITCODE'] = 'YES'
+          end
           if target.name == spec.name
             target.build_configurations.each do |configuration|
               configuration.build_settings['CLANG_MODULES_AUTOLINK'] = 'NO'
@@ -75,7 +93,7 @@ module Pod
       installer
     end
 
-    def installation_root_muti sandbox, configs, sources, use_frameworks = true, use_modular_headers = true
+    def installation_root_muti sandbox, configs, sources, use_frameworks = true, use_modular_headers = true, enable_bitcode = false
       podfile = podfile_from_muti_configs(
         configs,
         sources,
@@ -91,6 +109,9 @@ module Pod
       end
       unless installer.nil? 
         installer.pods_project.targets.each do |target|
+          if enable_bitcode
+            configuration.build_settings['ENABLE_BITCODE'] = 'YES'
+          end
           if specs.include? target.name
             target.build_configurations.each do |configuration|
               configuration.build_settings['CLANG_MODULES_AUTOLINK'] = 'NO'
@@ -202,5 +223,28 @@ module Pod
       end
       spec_hash
     end
+
+    def fix_header_file spec_hash, xcframework_path
+      puts "Dir.glob(#{xcframework_path}/*/) : #{Dir.glob("#{xcframework_path}/*/")}"
+      Dir.glob("#{xcframework_path}/*/").each do |file|
+        ['ios','macos','tvos', 'watchos'].each do |prefix|
+          last_path = file.split("/").last
+          if last_path =~ /#{prefix}/ and not last_path =~ /simulator/
+            platform = to_native_platform prefix
+            if spec_hash[platform]
+              spec_hash[platform]["public_header_files"] = "#{spec_hash[:vendored_frameworks]}/#{last_path}/*/Headers/*.h"
+              spec_hash[platform]["source_files"] = "#{spec_hash[:vendored_frameworks]}/#{last_path}/*/Headers/*.h"
+            else
+              spec_hash[platform] = {
+                "public_header_files" => "#{spec_hash[:vendored_frameworks]}/#{last_path}/*/Headers/*.h",
+                "source_files" => "#{spec_hash[:vendored_frameworks]}/#{last_path}/*/Headers/*.h"
+              }
+            end
+          end
+        end
+      end
+      puts spec_hash.to_json
+      spec_hash
+    end
   end
 end

data/lib/cocoapods-framework/xbuilder.rb

@@ -159,6 +159,7 @@ module Pod
       outputs_bundle target_dir
       new_spec_hash = generic_new_podspec_hash @spec
       new_spec_hash[:vendored_frameworks] = "#{@spec.name}.xcframework"
+      new_spec_hash = fix_header_file new_spec_hash, "#{target_dir}/#{@spec.name}.xcframework"
       find_bundles(target_dir).each do |plat, value| 
         if new_spec_hash[plat]
           new_spec_hash[plat]["resource_bundles"] = value
@@ -225,6 +226,7 @@ module Pod
         podspec = Pod::Specification.from_file podspec_path
         new_spec_hash = generic_new_podspec_hash podspec
         new_spec_hash[:vendored_frameworks] = "#{podspec.name}.xcframework"
+        new_spec_hash = fix_header_file new_spec_hash, "#{target_dir}/#{@spec.name}.xcframework"
         find_bundles("#{target_dir}/#{podspec.name}").each do |plat, value|
           if new_spec_hash[plat]
             new_spec_hash[plat]["resource_bundles"] = value

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

@@ -2,6 +2,7 @@ require 'xcodeproj'
 module Pod
   class XBuilder
     module XcodeProjHelper
+      include PodUtil
       def modify_xcode_project_sdk_to_simullator path
         sdks = xcode_sdks
         project = Xcodeproj::Project.open path
@@ -18,17 +19,6 @@ 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.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - 戴易超
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-12 00:00:00.000000000 Z
+date: 2021-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -92,14 +92,6 @@ files:
 - lib/cocoapods-framework/xbuilder/xcodeproj_helper.rb
 - lib/cocoapods_plugin.rb
 - pic/allplatform.png
-- pkg/cocoapods-framework-0.0.1.gem
-- pkg/cocoapods-framework-0.0.2.gem
-- pkg/cocoapods-framework-0.0.3.gem
-- pkg/cocoapods-xcframework-0.0.4.gem
-- pkg/cocoapods-xcframework-0.0.6.gem
-- pkg/cocoapods-xcframework-0.0.7.gem
-- pkg/cocoapods-xcframework-0.0.8.gem
-- pkg/cocoapods-xcframework-0.1.0.gem
 - spec/command/framework_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/TyrantDante/cocoapods-framework