cocoapods-dongjia 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43abbc7eeff4ae649d1d4581e3ba108bd4caad1c232c13e8f7b0a4ebe4e32cbf
-  data.tar.gz: 7f09d83e057197460ac3fb6990a6ebacbbc589ff8f9cd45735501bab620f3cd4
+  metadata.gz: a829a90d465f2fa2b516712ac1edfe3f506688d30e664baf293648d7e507422f
+  data.tar.gz: e9a465b31fc018f93536c558a27556607f7f4209ce0a6489f6729a858cb76fa4
 SHA512:
-  metadata.gz: e4fbc1904a6438e2cb5e1886da95e95398e35eab4031e047771ce2132c48d8a185513710d4eabe38f81670eda1aca63298d7ac72dd29c8413e143152bae35e1f
-  data.tar.gz: 6832e07fde081a35ae4b1e8018e519339e312415f86570ade288fb3dd027467c780482e69ba2dbb70bb3b50db388efc597df6d7db6b741d06a54aaa66782ce56
+  metadata.gz: d46f8cf9df65533ab6430e4cde63c8b10786390736053019f7e6f38c77fcac95c8de92b758668f41fc2a10d299f1a7d055898889e9698d813a941e650622f0d7
+  data.tar.gz: b78824e850caf6f19aef7a713ad3a3f7a6ab144349abe26ac723b228f9e5f372976a520db6b644e6277b5f9a3f5400d14df134e3e160d4581c004c5a8e783c31

data/lib/cocoapods-dongjia/gem_version.rb

@@ -1,8 +1,6 @@
 module CocoapodsDongjia
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
   UPDATE_DESC = <<-EOS
-  - 修复警告关闭逻辑
-  - 禁用 pod 工程的 bitcode
-  - 修复引用错误
+  - 关闭静态框架依赖传递的校验
 EOS
 end

data/lib/cocoapods_plugin.rb

@@ -1,6 +1,7 @@
 require 'cocoapods-dongjia/command'
 require_relative 'dongjia_source'
-require_relative 'dongjia_inspector'
+require_relative 'dongjia_branch_inspector'
+require_relative 'dongjia_enterprise_inspector'
 require_relative 'dongjia_warning_manager'
 
 require_relative 'helper/podfile_local_importer'
@@ -19,16 +20,23 @@ module Dongjia
     # 设置是否使用私有源 [http://code.kaipao.cc/ios-team/DJSpecs]
     DongjiaSource.import(params[:use_private_source], podfile)
 
+    # 关闭静态框架依赖传递的校验
+    Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
+
   end
   
   Pod::HooksManager.register('cocoapods-dongjia', :post_install) do |ctx, params|
 
     # 关闭工程内的一些警告
-    DongjiaWarningManager.turn_off_warnings(
+    WarningManager.turn_off_warnings(
       params[:turn_off_warnings], 
       ctx.sandbox_root
     )
 
+    # 企业版文件引用校验
+    files = EnterpriseInspector.inspect()
+    Pod::UI.warn "文件未加入企业版：#{files}" if files.count > 0
+
   end
 
 end

data/lib/dongjia_enterprise_inspector.rb

@@ -0,0 +1,47 @@
+require 'xcodeproj'
+
+module Dongjia
+
+  class EnterpriseInspector
+
+    # 校验 东家 和 东家企业版 的文件
+    def self.inspect()
+
+      project_path = File.join(Dir.pwd, '东家.xcodeproj')
+
+      if !File.exist?(project_path)
+        return []
+      end
+  
+      proj = Xcodeproj::Project.open(project_path)
+  
+      target_dongjia = nil
+      target_dongjia_ent = nil
+  
+      proj.targets.each do |target|
+        if target.name == '东家'
+          target_dongjia = target
+        elsif target.name == '东家企业版'
+          target_dongjia_ent = target
+        end
+      end
+  
+      if target_dongjia == nil or target_dongjia_ent == nil
+        return []
+      end
+  
+      mismatched_files = []
+  
+      for file_ref in target_dongjia.source_build_phase.files_references
+        if !target_dongjia_ent.source_build_phase.include?(file_ref)
+          mismatched_files << file_ref.display_name
+        end
+      end
+  
+      mismatched_files
+  
+    end
+
+  end
+
+end

data/lib/dongjia_warning_manager.rb

@@ -2,7 +2,7 @@ require 'xcodeproj'
 
 module Dongjia
 
-  class DongjiaWarningManager
+  class WarningManager
 
     def self.turn_off_warnings(turn_off, sandbox_root)
       

data/lib/helper/dongjia_version_checker.rb

@@ -16,9 +16,10 @@ module Dongjia
 
         if v < latest_version
           update_desc = info['metadata']['update_desc']
-          Pod::UI.warn "cocoapods-dongjia #{latest_version} is available."
-          Pod::UI.warn "#{update_desc}"
-          Pod::UI.warn "to upgrade: [sudo] gem install cocoapods-dongjia"
+          warnings = "cocoapods-dongjia #{latest_version} is available.\n\n"
+          warnings << update_desc << "\n"
+          warnings << "To upgrade: [sudo] gem install cocoapods-dongjia\n"
+          Pod::UI.warn warnings
         end
       rescue
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-dongjia
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - jiangzhuoyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2019-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,7 +64,8 @@ files:
 - lib/cocoapods-dongjia/command/dongjia.rb
 - lib/cocoapods-dongjia/gem_version.rb
 - lib/cocoapods_plugin.rb
-- lib/dongjia_inspector.rb
+- lib/dongjia_branch_inspector.rb
+- lib/dongjia_enterprise_inspector.rb
 - lib/dongjia_source.rb
 - lib/dongjia_warning_manager.rb
 - lib/helper/dongjia_version_checker.rb
@@ -76,10 +77,7 @@ homepage: https://github.com/EXAMPLE/cocoapods-dongjia
 licenses:
 - MIT
 metadata:
-  update_desc: |2
-      - 修复警告关闭逻辑
-      - 禁用 pod 工程的 bitcode
-      - 修复引用错误
+  update_desc: "  - 关闭静态框架依赖传递的校验\n"
 post_install_message: 
 rdoc_options: []
 require_paths: