cocoapods-dongjia 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19bfbd3d41dff99206d19c1e1a0ebc05dd3670a1fda433819997a65d4a3056e7
-  data.tar.gz: 2efb8d3a2756146053879dde844087c78a6ecad2731520dd9b67046f22d24b6b
+  metadata.gz: 2eadc1f8b16a2465ed7d8f1991550f1e0ab0ff0bbb450a26ea78b1eb3b839898
+  data.tar.gz: f7a945dc66e7f2473659f8fb5b65dc6b6dceccd3dce099b3ecc4cd2b3fe1ef58
 SHA512:
-  metadata.gz: b815fc7ebf07f4bb4ae6cabfbd9e612ebfb72947a65462e23f92f47f949b6e977651ff501dc2472220bc42ec3ae919af108182f5c91a5f852f4ec91371582f8c
-  data.tar.gz: 85ecf4879e0be71ca0c17060799c2d90f7381de6863ff955c5d83b5e3b615bed07cbeb247ce773c612ec3c663ff0639ab584e9ad11f0ebf47efc0f81c50d3df5
+  metadata.gz: 384450efd470d1e94ef3f6f6f8bce82f6d8dd1290ddc24b1a58f14dbfc537be27bb7d3aae79e9377cedc3487a75e17de8e63f1be184ec55cb647c1e638e39d62
+  data.tar.gz: 5ec1a4520caf8488b6ed8e4e400d3094d3fd53251b54fb28eb8aea151011215c62c01856eaffc221d465512ad5728493809552f85ac47bbc8ffdc0033f070382

data/lib/cocoapods-dongjia/gem_version.rb

@@ -1,7 +1,8 @@
 module CocoapodsDongjia
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
   UPDATE_DESC = <<-EOS
-  - 兼容 Xcode 12 工程设置
-  - 增加 release 命令
+  - 优化 install! 方法参数兼容性
+  - 关闭 incomplete-umbrella 警告
+  - 将 umbrella 导出的头文件改为尖括号形式
 EOS
 end

data/lib/cocoapods_plugin.rb

@@ -9,6 +9,7 @@ require_relative 'dongjia_scheme_manager'
 require_relative 'helper/podfile'
 require_relative 'helper/podfile_options'
 require_relative 'helper/podfile_warnings'
+require_relative 'helper/Core/podfile/dsl'
 
 module Dongjia
 

data/lib/dongjia_pods_iterator.rb

@@ -31,6 +31,10 @@ module Dongjia
 
       # 关闭 bitcode
       config.build_settings['ENABLE_BITCODE'] = "NO"
+
+      # 忽略 incomplete-umbrella 警告
+      config.build_settings['OTHER_CFLAGS'] ||= ['$(inherited)']
+      config.build_settings['OTHER_CFLAGS'] << '"-Wno-incomplete-umbrella"'
     end
 
     # 打开 LTO
@@ -38,6 +42,19 @@ module Dongjia
       config.build_settings['LLVM_LTO'] = 'YES_THIN' if config.name == 'Release'
     end
 
+    # 将 umbrella 导出的头文件改为尖括号形式
+    def self.convert_umbrella_header_import(pod_name)
+      umbrella_path = "./Pods/Target Support Files/#{pod_name}/#{pod_name}-umbrella.h"
+      return unless File.exist?(umbrella_path)
+      File.open(umbrella_path, 'r+') do |f|
+        x = f.read
+        begin x.gsub!("#import \"#{pod_name}/", "#import <#{pod_name}/").gsub!('.h"', '.h>') rescue nil end
+        begin x.gsub!('#import "', "#import <#{pod_name}/").gsub!('.h"', '.h>') rescue nil end
+        f.rewind
+        f.write(x)
+      end
+    end
+
     # 遍历所有 Pod 工程配置
     def self.iterate(params, sandbox_root)
       turn_off_warnings = params[:turn_off_warnings]
@@ -63,6 +80,7 @@ module Dongjia
           target.build_configurations.each do | config |
             disable_warnings(config, target.name) if turn_off_warnings
             enable_lto(config) if lto_enabled
+            convert_umbrella_header_import(target.name)
           end
         end
   

data/lib/dongjia_router.rb

@@ -14,6 +14,8 @@ module Dongjia
 
   注意：此处的实现仅供查看，如需修改，请点击对应的 _redirect{type} 方法跳转至对应的实现
 
+  跳转定义文档：https://cf.idongjia.cn/pages/viewpage.action?pageId=57351032
+  
 */
 
 

data/lib/helper/Core/podfile/dsl.rb

@@ -0,0 +1,16 @@
+module Pod
+  class Podfile
+    module DSL
+      # Hook Podfile 中的 install: 方法，将当前版本 Cocoapods 不支持的 option 剔除
+      original_install = instance_method(:install!)
+      define_method(:install!) do |installation_method, options = {}|
+        all_options = Installer::InstallationOptions::all_options
+        valid_options = {}
+        options.each do |k, v|
+          valid_options.merge!({k => v}) if all_options.include?(k.to_s)
+        end
+        original_install.bind(self).(installation_method, valid_options)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-dongjia
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - jiangzhuoyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-17 00:00:00.000000000 Z
+date: 2020-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,6 +90,7 @@ files:
 - lib/dongjia_router.rb
 - lib/dongjia_scheme_manager.rb
 - lib/dongjia_source.rb
+- lib/helper/Core/podfile/dsl.rb
 - lib/helper/dongjia_version_checker.rb
 - lib/helper/pod.rb
 - lib/helper/podfile.rb
@@ -101,8 +102,9 @@ licenses:
 - MIT
 metadata:
   update_desc: |2
-      - 兼容 Xcode 12 工程设置
-      - 增加 release 命令
+      - 优化 install! 方法参数兼容性
+      - 关闭 incomplete-umbrella 警告
+      - 将 umbrella 导出的头文件改为尖括号形式
 post_install_message: 
 rdoc_options: []
 require_paths: