pindo 5.18.13 → 5.18.20

data/lib/pindo/module/android/workflow_gradle_injector.rb

@@ -98,6 +98,16 @@ module Pindo
           if enable_pad
             pad_backup!(context)
             run_pad!(context)
+
+            # 临时 PAD 默认会在 cleanup! 中恢复备份并删除 created_dirs（即 *_pack），以实现回滚。
+            # 但某些工程会在构建结束后用“基线文件/外部备份”覆盖当前 build.gradle，
+            # 若该基线不包含 assetPacks/include，会导致引用丢失。
+            #
+            # 当显式开启 PINDO_PAD_KEEP_REFS=1 时：
+            # - 将 PAD 写入后的 settings.gradle / launcher/build.gradle 同步进备份快照，
+            #   以确保 cleanup! 恢复后仍保留 assetPacks/include；
+            # - 同时 cleanup! 将跳过删除 created_dirs，保留 *_pack 目录，保持工程可 sync。
+            sync_pad_refs_to_backups!(context) if pad_keep_refs_enabled?
           end
 
           # 2) 注入 buildType/signingConfig（对所有 Android modules）
@@ -242,15 +252,26 @@ module Pindo
         backups.each do |item|
           path = File.join(project_dir, item.fetch("path"))
           backup_path = File.join(project_dir, item.fetch("backup_path"))
-          next unless File.file?(backup_path)
 
-          FileUtils.mkdir_p(File.dirname(path))
-          bin_copy(backup_path, path)
+          if item["type"] == "dir"
+            next unless File.directory?(backup_path)
+            FileUtils.rm_rf(path) if File.exist?(path)
+            FileUtils.mkdir_p(File.dirname(path))
+            FileUtils.cp_r(backup_path, path)
+          else
+            next unless File.file?(backup_path)
+            FileUtils.mkdir_p(File.dirname(path))
+            bin_copy(backup_path, path)
+          end
         end
 
-        (data["created_dirs"] || []).each do |rel|
-          abs = File.join(project_dir, rel)
-          FileUtils.rm_rf(abs) if abs.start_with?(project_dir.to_s)
+        # 临时 PAD 默认会清理 created_dirs（通常是 *_pack）。
+        # 若显式开启 PINDO_PAD_KEEP_REFS=1，则保留 pack 目录与引用，避免构建结束后被外部基线覆盖而丢引用。
+        unless ENV.fetch("PINDO_PAD_KEEP_REFS", "").to_s.strip.downcase.match?(/\A(1|true|yes|on)\z/)
+          (data["created_dirs"] || []).each do |rel|
+            abs = File.join(project_dir, rel)
+            FileUtils.rm_rf(abs) if abs.start_with?(project_dir.to_s)
+          end
         end
       end
 
@@ -529,7 +550,6 @@ module Pindo
       def groovy_signing_config_entry(workflow_name:, workflow_build_type:, signing_config_name:)
         lines = []
         lines << "// #{MARK_BEGIN}"
-        lines << "// workflowName=#{workflow_name.inspect}"
         lines << "#{signing_config_name} {"
         lines << "    def signingEnvVars = #{RELEASE_SIGNING_ENV_VARS.inspect}"
         lines << "    def hasCompleteReleaseSigningEnv = signingEnvVars.every { System.getenv(it) }"
@@ -553,7 +573,6 @@ module Pindo
       def kts_signing_config_entry(workflow_name:, workflow_build_type:, signing_config_name:)
         lines = []
         lines << "// #{MARK_BEGIN}"
-        lines << "// workflowName=#{workflow_name.inspect}"
         lines << "create(\"#{signing_config_name}\") {"
         lines << "    val signingEnvVars = listOf("
         RELEASE_SIGNING_ENV_VARS.each_with_index do |v, idx|
@@ -582,7 +601,6 @@ module Pindo
       def groovy_build_type_entry(workflow_name:, workflow_build_type:, signing_config_name:, is_main_module:)
         lines = []
         lines << "// #{MARK_BEGIN}"
-        lines << "// workflowName=#{workflow_name.inspect}"
         lines << "#{workflow_build_type} {"
         lines << "    minifyEnabled false"
         if is_main_module
@@ -597,7 +615,6 @@ module Pindo
       def kts_build_type_entry(workflow_name:, workflow_build_type:, signing_config_name:, is_main_module:)
         lines = []
         lines << "// #{MARK_BEGIN}"
-        lines << "// workflowName=#{workflow_name.inspect}"
         lines << "create(\"#{workflow_build_type}\") {"
         lines << "    isMinifyEnabled = false"
         if is_main_module
@@ -743,7 +760,7 @@ module Pindo
         end.join
       end
 
-      def backup_file!(context, abs_path)
+      def backup_file!(context, abs_path, force: false)
         project_dir = context[:project_dir]
         return unless abs_path && File.file?(abs_path)
         return unless abs_path.start_with?(project_dir.to_s)
@@ -751,7 +768,10 @@ module Pindo
         rel = abs_path.delete_prefix("#{project_dir}/")
 
         # 已备份过就跳过
-        return if context[:backups].any? { |b| b["path"] == rel && b["type"] == "file" }
+        if (existing = context[:backups].find { |b| b["path"] == rel && b["type"] == "file" })
+          return unless force
+          context[:backups].delete(existing)
+        end
 
         backup_path = File.join(context[:backup_dir], rel)
         FileUtils.mkdir_p(File.dirname(backup_path))
@@ -765,6 +785,22 @@ module Pindo
         }
       end
 
+      def pad_keep_refs_enabled?
+        ENV.fetch("PINDO_PAD_KEEP_REFS", "").to_s.strip.downcase.match?(/\A(1|true|yes|on)\z/)
+      end
+
+      def sync_pad_refs_to_backups!(context)
+        project_dir = context[:project_dir]
+
+        settings = find_settings_gradle(project_dir)
+        backup_file!(context, settings, force: true) if settings
+
+        launcher_groovy = File.join(project_dir, "launcher", "build.gradle")
+        launcher_kts = File.join(project_dir, "launcher", "build.gradle.kts")
+        backup_file!(context, launcher_kts, force: true) if File.file?(launcher_kts)
+        backup_file!(context, launcher_groovy, force: true) if File.file?(launcher_groovy)
+      end
+
       def self.bin_copy(src, dst)
         File.open(src, "rb") do |r|
           File.open(dst, "wb") do |w|

data/lib/pindo/module/appstore/appstore_in_app_purchase.rb

@@ -186,9 +186,9 @@ module Pindo
                 begin
                     response = appstore_client.create_in_app_purchase(
                     name:purchase_item["reference_name"],
-                    product_id:purchase_item["product_id"],
-                    in_app_purchase_type:purchase_item["in_app_purchase_type"],
-                    review_note:purchase_item["review_note"],
+                    productId:purchase_item["product_id"],
+                    inAppPurchaseType:purchase_item["in_app_purchase_type"],
+                    reviewNote:purchase_item["review_note"],
                     relationships: {
                         app:{
                             data:{
@@ -228,7 +228,7 @@ module Pindo
             begin
                 response = appstore_client.update_in_app_purchase(
                     name:purchase_item["reference_name"],
-                    review_note:purchase_item["review_note"],
+                    reviewNote:purchase_item["review_note"],
                     id:in_app_purchase_id
                 )
             rescue => err
@@ -255,22 +255,34 @@ module Pindo
                 end
             end
 
-            response = appstore_client.modify_in_app_purchase_territory_availablity(
-                            available_in_new_territories:true,
-                            relationships: {
-                                inAppPurchase:{
-                                    data:{
-                                        id: in_app_purchase_id,
-                                        type: 'inAppPurchases'
-                                    }
-                                },
-                                availableTerritories:{
-                                    data:availableTerritories_data
-                                }
+            body = {
+                data: {
+                    type: "inAppPurchaseAvailabilities",
+                    attributes: {
+                        availableInNewTerritories: true
+                    },
+                    relationships: {
+                        inAppPurchase: {
+                            data: {
+                                id: in_app_purchase_id,
+                                type: 'inAppPurchases'
                             }
-                        )
+                        },
+                        availableTerritories: {
+                            data: availableTerritories_data
+                        }
+                    }
+                }
+            }
 
-           # puts JSON.pretty_generate(response)
+            begin
+                client = Spaceship::ConnectAPI
+                client.tunes_request_client.post("#{Spaceship::ConnectAPI::Tunes::API::Version::V1}/inAppPurchaseAvailabilities", body)
+                puts "          Territory Availability 设置成功"
+            rescue => err
+                puts err
+                puts "      设置Territory Availability失败！！！"
+            end
 
         end
 
@@ -396,7 +408,7 @@ module Pindo
                 if !price_id.nil?
                    purchase_response = appstore_client.create_in_app_purchase_price_schedule(
                         relationships: {
-                            manual_prices: {
+                            manualPrices: {
                                 data: [
                                     {
                                         type: 'inAppPurchasePrices',
@@ -404,7 +416,7 @@ module Pindo
                                     }
                                 ]
                             },
-                            in_app_purchase: {
+                            inAppPurchase: {
                                 data: {
                                     type: 'inAppPurchases',
                                     id: in_app_purchase_id
@@ -488,8 +500,8 @@ module Pindo
 
                             puts "          正在上传...."
                             response_iap_screenshot = appstore_client.create_in_app_purchase_review_screenshot(
-                                file_name:filename,
-                                file_size: filesize,
+                                fileName:filename,
+                                fileSize: filesize,
                                 relationships: {
                                     inAppPurchaseV2:{
                                         data:{
@@ -519,7 +531,7 @@ module Pindo
                             in_app_purchase = appstore_client.update_in_app_purchase_app_store_review_screenshot(
                                 id:upload_id,
                                 uploaded: true,
-                                source_file_checksum:checksum
+                                sourceFileChecksum:checksum
                             )
                             puts "          上传完成！！"
 
@@ -632,7 +644,7 @@ module Pindo
 
             begin
                 group_response = appstore_client.create_subscription_group(
-                    reference_name:subscription_group_item["group_reference_name"],
+                    referenceName:subscription_group_item["group_reference_name"],
                      relationships: {
                                     app:{
                                         data:{
@@ -684,7 +696,7 @@ module Pindo
                                         response = appstore_client.update_subscription_group_localization(
                                             id:locale_item["locale_id"],
                                             name:locale_item["group_display_name"],
-                                            custom_app_name:locale_item["custom_app_name"]
+                                            customAppName:locale_item["custom_app_name"]
                                         )
                                         # puts JSON.pretty_generate(response)
 
@@ -693,7 +705,7 @@ module Pindo
                             response = appstore_client.create_subscription_group_localization(
                                     name:locale_item["group_display_name"],
                                     locale:locale,
-                                    custom_app_name:locale_item["custom_app_name"],
+                                    customAppName:locale_item["custom_app_name"],
                                     relationships: {
                                                 subscriptionGroup:{
                                                     data:{
@@ -881,11 +893,11 @@ module Pindo
                 begin
                     response = appstore_client.create_subscription(
                         name:subscription_item["reference_name"],
-                        product_id:subscription_item["product_id"],
-                        family_sharable:false,
-                        review_note:subscription_item["review_note"],
-                        subscription_period:subscription_item["subscription_duration"],
-                        group_level:1,
+                        productId:subscription_item["product_id"],
+                        familySharable:false,
+                        reviewNote:subscription_item["review_note"],
+                        subscriptionPeriod:subscription_item["subscription_duration"],
+                        groupLevel:1,
                         relationships: {
                             group:{
                                 data:{
@@ -928,9 +940,9 @@ module Pindo
                 response = appstore_client.update_subscription(
                         id:subscription_id,
                         name:subscription_item["reference_name"],
-                        family_sharable:false,
-                        review_note:subscription_item["review_note"],
-                        group_level:1
+                        familySharable:false,
+                        reviewNote:subscription_item["review_note"],
+                        groupLevel:1
                 )
                 # puts JSON.pretty_generate(response)
 
@@ -962,7 +974,7 @@ module Pindo
                 puts "      设置订阅的周期: #{subscription_item["subscription_duration"]}"
                 response = appstore_client.update_subscription(
                         id:subscription_id,
-                        subscription_period:subscription_item["subscription_duration"]
+                        subscriptionPeriod:subscription_item["subscription_duration"]
                 )
                 # puts JSON.pretty_generate(response)
 
@@ -998,22 +1010,34 @@ module Pindo
                     availableTerritories_data << new_territory_item
                 end
             end
-           response = appstore_client.modify_subscription_territory_availability(
-                            available_in_new_territories:true,
-                            relationships: {
-                                subscription:{
-                                    data:{
-                                        id: subscription_id,
-                                        type: 'subscriptions'
-                                    }
-                                },
-                                availableTerritories:{
-                                    data:availableTerritories_data
-                                }
+            body = {
+                data: {
+                    type: "subscriptionAvailabilities",
+                    attributes: {
+                        availableInNewTerritories: true
+                    },
+                    relationships: {
+                        subscription: {
+                            data: {
+                                id: subscription_id,
+                                type: 'subscriptions'
                             }
-                        )
+                        },
+                        availableTerritories: {
+                            data: availableTerritories_data
+                        }
+                    }
+                }
+            }
 
-           # puts JSON.pretty_generate(response)
+            begin
+                client = Spaceship::ConnectAPI
+                client.tunes_request_client.post("#{Spaceship::ConnectAPI::Tunes::API::Version::V1}/subscriptionAvailabilities", body)
+                puts "          Territory Availability 设置成功"
+            rescue => err
+                puts err
+                puts "      设置订阅的Territory Availability失败！！！"
+            end
         end
 
 
@@ -1624,8 +1648,8 @@ module Pindo
 
                     response = appstore_client.create_subscription_introductory_offer(
                         duration:"THREE_DAYS",
-                        number_of_periods:1,
-                        offer_mode:'FREE_TRIAL',
+                        numberOfPeriods:1,
+                        offerMode:'FREE_TRIAL',
                         relationships: {
                                 subscription: {
                                     data: {
@@ -1688,7 +1712,7 @@ module Pindo
                 if !price_point_id.nil?
 
                         respose_price = appstore_client.create_subscription_price(
-                            preserve_current_price:true,
+                            preserveCurrentPrice:true,
                             relationships: {
                                 subscription: {
                                     data: {
@@ -1733,7 +1757,7 @@ module Pindo
                                     puts "          " + index_item.to_s + ".更新价格 地区:" + territory_id+ "  价格:" + price_local_item[:attributes][:customer_price]
 
                                     respose_price = appstore_client.create_subscription_price(
-                                        preserve_current_price:true,
+                                        preserveCurrentPrice:true,
                                         relationships: {
                                             subscription: {
                                                 data: {
@@ -1814,8 +1838,8 @@ module Pindo
 
                         puts "          正在上传...."
                         response_iap_screenshot = appstore_client.create_subscription_review_screenshot(
-                            file_name:filename,
-                            file_size: filesize,
+                            fileName:filename,
+                            fileSize: filesize,
                             relationships: {
                                 subscription:{
                                     data:{
@@ -1848,7 +1872,7 @@ module Pindo
                             in_app_purchase = appstore_client.update_subscription_review_screenshot(
                                 id:upload_id,
                                 uploaded: true,
-                                source_file_checksum:checksum
+                                sourceFileChecksum:checksum
                             )
                             puts "          上传完成！！"
                             # puts JSON.pretty_generate(in_app_purchase)

data/lib/pindo/module/task/model/build/ios_build_adhoc_task.rb

@@ -50,36 +50,10 @@ module Pindo
         load_ios_config
 
         # 1.5 获取 AdHoc 配置目录并合并配置
-        adhoc_config_dir = nil
-        begin
-          config_parser = Pindo::IosConfigParser.instance
-          config_json = config_parser.config_json
-
-          # 根据 app_type 获取 AdHoc 配置仓库
-          if config_json && config_json['project_info'] && config_json['project_info']['app_type']
-            require 'pindo/config/build_info_manager'
-
-            build_info_manager = Pindo::BuildInfoManager.share_instance
-            adhoc_repo_name = build_info_manager.get_deploy_repo_with_modul_name(
-              module_name: config_json['project_info']['app_type']
-            )
-
-            if adhoc_repo_name.nil? || adhoc_repo_name.empty?
-              raise Informative, "config.json app_type is error!!!"
-            end
-
-            # 克隆 AdHoc 配置仓库
-            adhoc_config_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: adhoc_repo_name)
-
-            # 合并 AdHoc 配置
-            config_parser.modify_config_with_adhoc(adhoc_config_dir: adhoc_config_dir)
-          else
-            puts "配置中缺少 app_type，跳过 AdHoc 配置合并"
-          end
-        rescue => e
-          puts "获取 AdHoc 配置失败: #{e.message}"
-          adhoc_config_dir = nil
-        end
+        # 复用 BuildInfoManager（命令层在导出前可能已合并过，幂等短路直接返回缓存目录）
+        # 合并失败 fail-fast：抛 Informative 由 TaskManager 标记任务失败
+        require 'pindo/config/build_info_manager'
+        adhoc_config_dir = Pindo::BuildInfoManager.share_instance.merge_adhoc_config_into_parser
 
         # 2. 自动增加版本号
         auto_increase_buildnumber

data/lib/pindo/module/task/model/build/ios_build_dev_task.rb

@@ -78,11 +78,21 @@ module Pindo
           latest_output = all_outputs.max_by { |f| File.mtime(f) }
           output_type = latest_output.end_with?('.ipa') ? 'IPA' : 'APP'
           puts "  找到 #{output_type} 文件: #{latest_output}"
-          latest_output
-        else
-          puts "  警告: 未找到 IPA 或 APP 文件"
-          nil
+          return latest_output
+        end
+
+        # 命令行工具产物为裸可执行文件（build 根目录下无扩展名的普通文件）
+        tool_outputs = Dir.glob(File.join(build_dir, "*")).select do |f|
+          File.file?(f) && File.extname(f).empty?
         end
+        if tool_outputs.any?
+          latest_output = tool_outputs.max_by { |f| File.mtime(f) }
+          puts "  找到命令行工具可执行文件: #{latest_output}"
+          return latest_output
+        end
+
+        puts "  警告: 未找到 IPA / APP / 可执行文件"
+        nil
       end
 
       # 处理 CocoaPods 依赖（Dev 构建）

data/lib/pindo/module/task/model/git/git_commit_task.rb

@@ -107,8 +107,22 @@ module Pindo
         if @process_type == Pindo::UncommittedFilesProcessType::SKIP_WITHOUT_TAG
           coding_branch = get_current_branch_name
           @build_number, @commit_hash = git_repo_helper.get_build_number_from_commit(project_dir: root_dir)
-          @build_version = "0.0.0"
+
+          # 版本号仍按正常优先级计算，仅"不打 tag / 不升版本"，避免硬编码 0.0.0 污染 build.gradle 与下游上传参数
+          if @fixed_version && !@fixed_version.empty?
+            @build_version = @fixed_version
+          else
+            @build_version = git_repo_helper.calculate_build_version(
+              project_dir: root_dir,
+              tag_prefix: @tag_pre,
+              create_tag_type: Pindo::CreateTagType::NONE,
+              version_increase_type: @ver_inc
+            )
+          end
+
+          commit_short = @commit_hash ? @commit_hash[0..7] : "unknown"
           Funlog.instance.fancyinfo_warning("skip_without_tag 模式：跳过分支合并和 tag 创建")
+          Funlog.instance.fancyinfo_success("Version: #{@build_version}, Build: #{@build_number}, Commit: #{commit_short}")
 
           # 显示 commit 信息后直接返回
           display_all_repos_commit_info(root_dir)