cocoapods-dongjia 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa6197291c8d0327124cdfe9a152f5a4cddc91a15fb42571ca10c175f96fa730
-  data.tar.gz: 4e68535d83b1c174b1e01314cf00f4fecd45c0131de4fbb4b37e64ffb4504c10
+  metadata.gz: 19bfbd3d41dff99206d19c1e1a0ebc05dd3670a1fda433819997a65d4a3056e7
+  data.tar.gz: 2efb8d3a2756146053879dde844087c78a6ecad2731520dd9b67046f22d24b6b
 SHA512:
-  metadata.gz: 6d3a68721994c607cace3a8bca9bd89832887ef55646f5d9950c71c23099881f7299449cfd37940201a703116819d9173f18f99aaffa4a5dc0272ff7256ef598
-  data.tar.gz: dc481b20dc7a3505f0a089ef465a513e4e026086df1a89fe7d97563c30accab74cd6492897a8debf79645aae1ffa0ac1241bd4356584cd7b6a5567e115cda484
+  metadata.gz: b815fc7ebf07f4bb4ae6cabfbd9e612ebfb72947a65462e23f92f47f949b6e977651ff501dc2472220bc42ec3ae919af108182f5c91a5f852f4ec91371582f8c
+  data.tar.gz: 85ecf4879e0be71ca0c17060799c2d90f7381de6863ff955c5d83b5e3b615bed07cbeb247ce773c612ec3c663ff0639ab584e9ad11f0ebf47efc0f81c50d3df5

data/lib/cocoapods-dongjia/command.rb

@@ -1,5 +1,6 @@
 require 'cocoapods-dongjia/command/reinstall'
 require 'cocoapods-dongjia/command/install'
+require 'cocoapods-dongjia/command/release'
 require 'cocoapods-dongjia/command/demo'
 require 'cocoapods-dongjia/command/strip'
 require 'cocoapods-dongjia/command/open'

data/lib/cocoapods-dongjia/command/release.rb

@@ -0,0 +1,40 @@
+require 'cocoapods'
+
+module Pod
+
+  class Podfile
+    @@is_release_mode = false
+    def self.set_is_release_mode(mode)
+      @@is_release_mode = mode
+    end
+    def self.is_release_mode?
+      @@is_release_mode
+    end
+  end
+
+  class Command
+
+    class Release < Command
+
+      self.summary = '以 release 模式集成 pods'
+
+      self.description = <<-DESC
+        
+        以 release 模式集成 Pods
+        
+        可以在 Podfile 中通过 @@debug_only_pods = [pod_name] 的方式指定 debug 模式下的 Pod
+
+        当执行 pod release 时，会自动剔除 @@debug_only_pods 内所定义的 Pod
+
+      DESC
+
+      def run
+        Pod::Podfile::set_is_release_mode(true)
+        installer_for_config.install!
+      end
+
+    end
+
+  end
+
+end

data/lib/cocoapods-dongjia/command/strip.rb

@@ -111,7 +111,7 @@ module Pod
           'AlipaySDK.bundle',
           'AppIcon.appiconset',
           'KPCameraImages.xcassets',
-          'Umeng',
+          'UMSocialSDKResources.bundle',
           'LaunchResource'
         ]
         except_files = [
@@ -168,10 +168,14 @@ module Pod
 
       def run
         images = analyze(get_source_files, get_images)
-        puts "无效资源文件："
-        images.each do |img|
-          path = Pathname.new(img.fullpath).relative_path_from(Dir.pwd).to_s
-          puts "  #{path}"
+        if images.empty?
+          puts "未找到无效资源"
+        else
+          puts "无效资源文件："
+          images.each do |img|
+            path = Pathname.new(img.fullpath).relative_path_from(Dir.pwd).to_s
+            puts "  #{path}"
+          end
         end
       end
 

data/lib/cocoapods-dongjia/gem_version.rb

@@ -1,7 +1,7 @@
 module CocoapodsDongjia
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
   UPDATE_DESC = <<-EOS
-  - 修复路由抓取错误
-  - 修复 pod strip
+  - 兼容 Xcode 12 工程设置
+  - 增加 release 命令
 EOS
 end

data/lib/cocoapods_plugin.rb

@@ -6,7 +6,7 @@ require_relative 'dongjia_pods_iterator'
 require_relative 'dongjia_router'
 require_relative 'dongjia_scheme_manager'
 
-require_relative 'helper/podfile_local_importer'
+require_relative 'helper/podfile'
 require_relative 'helper/podfile_options'
 require_relative 'helper/podfile_warnings'
 

data/lib/dongjia_pods_iterator.rb

@@ -8,7 +8,7 @@ module Dongjia
     def self.disable_warnings(config, target_name)
       # 禁用非 DJ 开头 Pod 的警告
       config.build_settings['GCC_WARN_INHIBIT_ALL_WARNINGS'] = "YES" unless target_name.start_with?('DJ')
-                    
+
       # 不检测 block 中的隐式 self 调用
       config.build_settings['CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF'] = "NO"
 
@@ -24,9 +24,9 @@ module Dongjia
       # 不严格的原型校验
       config.build_settings['CLANG_WARN_STRICT_PROTOTYPES'] = "NO"
 
-      # 强制设置 deployment 版本为 8.0
-      if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 8.0
-          config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = "8.0"
+      # 强制设置 deployment 版本为 9.0
+      if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 9.0
+          config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = "9.0"
       end
 
       # 关闭 bitcode
@@ -50,9 +50,9 @@ module Dongjia
 
         if name != 'Pods.xcodeproj'
           proj.build_configurations.each do | config |
-            # 强制设置 deployment 版本为 8.0
-            if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 8.0
-              config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = "8.0"
+            # 强制设置 deployment 版本为 9.0
+            if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 9.0
+              config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = "9.0"
             end
           end
         end

data/lib/helper/podfile.rb

@@ -0,0 +1,60 @@
+require_relative 'pod'
+
+module Pod
+
+  class LocalSpec
+    @@local_spec_importing = false
+    @@local_spec_path = nil
+    def self.import_local_pod(path)
+      @@local_spec_importing = true
+      @@local_spec_path = path
+      yield if block_given?
+      @@local_spec_path = nil
+      @@local_spec_importing = false
+    end
+    def self.local_spec_importing?
+      @@local_spec_importing
+    end
+    def self.local_spec_path
+      @@local_spec_path
+    end
+  end
+
+  class Podfile
+
+    # 只在 debug 模式下集成的组件，默认为空
+    @@debug_only_pods = []
+
+    # 导入工程目录下相对位置的 pod
+    def import_relative_in(path = './')
+      LocalSpec.import_local_pod(path) do
+        yield if block_given?
+      end
+    end
+    
+    original_pod = instance_method(:pod)
+    define_method(:pod) do |name = nil, *requirements|
+
+      if Pod::Podfile::is_release_mode?
+        realname = name.split('/').first
+        if @@debug_only_pods.include?(realname)
+          puts "#{realname} is only for debug, it will be removed."
+          next
+        end
+      end
+
+      if LocalSpec.local_spec_importing?
+        path_cfg = { :path => "#{LocalSpec.local_spec_path}/#{Pod::repo_name(name)}" }
+        if requirements.length == 0
+          requirements = [path_cfg]
+        else
+          cfg = requirements.first
+          cfg.merge!(path_cfg) unless cfg.has_key?(:path)
+        end
+      end
+      original_pod.bind(self).(name, *requirements)
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-dongjia
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - jiangzhuoyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-20 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,6 +79,7 @@ files:
 - lib/cocoapods-dongjia/command/install.rb
 - lib/cocoapods-dongjia/command/open.rb
 - lib/cocoapods-dongjia/command/reinstall.rb
+- lib/cocoapods-dongjia/command/release.rb
 - lib/cocoapods-dongjia/command/strip.rb
 - lib/cocoapods-dongjia/gem_version.rb
 - lib/cocoapods_plugin.rb
@@ -91,7 +92,7 @@ files:
 - lib/dongjia_source.rb
 - lib/helper/dongjia_version_checker.rb
 - lib/helper/pod.rb
-- lib/helper/podfile_local_importer.rb
+- lib/helper/podfile.rb
 - lib/helper/podfile_options.rb
 - lib/helper/podfile_warnings.rb
 - lib/helper/project.rb
@@ -100,8 +101,8 @@ licenses:
 - MIT
 metadata:
   update_desc: |2
-      - 修复路由抓取错误
-      - 修复 pod strip
+      - 兼容 Xcode 12 工程设置
+      - 增加 release 命令
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A longer description of cocoapods-dongjia.

data/lib/helper/podfile_local_importer.rb

@@ -1,34 +0,0 @@
-require_relative 'pod'
-
-module Pod
-
-  class Podfile
-
-    # 导入工程目录下相对位置的 pod
-    @local_spec_importing = false
-    @local_spec_path = nil
-    def import_relative_in(path = './')
-      @local_spec_importing = true
-      @local_spec_path = path
-      yield if block_given?
-      @local_spec_path = nil
-      @local_spec_importing = false
-    end
-    
-    original_pod = instance_method(:pod)
-    define_method(:pod) do |name = nil, *requirements|
-      if @local_spec_importing
-        path_cfg = { :path => "#{@local_spec_path}/#{Pod::repo_name(name)}" }
-        if requirements.length == 0
-          requirements = [path_cfg]
-        else
-          cfg = requirements.first
-          cfg.merge!(path_cfg) unless cfg.has_key?(:path)
-        end
-      end
-      original_pod.bind(self).(name, *requirements)
-    end
-
-  end
-
-end