pindo 4.7.2 → 4.7.4

data/lib/pindo/module/pgyer/pgyerhelper.rb

@@ -421,6 +421,8 @@ module Pindo
                 # puts "appId #{appId}"
                 version_data = @pgyer_client.get_app_version_list_req(appId:appId) || {}
 
+                Funlog.instance.fancyinfo_success("拉取app上传记录完成!")
+
                 if version_data["data"].nil? || version_data["data"].size <=0
                     raise Informative, "#{proj_name} 错误， 没有找到上传记录"
                 end
@@ -447,7 +449,7 @@ module Pindo
 
                 end
 
-                Funlog.instance.fancyinfo_success("拉取app上传记录完成!")
+
 
                 version_item_obj = nil
                 if !app_incId_index.nil?

data/lib/pindo/module/xcode/xcodeappconfig.rb

@@ -138,7 +138,9 @@ module Pindo
             project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
             project_obj = Xcodeproj::Project.open(project_fullname) 
             presources_group = find_group(group:project_obj.main_group, group_name:"PResources")
-
+            if presources_group.nil? 
+                presources_group = find_group(group:project_obj.main_group, group_name:"PResource")
+            end
             if presources_group.nil? 
                 raise Informative, "没有找到资源目录PResources!!!!"
             end 

data/lib/pindo/module/xcode/xcodebuildhelper.rb

@@ -7,13 +7,13 @@ require 'pindo/module/cert/xcodecerthelper'
 module Pindo
 
     module XcodeBuildHelper
-    
+
         def pull_podfile_lock(project_dir:nil, app_config_dir:nil)
             begin
                 src_pod_file = File.join(app_config_dir, "Podfile.lock")
                 build_verify_file = File.join(app_config_dir, "build_verify.json")
                 build_verify_json = nil
-                begin 
+                begin
                     build_verify_json = JSON.parse(File.read(build_verify_file))
                 rescue => error
                 end
@@ -37,7 +37,7 @@ module Pindo
                 end
             rescue => error
                 raise Informative,  "获取Podfile.lock 文件失败！！！"
-            end 
+            end
         end
 
 
@@ -52,7 +52,7 @@ module Pindo
                 checksum = Digest::MD5.hexdigest(bytes)
                 build_verify_file = File.join(app_config_dir, "build_verify.json")
                 build_verify_json = nil
-                begin 
+                begin
                     build_verify_json = JSON.parse(File.read(build_verify_file))
                 rescue => error
                 end
@@ -61,7 +61,7 @@ module Pindo
                 build_verify_json["output_config_commit"] = git_latest_commit_id(local_repo_dir:app_config_dir)
                 build_verify_json["output_podfile_checksum"] = checksum
                 build_verify_json["output_time"] = Time.now.strftime('%y/%m/%d %H:%M:%S')
-                
+
                 File.open(build_verify_file, "w") do |file|
                     file.write(JSON.pretty_generate(build_verify_json))
                     file.close
@@ -70,26 +70,26 @@ module Pindo
 
           rescue => error
               raise Informative,  "保存Podfile.lock 文件失败！！！"
-          end 
+          end
         end
 
         def install_google_plist(project_dir:nil, app_config_dir:nil)
 
             project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
-            project_obj = Xcodeproj::Project.open(project_fullname) 
+            project_obj = Xcodeproj::Project.open(project_fullname)
             select_target = project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
             file_ref = select_target.resources_build_phase.files_references.select { |file| file.display_name.include?("GoogleService-Info.plist") }.first
-            
+
             if !file_ref.nil?
                 xcode_googleinfo_path = file_ref.real_path
-                
-                if !File.exist?(File.join(app_config_dir, "GoogleService-Info.plist")) 
+
+                if !File.exist?(File.join(app_config_dir, "GoogleService-Info.plist"))
                     raise Informative, "缺少 GoogleService-Info.plist ==> #{app_config_dir}!!!"
                 else
                     FileUtils.cp(File.join(app_config_dir, "GoogleService-Info.plist"), xcode_googleinfo_path)
                 end
-                
-                if !File.exist?(xcode_googleinfo_path) 
+
+                if !File.exist?(xcode_googleinfo_path)
                     raise Informative, "拷贝 GoogleService-Info.plist 失败！！==> #{xcode_googleinfo_path}!!!"
                 end
             end
@@ -120,7 +120,7 @@ module Pindo
                 target_name_map = get_target_name_map
                if target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])
                     target.build_configurations.each do |config|
-                        config.build_settings['PRODUCT_NAME'] = exe_binary_name 
+                        config.build_settings['PRODUCT_NAME'] = exe_binary_name
                         config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = ios_deployment_targe
                     end
                 elsif
@@ -151,64 +151,67 @@ module Pindo
                 if !info_plist_dict["CFBundleName"].nil?
                     info_plist_dict["CFBundleName"] = exe_binary_name
                 end
-                
-                if config_json['app_info']["imessage_display_name"] && target_name && target_name.end_with?("iMessage") 
+
+                if config_json['app_info']["imessage_display_name"] && target_name && target_name.end_with?("iMessage")
                     info_plist_dict["CFBundleDisplayName"] = config_json['app_info']["imessage_display_name"]
                 end
-                if config_json['app_info']["extension_display_name"] && target_name && target_name.end_with?("Extension") 
+                if config_json['app_info']["extension_display_name"] && target_name && target_name.end_with?("Extension")
                     info_plist_dict["CFBundleDisplayName"] = config_json['app_info']["extension_display_name"]
                 end
 
 
-                if config_json['app_info']["extensionad_display_name"] && target_name && target_name.end_with?("ExtensionAd") 
+                if config_json['app_info']["extensionad_display_name"] && target_name && target_name.end_with?("ExtensionAd")
                     info_plist_dict["CFBundleDisplayName"] = config_json['app_info']["extensionad_display_name"]
                 end
 
-                if config_json['app_info']["extensionporn_display_name"] && target_name && target_name.end_with?("ExtensionPorn") 
+                if config_json['app_info']["extensionporn_display_name"] && target_name && target_name.end_with?("ExtensionPorn")
                     info_plist_dict["CFBundleDisplayName"] = config_json['app_info']["extensionporn_display_name"]
                 end
-                
-                if config_json['app_info']["keyboard_display_name"] && target_name && target_name.end_with?("Keyboard") 
+
+                if config_json['app_info']["keyboard_display_name"] && target_name && target_name.end_with?("Keyboard")
                     info_plist_dict["CFBundleDisplayName"] = config_json['app_info']["keyboard_display_name"]
                 end
-                
 
-                if config_json['app_info']["siri_display_name"] && target_name && target_name.end_with?("Keyboard") 
+
+                if config_json['app_info']["siri_display_name"] && target_name && target_name.end_with?("Keyboard")
                     info_plist_dict["CFBundleDisplayName"] = config_json['app_info']["siri_display_name"]
                 end
 
-                if config_json['app_info']["siriui_display_name"] && target_name && target_name.end_with?("iMessage") 
+                if config_json['app_info']["siriui_display_name"] && target_name && target_name.end_with?("iMessage")
                     info_plist_dict["CFBundleDisplayName"] = config_json['app_info']["siriui_display_name"]
                 end
-                
+
 
 
                 unless config_json['app_info']["app_version"]
                     raise Informative, "config.json Missing app_info app_version !!!"
-                end 
+                end
 
                 info_plist_dict["CFBundleShortVersionString"] = config_json['app_info']["app_version"]
 
                 unless config_json['app_info']["app_build_version"]
                     raise Informative, "config.json Missing app_info app_build_version !!!"
-                end 
+                end
                 info_plist_dict["CFBundleVersion"] = config_json['app_info']["app_build_version"]
                 Xcodeproj::Plist.write_to_path(info_plist_dict, plist_file_name)
             end
         end
 
-        
+
         def modify_maintarget_info_plist(plist_file_name:nil, config_json:nil, target_name:nil)
             if File.exist?(plist_file_name)
                 info_plist_dict = Xcodeproj::Plist.read_from_path(plist_file_name)
 
                 info_plist_dict.delete("AccountKitClientToken")
-                
-                if info_plist_dict["Fabric"] 
+
+                if info_plist_dict["Fabric"]
                     info_plist_dict.delete('Fabric')
                 end
 
-                
+                if info_plist_dict["UIRequiredDeviceCapabilities"] && !info_plist_dict["UIRequiredDeviceCapabilities"].first.nil? && info_plist_dict["UIRequiredDeviceCapabilities"].first == "armv7"
+                    raise Informative, "Info.plist里面有多余的Key  UIRequiredDeviceCapabilities  armv7"
+                end
+
                 if !config_json['app_info']['admob_app_id'].nil? && config_json['app_info']['admob_app_id'].include?("__________config")
                     raise Informative, "config.json 配置文件key :admob_app_id 包含初始值未修改, 配置正确的值或者删除！！！"
                 end
@@ -217,7 +220,7 @@ module Pindo
                     raise Informative, "工程Info.plist中有 Admob 配置，config.json缺少 Admob 配置参数！！！"
                 end
 
-                if !config_json['app_info']['admob_app_id'].nil? 
+                if !config_json['app_info']['admob_app_id'].nil?
                     info_plist_dict["GADApplicationIdentifier"] = config_json['app_info']['admob_app_id']
                 end
 
@@ -227,7 +230,7 @@ module Pindo
                 if !config_json['app_info']['applovin_app_id'].nil? && config_json['app_info']['applovin_app_id'].include?("__________config")
                     raise Informative, "config.json 配置文件key :applovin_app_id 包含初始值未修改, 配置正确的值或者删除！！！"
                 end
-                
+
                 if !info_plist_dict["AppLovinSdkKey"].nil? && config_json['app_info']['applovin_app_id'].nil?
                     raise Informative, "工程Info.plist中有 AppLovin 配置，config.json缺少 AppLovin 配置参数！！！"
                 end
@@ -246,10 +249,10 @@ module Pindo
                 #     info_plist_dict.delete('AppLovinSdkKey')
                 # end
 
-            
 
-                
-                
+
+
+
                 info_plist_dict["CFBundleURLTypes"] = []
                 item0 = {}
                 item0["CFBundleTypeRole"] = "Editor"
@@ -257,7 +260,7 @@ module Pindo
                 item0["CFBundleURLSchemes"] = []
                 item0["CFBundleURLSchemes"] << "$(PRODUCT_BUNDLE_IDENTIFIER)"
                 info_plist_dict["CFBundleURLTypes"] << item0
-                
+
                 if config_json['app_info'] && config_json['app_info']['facebook_app_id']
                     info_plist_dict["FacebookAppID"] = config_json['app_info']['facebook_app_id']
                     if config_json['app_info']['facebook_client_token'].nil?
@@ -294,7 +297,7 @@ module Pindo
                 info_plist_path = File.join(project_dir, temp_info)
 
                 if target.product_type.to_s.eql?("com.apple.product-type.application") &&  !File.exist?(info_plist_path)
-                    raise Informative, "Missing Target #{target.name.to_s} Info.plist !!! Modify Info.plist Error !!!"                
+                    raise Informative, "Missing Target #{target.name.to_s} Info.plist !!! Modify Info.plist Error !!!"
                 end
 
                 if target.product_type.to_s.eql?("com.apple.product-type.application") then

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "4.7.2"
+  	VERSION = "4.7.4"
 
   	class VersionCheck
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 4.7.2
+  version: 4.7.4
 platform: ruby
 authors:
 - wade
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -119,7 +119,7 @@ dependencies:
         version: 0.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -129,7 +129,7 @@ dependencies:
         version: 0.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.9
 - !ruby/object:Gem::Dependency
   name: rqrcode
   requirement: !ruby/object:Gem::Requirement