cocoapods-pod-sign 1.1.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87f97e51c175c7afdb25dd252fb52888f96cdb95824289bbaf140c80ae22a8dc
-  data.tar.gz: c0d2b2f4c5e9ece5fd7a773caf16b296052908de731410fcf5fb63f0d2f81916
+  metadata.gz: ae36027d6261be7b237768a00b5522befd9687e7910413a952b38ebce7cfd505
+  data.tar.gz: e1553b504f0c5f5e3b7879451becbd6996f51d54dbb296fab6746a229f5b8b54
 SHA512:
-  metadata.gz: 86ac85406eb0030b850839495e7fd2ca176a375baa65551b3835af64fc179d90faf0b3a2ff56ec5d89ef1afb2dbee2fe7768dcc2ebc5307b2648fb887dd437e2
-  data.tar.gz: 01c4200dc623bd4bda85672251388be6f6fa5fa9f8bd97a77f63ce3f93897a75b2f6cf729f37df67fb4c2976a4577bfd2879c75f922713e005cd753eff55a9dc
+  metadata.gz: 5d25d0e96784f72f2f10be216aa2db1d86237fc1af1477df6a2314f6e8f56a8b228a5e355b674f245197869c50950c0ded0258b45b1e0c27258ba5530f092e00
+  data.tar.gz: 326b654ca7da559bb9487dd8b5f4dfd948e68f10938ceb84757ba27a43a268a866025a6a3d16bb3bd47a526c2af53a8780729943181f8dd4803e7ba43ebb8f68

data/README.md

@@ -10,11 +10,22 @@ cocoapods-pod-sign is a tool to help you set cocopads bundle identifier and team
 
 ## Usage
 
+### Recommended
+
+I have received several user feedback encountering errors. I just added a new method to skip the signature. I recommend using the skip signature setting.
+
+```
+plugin 'cocoapods-pod-sign'
+skip_pod_bundle_sign
+```
+
+## No recommended
+
 There are two ways to use it, one is to automatically obtain the bundle identifier and team, and the other is to set it manually.
 
 ### Automatically
 
-Just write the following code into the Podfile, it will automatically read the bundle identifier and team from the main project.
+Just write the following code into the Podfile, it will automatically read the bundle identifier（version 2.x.x  no longer sets bundle identifier） and team from the main project.
 
     plugin 'cocoapods-pod-sign'
 

data/example/podSign/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    cocoapods-pod-sign (1.1.1)
+    cocoapods-pod-sign (1.3.0)
 
 GEM
   remote: https://rubygems.org/

data/example/podSign/Podfile

@@ -6,8 +6,10 @@ target 'podSign' do
   # Comment the next line if you don't want to use dynamic frameworks
   # use_frameworks!
   
-  plugin 'cocoapods-pod-sign'
+  plugin 'cocoapods-pod-sign' # automatically read the bundle identifier（version 2.x.x  no longer sets bundle identifier） and team from the main project.
+  skip_pod_bundle_sign # forbid pod sign
   
+  # manually specify the bundle identifier and team under different configs
 #  config_pod_bundle_id_and_team_id({
 #    'Debug' => {:bundle_id => 'com.aaa.bbb', :team_id => 'ABCDEFG'},
 #    'Release' => {:bundle_id => 'com.ccc.ddd', :team_id => 'HIJKLMN'},

data/example/podSign/Podfile.lock

@@ -0,0 +1,16 @@
+PODS:
+  - bundleSign (0.1.0)
+
+DEPENDENCIES:
+  - bundleSign (from `./bundleSign`)
+
+EXTERNAL SOURCES:
+  bundleSign:
+    :path: "./bundleSign"
+
+SPEC CHECKSUMS:
+  bundleSign: 8fa720adfff2d8b5873bb9ca197d670614cce05f
+
+PODFILE CHECKSUM: 06f86eec5843bf02524d3efd1c1c857234a1aa84
+
+COCOAPODS: 1.10.2

data/lib/cocoapods-pod-sign/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPodSign
-  VERSION = "1.1.2"
+  VERSION = "1.3.0"
 end

data/lib/cocoapods-pod-sign/pod_installer.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'cocoapods-pod-sign/pod_sign_storage'
 
 module Pod
   class Installer
@@ -6,7 +7,9 @@ module Pod
     alias_method :origin_run_podfile_post_install_hook, :run_podfile_post_install_hook
     def run_podfile_post_install_hook
 
-      pod_sign_extract_bundle_id_and_team_id_from_user_project if $pod_sign_configurations_hash.empty?
+      storage = PodSignStorage.instance
+
+      pod_sign_extract_team_id_from_user_project if storage.configurations.empty? && !storage.skip_sign
 
       targets = if installation_options.generate_multiple_pod_projects
                   pod_target_subprojects.flat_map { |p| p.targets }
@@ -17,10 +20,14 @@ module Pod
         next unless target.respond_to?('product_type') && target.product_type == 'com.apple.product-type.bundle'
 
         target.build_configurations.each do |config|
-          sign_config = $pod_sign_configurations_hash[config.name]
+          if storage.skip_sign
+            config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
+            next
+          end
+          sign_config = storage.configurations[config.name]
           next unless sign_config.instance_of?(Hash)
 
-          config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = sign_config[:bundle_id]
+          config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = sign_config[:bundle_id] unless sign_config[:bundle_id].nil?
           config.build_settings['DEVELOPMENT_TEAM'] = sign_config[:team_id]
           config.build_settings['CODE_SIGN_STYLE'] = if sign_config[:sign_style]
                                                        sign_config[:sign_style]
@@ -41,7 +48,7 @@ module Pod
 
     private
 
-    def pod_sign_extract_bundle_id_and_team_id_from_user_project
+    def pod_sign_extract_team_id_from_user_project
       target = aggregate_targets.first.user_project.root_object.targets.first
       target&.build_configurations&.each do |config|
           xcconfig_hash ||=
@@ -50,23 +57,22 @@ module Pod
             else
               {}
             end
-          pod_sign_extract_bundle_id_and_team_id(xcconfig_hash, config.name)
-          pod_sign_extract_bundle_id_and_team_id(config.build_settings, config.name)
+          pod_sign_extract_team_id(xcconfig_hash, config.name)
+          pod_sign_extract_team_id(config.build_settings, config.name)
         end
     end
 
-    def pod_sign_extract_bundle_id_and_team_id(build_settings, config_name)
-      bundle_id = build_settings['PRODUCT_BUNDLE_IDENTIFIER']
+    def pod_sign_extract_team_id(build_settings, config_name)
       team_id = build_settings['DEVELOPMENT_TEAM']
       sign_style = build_settings['CODE_SIGN_STYLE']
       sign_identity = build_settings['CODE_SIGN_IDENTITY']
-      return unless bundle_id && team_id && config_name
+      return unless team_id && config_name
+
+      storage = PodSignStorage.instance
+      storage.configurations[config_name] = { team_id: team_id,
+                                              sign_style: sign_style,
+                                              sign_identity: sign_identity }
 
-      $pod_sign_configurations_hash[config_name] = { bundle_id: bundle_id,
-                                                     team_id: team_id,
-                                                     sign_style: sign_style,
-                                                     sign_identity: sign_identity }
-      
     end
   end
 end

data/lib/cocoapods-pod-sign/pod_sign_storage.rb

@@ -0,0 +1,22 @@
+require 'singleton'
+
+class PodSignStorage
+  include Singleton
+
+  attr_writer :skip_sign
+  attr_writer :configurations
+
+  def skip_sign
+    return @skip_sign if defined?(@skip_sign)
+
+    @skip_sign = false
+  end
+
+  def configurations
+    return @configurations if defined?(@configurations)
+
+    @configurations = {}
+  end
+end
+
+

data/lib/cocoapods-pod-sign/podfile_dsl.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
-$pod_sign_configurations_hash = {}
+require 'cocoapods-pod-sign/pod_sign_storage'
+
 module Pod
   class Podfile
     module DSL
@@ -21,7 +22,13 @@ module Pod
           end
         end
         UI.info 'config_pod_bundle_id_and_team_id parameters setup success'
-        $pod_sign_configurations_hash = configurations
+        storage = PodSignStorage.instance
+        storage.configurations = configurations
+      end
+
+      def skip_pod_bundle_sign
+        storage = PodSignStorage.instance
+        storage.skip_sign = true
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-pod-sign
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.3.0
 platform: ruby
 authors:
 - wosicuanqi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-02 00:00:00.000000000 Z
+date: 2022-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,6 +54,7 @@ files:
 - example/podSign/Gemfile
 - example/podSign/Gemfile.lock
 - example/podSign/Podfile
+- example/podSign/Podfile.lock
 - example/podSign/bundleSign/.gitignore
 - example/podSign/bundleSign/.travis.yml
 - example/podSign/bundleSign/Example/Podfile
@@ -103,6 +104,7 @@ files:
 - lib/cocoapods-pod-sign.rb
 - lib/cocoapods-pod-sign/gem_version.rb
 - lib/cocoapods-pod-sign/pod_installer.rb
+- lib/cocoapods-pod-sign/pod_sign_storage.rb
 - lib/cocoapods-pod-sign/podfile_dsl.rb
 - lib/cocoapods_plugin.rb
 - spec/command/sign_spec.rb