cocoapods-tdf-bin 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bdb076bb3b6e381790ebe749eb7c95ec28a50c80d9881dcdba36f2a65fc59b7
-  data.tar.gz: 68aad5923bd08c16e4ff9cacc08e8fdb41b4295504affbb306e08524cc65ac4f
+  metadata.gz: 965e339f8eea15bcc092ce5aec87779766eaf08b0ef2b149e656fb99f9b3ee3d
+  data.tar.gz: 8a886b055ee958714e9375a299adc02e7dff365556991f34c62d79ff65033502
 SHA512:
-  metadata.gz: 40db87d009cb7925f78947f40aa2bfaa32fe6bae59df182dab8ec99a61bb7a3cb906c4b43fb95dcb0adc7654709ac42933d7a1c6f65c955dee1ae2cd3a223107
-  data.tar.gz: ad74c200ef28f06b6f2f9cbf63dbb464c0ca628092b6b22be36bc2e85ede55c8a3ccb30125f4e2d3d9811a8ec1c22ba59c6cb89e56448e4fee3f5a6b99f0b349
+  metadata.gz: 38eeb96491f2c9f4bcd6a0bf46c2fcf1027849e858795a1d8de29c23e8514f87cd8f9930a1e7739f5a7e54ddc96c29042929faa55c1d931d935c156d8ae4b999
+  data.tar.gz: 627146df6541bc5cd4858f23350a9c329bca13cdb90c775038e521e21f98c90a1b975645bbea4fdc0623462bb823f1b717c1e2d7c15c9cdace44e89458843910

data/lib/cocoapods-tdf-bin/gem_version.rb

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.0.28'
+  VERSION = '0.0.29'
 end
 
 module Pod

data/lib/cocoapods-tdf-bin/helpers/spec_source_creator.rb

@@ -165,7 +165,41 @@ module CBin
         spec_hash.delete('resource_bundles')
         spec_hash.delete('exclude_files')
         spec_hash.delete('preserve_paths')
-        # spec_hash.delete('source_files')
+        spec_hash.delete('source_files')
+
+        # 处理子库，将二进制子库的依赖全部放到最外层，删除子库的source_files
+        dependencies = Hash(spec_hash["dependencies"])
+        sub_specs = spec_hash["subspecs"]
+        if sub_specs != nil
+          sub_specs.each { |suc_spec|
+            begin
+              deps_hash = suc_spec["dependencies"]
+              # 删除二进制下无用的字段，目前只支持 ios 架构
+              suc_spec["vendored_frameworks"] = spec_hash["vendored_frameworks"]
+              suc_spec.delete('source_files')
+              suc_spec.delete('dependencies')
+              suc_spec.delete('osx')
+              suc_spec.delete('tvos')
+              suc_spec.delete('watchos')
+              platforms = suc_spec["platforms"]
+              platforms.delete('osx')
+              platforms.delete('tvos')
+              platforms.delete('watchos')
+              if deps_hash != nil
+                dependencies = dependencies.merge(deps_hash)
+              end
+            rescue
+            end
+          }
+        end
+
+        # 去重自己对自己的依赖
+        dependencies = dependencies.reject do |d|
+          d.start_with?("#{@spec.name}/")
+        end
+        spec_hash["dependencies"] = dependencies
+        spec_hash["subspecs"] = sub_specs
+
         # 这里不确定 vendored_libraries 指定的时动态/静态库
         # 如果是静态库的话，需要移除，否则就不移除
         # 最好是静态库都独立成 Pod ，cocoapods-package 打静态库去 collect 目标文件时好做过滤

data/lib/cocoapods-tdf-bin/helpers/upload_helper.rb

@@ -69,7 +69,7 @@ EOF
         argvs = [
             "#{binary_podsepc_json}",
             "--binary",
-            "--sources=#{sources_option(@code_dependencies, @sources)},https:\/\/cdn.cocoapods.org",
+            "--sources=#{sources_option(@code_dependencies, @sources)}",
             "--skip-import-validation",
             "--use-libraries",
             "--allow-warnings",

data/lib/cocoapods-tdf-bin/native/resolver.rb

@@ -237,8 +237,8 @@ module Pod
         end
 
         # 二进制库的个数
-        bin_spec_count = all_spec_count - sources_sepc.count
-        UI.message "组件二进制化比例 #{bin_spec_count}/#{all_spec_count}"
+        # bin_spec_count = all_spec_count - sources_sepc.count
+        # UI.message "组件二进制化比例 #{bin_spec_count}/#{all_spec_count}"
 
         specs_by_target
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tdf-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - gaijiaofan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-25 00:00:00.000000000 Z
+date: 2022-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel