pindo 5.18.9 → 5.18.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3b74ddb66022968993f331b407f3a50a41d94a827e15e75f75dac1b8d5aadc1
-  data.tar.gz: '08c5e2e855359f4369e02cb6cab841d38e3344794a7d4e8f9b0f2695683d1da2'
+  metadata.gz: 78cfff9c32f28c301552fdf5d7fbbe71c71b0ed6e8ec3ea178fdcb985cf07677
+  data.tar.gz: d96bf95c17ae486d94745466add5f521ff087bbb133ea36a24f17fcb2f2421cc
 SHA512:
-  metadata.gz: 6c1c36ddcf83fcff151bdd21e8e3104eec862b5c72aa15303a8fe3cae4f9be0dd36f37e2cee24d293e6ace76f895c72f057a18f12485c6d4a08905bb49350e21
-  data.tar.gz: 1f3a484ff340bd398d150960753bb541103aca2b5a8ba30e712733c029e209c9fdfcb7db6c2d80b7c1bb1e1c8202d3319600ab12d23c4cb928c3f55c2390e74c
+  metadata.gz: a42d4745b4e40dc76d4e984456932e61a5abf18bdd6588c26849ead270d3e2a4ca5fef45daa9098e90a6ad960ad519968e1dcb003cb0e885215154d3ea339eab
+  data.tar.gz: fbe00ac4256e731bd92af5950a2097ce92c908c61aa02f94111f03cd4f53fdfb45cf6f777c247d9e04c2b34c66b356c73769f4db00f72170d93bbe789494d8d8

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

@@ -35,6 +35,7 @@ module Pindo
         puts "处理独立的 Unity 导出工程..."
         Pindo::GradleHelper.update_build_gradle(project_dir)
         Pindo::AndroidProjectHelper.add_unity_namespace(project_dir)
+        Pindo::AndroidProjectHelper.ensure_unity_il2cpp_jni_merge_depends_on!(project_dir)
         Pindo::AndroidProjectHelper.modify_il2cpp_config(project_dir)
         Pindo::AndroidProjectHelper.remove_desktop_google_service(project_dir)
 
@@ -61,6 +62,7 @@ module Pindo
 
             # Unity 特有的处理
             Pindo::AndroidProjectHelper.add_unity_namespace(unity_dir)
+            Pindo::AndroidProjectHelper.ensure_unity_il2cpp_jni_merge_depends_on!(unity_dir)
             Pindo::AndroidProjectHelper.modify_il2cpp_config(unity_dir)
             Pindo::AndroidProjectHelper.remove_desktop_google_service(unity_dir)
           end

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

@@ -5,90 +5,115 @@ module Pindo
   class AndroidProjectHelper
     class << self
 
-
-      # 确保导出的 Android 工程 `unityLibrary/libs` 里物理存在 Firebase Unity AAR（firebase-*-unity-*.aar）。
+      # 永久修复 Unity IL2CPP 工程：将 mergeDebug/mergeReleaseJniLibFolders 对 BuildIl2CppTask 的依赖
+      # 从“硬编码 buildType”改为“匹配所有 merge*JniLibFolders 变体”，避免自定义 buildType（如 workflow）
+      # 或 Unity/AGP 版本差异导致漏掉依赖关系。
       #
-      # 某些 Unity 工程会通过 EDM4U 将 Firebase Unity AAR 解析到 `Assets/GeneratedLocalRepo/**/m2repository`，
-      # 并在导出工程中使用本地 maven repo 方式引用它们，导致 `unityLibrary/libs` 为空。
-      # 当下游流程只携带“导出目录”时，这会表现为 Firebase AAR “缺失”。
+      # 仅修改 Unity 导出工程（包含 unityLibrary/build.gradle[.kts]）中的 unityLibrary 模块 Gradle 文件。
+      # 幂等：已注入则不会重复写入。
       #
-      # 本方法会从以下来源收集 firebase-*-unity-*.aar 并复制到导出工程：
-      # - Unity 工程的 `ProjectSettings/AndroidResolverDependencies.xml`（优先）
-      # - `Assets/GeneratedLocalRepo/**/m2repository/com/google/firebase/**/firebase-*-unity-*.aar`（兜底扫描）
+      # @return [Boolean] 是否发生了写入变更
+      def ensure_unity_il2cpp_jni_merge_depends_on!(project_path)
+        raise ArgumentError, "project_path 不能为空" if project_path.to_s.empty?
+        raise ArgumentError, "项目目录不存在: #{project_path}" unless File.directory?(project_path)
+
+        unity_library = File.join(project_path, "unityLibrary")
+        return false unless File.directory?(unity_library)
+
+        gradle_path = File.join(unity_library, "build.gradle")
+        kts_path = File.join(unity_library, "build.gradle.kts")
+        target_file = File.file?(kts_path) ? kts_path : (File.file?(gradle_path) ? gradle_path : nil)
+        return false unless target_file
+
+        original = File.read(target_file, encoding: "UTF-8")
+        # 仅在明显是 Unity IL2CPP 工程时介入
+        return false unless original.include?("BuildIl2CppTask")
+
+        dsl = target_file.end_with?(".kts") ? :kts : :groovy
+        updated = normalize_unity_il2cpp_jni_merge_depends_on_text(original)
+        updated = migrate_unity_il2cpp_jni_merge_depends_on_marker_text(updated)
+        updated = ensure_unity_il2cpp_jni_merge_depends_on_text(updated, dsl: dsl)
+
+        return false if updated == original
+
+        File.write(target_file, updated, encoding: "UTF-8")
+        true
+      end
+
+
+      # 根据导出工程 `unityLibrary/build.gradle[.kts]` 中**实际声明**的本地 AAR 依赖，校验并补齐 `unityLibrary/libs`。
       #
-      # @return [Array<String>] 实际拷贝/确认存在的文件名列表
-      def ensure_export_has_firebase_unity_aars!(unity_root_path:, export_path:)
+      # EDM4U 常将部分 AAR 解析到 `Assets/GeneratedLocalRepo/**/m2repository`，导出后 Gradle 仍按 `name + ext:aar`
+      #、`libs/某.aar` 或 `fileTree(dir: 'libs', include: ['*.aar', ...])` 引用；若只拷贝导出目录会缺文件。
+      # 声明来源：`AndroidResolverDependencies.xml` + `GeneratedLocalRepo`（`fileTree` 模式会合并二者中的 .aar 清单）。
+      #
+      # @return [Array<String>] 已在 libs 中存在或本次拷贝的 .aar 文件名
+      def ensure_export_unity_library_aars_from_gradle!(unity_root_path:, export_path:)
         raise ArgumentError, "unity_root_path 不能为空" if unity_root_path.to_s.empty?
         raise ArgumentError, "export_path 不能为空" if export_path.to_s.empty?
         raise ArgumentError, "Unity 工程目录不存在: #{unity_root_path}" unless File.directory?(unity_root_path)
         raise ArgumentError, "导出目录不存在: #{export_path}" unless File.directory?(export_path)
 
-        libs_dir = File.join(export_path, "unityLibrary", "libs")
+        unity_library = File.join(export_path, "unityLibrary")
+        gradle_path = %w[build.gradle build.gradle.kts].map { |n| File.join(unity_library, n) }.find { |p| File.file?(p) }
+        libs_dir = File.join(unity_library, "libs")
         FileUtils.mkdir_p(libs_dir)
 
-        # 若导出工程已包含所需的 firebase-*-unity-*.aar，则无需再从 Unity 工程侧反查来源（含 GeneratedLocalRepo）。
-        already = Dir.glob(File.join(libs_dir, "firebase-*-unity-*.aar")).select { |p| File.file?(p) }
-        return already.map { |p| File.basename(p) }.uniq unless already.empty?
+        unless gradle_path
+          return []
+        end
 
+        gradle_content = File.read(gradle_path, encoding: "UTF-8")
         resolver_xml = File.join(unity_root_path, "ProjectSettings", "AndroidResolverDependencies.xml")
+        aar_index = build_android_resolver_aar_index(unity_root_path, resolver_xml)
 
-        candidates = []
-        if File.file?(resolver_xml)
-          begin
-            require "rexml/document"
-            doc = REXML::Document.new(File.read(resolver_xml))
-            doc.elements.each("dependencies/files/file") do |e|
-              rel = e.text.to_s.strip
-              next if rel.empty?
-              next unless rel.end_with?(".aar")
-              next unless rel.match?(/firebase-.*-unity-.*\.aar\z/i)
-
-              abs = Pathname.new(rel).absolute? ? rel : File.join(unity_root_path, rel)
-              candidates << abs
-            end
-          rescue StandardError => e
-            raise Informative, "解析 AndroidResolverDependencies.xml 失败: #{e.message}\n请在 Unity 中执行 EDM4U Force Resolve 后重试。"
+        required_basenames =
+          if gradle_declares_libs_file_tree_with_aar?(gradle_content)
+            merged_aar_basenames_for_libs_file_tree(aar_index, unity_root_path)
+          else
+            extract_required_aar_basenames_from_unity_library_gradle(gradle_content)
           end
-        end
 
-        if candidates.empty?
-          local_repo = File.join(unity_root_path, "Assets", "GeneratedLocalRepo")
-          if File.directory?(local_repo)
-            glob = File.join(local_repo, "**", "m2repository", "com", "google", "firebase", "**", "firebase-*-unity-*.aar")
-            candidates.concat(Dir.glob(glob))
+        return [] if required_basenames.empty?
+
+        satisfied = []
+        missing_after_copy = []
+
+        required_basenames.each do |base|
+          dst = File.join(libs_dir, base)
+          if file_readable_nonbroken?(dst)
+            satisfied << base
+            next
+          end
+
+          src = resolve_aar_source_for_basename(base, aar_index, unity_root_path)
+          unless src
+            missing_after_copy << base
+            next
           end
-        end
 
-        candidates.uniq!
-        existing = candidates.select { |p| File.file?(p) }
+          FileUtils.cp(src, dst)
+          satisfied << base
+        end
 
-        if existing.empty?
+        unless missing_after_copy.empty?
           raise Informative, <<~MSG
-            Firebase Unity AAR 依赖拷贝失败：未找到 firebase-*-unity-*.aar
+            Unity unityLibrary/libs 缺少 Gradle 已声明的 AAR，且无法在 Unity 工程内找到源文件：
+            #{missing_after_copy.sort.join(', ')}
             Unity 工程: #{unity_root_path}
             导出目录: #{export_path}
-            期望来源:
-            - #{resolver_xml}
-            - Assets/GeneratedLocalRepo/**/m2repository/com/google/firebase/**/firebase-*-unity-*.aar
-
-            请在 Unity 中执行：Assets → External Dependency Manager → Android Resolver → Force Resolve
-            然后重新导出再构建。
+            Gradle: #{gradle_path}
+            请检查: #{resolver_xml}
+            并在 Unity 中执行：External Dependency Manager → Android Resolver → Force Resolve 后重新导出。
           MSG
         end
 
-        copied = []
-        existing.each do |src|
-          dst = File.join(libs_dir, File.basename(src))
-          if File.file?(dst) && File.size(dst) == File.size(src)
-            copied << File.basename(dst)
-            next
-          end
-
-          FileUtils.cp(src, dst)
-          copied << File.basename(dst)
-        end
+        satisfied.uniq
+      end
 
-        copied.uniq
+      # 兼容旧调用名（实现已泛化为「按 Gradle 声明补齐 libs」）。
+      def ensure_export_has_firebase_unity_aars!(unity_root_path:, export_path:)
+        ensure_export_unity_library_aars_from_gradle!(unity_root_path: unity_root_path, export_path: export_path)
       end
 
       def unity_android_project?(project_path)
@@ -437,6 +462,266 @@ module Pindo
 
       private
 
+      def normalize_unity_il2cpp_jni_merge_depends_on_text(content)
+        return content if content.to_s.empty?
+
+        out = content.dup
+
+        # 清理旧的 hardcode 片段（只针对 BuildIl2CppTask + merge(Debug|Release)JniLibFolders 的 dependsOn）
+        out.gsub!(/^\s*project\(\s*['"]:unityLibrary['"]\s*\)\.merge(?:Debug|Release)JniLibFolders\.dependsOn\s+BuildIl2CppTask\s*\n?/m, "")
+        out.gsub!(/^\s*merge(?:Debug|Release)JniLibFolders\.dependsOn\s+BuildIl2CppTask\s*\n?/m, "")
+
+        # 清理旧的 findByName 判定（保守：仅删提到 merge(Debug|Release)JniLibFolders 的行）
+        out.gsub!(/^\s*if\s*\(\s*project\(\s*['"]:unityLibrary['"]\s*\)\.tasks\.findByName\(\s*['"]merge(?:Debug|Release)JniLibFolders['"]\s*\)\s*\)\s*\n?/m, "")
+
+        # 也清理一些常见的单行 if(...) 写法（保守：只删包含 mergeXJniLibFolders + BuildIl2CppTask 的行）
+        out.gsub!(/^\s*if\s*\([^\n]*merge(?:Debug|Release)JniLibFolders[^\n]*\)\s*[^\n]*BuildIl2CppTask[^\n]*\n?/m, "")
+
+        # 如果上面把 afterEvaluate 块内容清空了，这里移除“空壳 afterEvaluate { }”避免残留无意义块，
+        # 后续由 ensure_* 重新按目标写法注入。
+        #
+        # 仅移除“块内无任何非空白/非注释内容”的 afterEvaluate，避免误删业务逻辑。
+        out.gsub!(/^\s*afterEvaluate\s*\{\s*\n(?:(?:\s*\/\/[^\n]*\n)|(?:\s*\n))*\s*\}\s*\n?/m, "")
+
+        out
+      end
+
+      # 迁移旧注入块：如果历史版本把 marker + afterEvaluate 注入在文件尾部（android 块外），
+      # 这里先移除旧块，再按新规则（插入 android {} 内部）重新注入，确保与目标工程写法一致。
+      def migrate_unity_il2cpp_jni_merge_depends_on_marker_text(content)
+        return content if content.to_s.empty?
+
+        marker = "PINDO_UNITY_IL2CPP_JNI_MERGE_DEPENDS_ON"
+        idx = content.index(marker)
+        return content unless idx
+
+        # 从 marker 行开始，尝试定位其后的 afterEvaluate { ... } 并用花括号计数移除该段
+        line_start = content.rindex("\n", idx) || 0
+        line_start = 0 if line_start == 0
+        after_eval = content.index("afterEvaluate", idx)
+        return content unless after_eval
+
+        brace_open = content.index("{", after_eval)
+        return content unless brace_open
+
+        brace_close = find_matching_brace_simple(content, brace_open)
+        return content unless brace_close
+
+        # 删除到 afterEvaluate 块结束行尾
+        line_end = content.index("\n", brace_close) || brace_close
+        content[0...line_start] + content[(line_end + 1)..].to_s
+      end
+
+      def ensure_unity_il2cpp_jni_merge_depends_on_text(content, dsl:)
+        return content if content.to_s.empty?
+
+        marker = "PINDO_UNITY_IL2CPP_JNI_MERGE_DEPENDS_ON"
+        # 已经注入过（新老位置都带 marker），则认为已满足；调用方如需迁移会先 migrate_* 移除再注入
+        return content if content.include?(marker)
+
+        # 已存在等价实现（但没有 marker）时，不再重复注入，避免出现多个 afterEvaluate 块。
+        return content if unity_il2cpp_jni_merge_depends_on_already_present?(content)
+
+        snippet = unity_il2cpp_jni_merge_depends_on_snippet(marker, dsl: dsl)
+        inject_into_android_block_text(content, snippet)
+      end
+
+      def unity_il2cpp_jni_merge_depends_on_snippet(marker, dsl:)
+        if dsl == :kts
+          <<~KTS.rstrip
+            // #{marker}
+            afterEvaluate {
+                tasks.matching { it.name.startsWith("merge") && it.name.endsWith("JniLibFolders") }.configureEach {
+                    dependsOn(BuildIl2CppTask)
+                }
+            }
+          KTS
+        else
+          <<~GRADLE.rstrip
+            // #{marker}
+            afterEvaluate {
+              tasks.matching { it.name.startsWith("merge") && it.name.endsWith("JniLibFolders") }.configureEach {
+                  dependsOn BuildIl2CppTask
+              }
+            }
+          GRADLE
+        end
+      end
+
+      # 将 snippet 插入到 android { ... } 的末尾（最后一个 } 之前）。
+      # 如果找不到 android 块，则回退到文件末尾追加（但 Unity 导出工程一般都有 android）。
+      def inject_into_android_block_text(content, snippet)
+        android_open = content.index(/\bandroid\s*\{/)
+        return content.rstrip + "\n\n" + snippet + "\n" unless android_open
+
+        brace_open = content.index("{", android_open)
+        return content.rstrip + "\n\n" + snippet + "\n" unless brace_open
+
+        brace_close = find_matching_brace_simple(content, brace_open)
+        return content.rstrip + "\n\n" + snippet + "\n" unless brace_close
+
+        inner = content[(brace_open + 1)...brace_close]
+        # 采用 android 块的缩进风格：取 android 关键字所在行的缩进，然后 +4
+        line_start = content.rindex("\n", android_open) || 0
+        line_start = 0 if line_start == 0
+        base_indent = content[line_start..android_open].match(/^\s*/).to_s
+        snippet_indented = indent_block_text(dedent_block_text(snippet), base_indent + "    ")
+
+        # 避免插入过多空行：统一只在前后各保留一个换行
+        updated_inner = inner.rstrip + "\n" + snippet_indented.rstrip + "\n"
+        content[0..brace_open] + updated_inner + content[brace_close..]
+      end
+
+      # 判定是否已经存在等价的「merge*JniLibFolders dependsOn BuildIl2CppTask」逻辑（不依赖 marker）。
+      # 这用于避免 Unity 工程本身已包含同等逻辑时重复插入。
+      def unity_il2cpp_jni_merge_depends_on_already_present?(content)
+        return false if content.to_s.empty?
+
+        # 仅在存在 BuildIl2CppTask 时才认为可能等价
+        return false unless content.include?("BuildIl2CppTask")
+
+        has_matching =
+          content.match?(/tasks\.matching\s*\{\s*it\.name\.startsWith\(\s*["']merge["']\s*\)\s*&&\s*it\.name\.endsWith\(\s*["']JniLibFolders["']\s*\)\s*\}/) ||
+          content.match?(/tasks\.matching\s*\{\s*it\.name\.startsWith\(\s*["']merge["']\s*\)\s*&&\s*it\.name\.endsWith\(\s*["']JniLibFolders["']\s*\)\s*\}\.configureEach/)
+
+        return false unless has_matching
+
+        # dependsOn 允许 Groovy 简写或括号写法
+        content.match?(/dependsOn\s*(?:\(\s*)?BuildIl2CppTask(?:\s*\))?/)
+      end
+
+      # 去掉 block 的公共前导缩进（保留相对缩进）
+      def dedent_block_text(text)
+        lines = text.to_s.lines
+        indents = lines.filter_map do |l|
+          next if l.strip.empty?
+
+          l[/^\s*/].to_s.length
+        end
+        return text if indents.empty?
+
+        cut = indents.min
+        lines.map do |l|
+          l.strip.empty? ? l : l.sub(/^\s{0,#{cut}}/, "")
+        end.join
+      end
+
+      def indent_block_text(text, indent)
+        text.to_s.lines.map do |l|
+          l.strip.empty? ? l : (indent + l)
+        end.join
+      end
+
+      # 简单花括号匹配（不解析字符串/注释）：用于 Unity 导出 Gradle（结构相对规整）。
+      def find_matching_brace_simple(str, open_brace_index)
+        depth = 0
+        i = open_brace_index
+        while i < str.length
+          ch = str.getbyte(i)
+          if ch == 123 # {
+            depth += 1
+          elsif ch == 125 # }
+            depth -= 1
+            return i if depth == 0
+          end
+          i += 1
+        end
+        nil
+      end
+
+      def file_readable_nonbroken?(path)
+        return false unless path && File.exist?(path)
+        return false unless File.file?(path)
+
+        return File.exist?(path) if File.symlink?(path)
+
+        true
+      end
+
+      # implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) 等：按 Resolver + GeneratedLocalRepo 合并 .aar 清单
+      def gradle_declares_libs_file_tree_with_aar?(content)
+        return false unless content.include?("fileTree")
+
+        libs_dir_arg = %q{['"]\.?/?libs['"]}
+        content.scan(/fileTree\s*\(\s*dir\s*:\s*#{libs_dir_arg}\s*,\s*include\s*:\s*(\[[^\]]+\])/im) do |m|
+          return true if gradle_file_tree_include_lists_aar?(m[0])
+        end
+        content.scan(/fileTree\s*\(\s*include\s*:\s*(\[[^\]]+\])\s*,\s*dir\s*:\s*#{libs_dir_arg}\s*\)/im) do |m|
+          return true if gradle_file_tree_include_lists_aar?(m[0])
+        end
+
+        # Kotlin: fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar")))
+        if content.match?(/fileTree\s*\(\s*mapOf/im) && content.match?(/"dir"\s+to\s+"libs"/m)
+          return true if content.match?(/(?:listOf|setOf)\s*\([^)]*["'][^"']*\.aar["']/m)
+        end
+
+        false
+      end
+
+      def gradle_file_tree_include_lists_aar?(include_bracket_text)
+        include_bracket_text.match?(/['"][^'"]*\*[^'"]*\.aar['"]/)
+      end
+
+      def merged_aar_basenames_for_libs_file_tree(aar_index, unity_root_path)
+        bases = aar_index.keys.dup
+        generated = File.join(unity_root_path, "Assets", "GeneratedLocalRepo")
+        if File.directory?(generated)
+          Dir.glob(File.join(generated, "**", "*.aar")).each do |p|
+            bases << File.basename(p) if File.file?(p)
+          end
+        end
+        bases.uniq
+      end
+
+      def extract_required_aar_basenames_from_unity_library_gradle(content)
+        names = []
+        dep_types = %w[implementation api compileOnly runtimeOnly debugImplementation releaseImplementation]
+        dep_alt = dep_types.join("|")
+
+        content.scan(/(?:#{dep_alt})\s*\(\s*name\s*:\s*['"]([^'"]+)['"]\s*,\s*ext\s*:\s*['"]aar['"]/im) { names << "#{Regexp.last_match(1)}.aar" }
+        content.scan(/(?:#{dep_alt})\s*\(\s*ext\s*:\s*['"]aar['"]\s*,\s*name\s*:\s*['"]([^'"]+)['"]/im) { names << "#{Regexp.last_match(1)}.aar" }
+        content.scan(/(?:#{dep_alt})\s*\(\s*name\s*=\s*["']([^'"]+)["']\s*,\s*ext\s*=\s*["']aar["']/im) { names << "#{Regexp.last_match(1)}.aar" }
+        content.scan(/(?:#{dep_alt})\s*\(\s*ext\s*=\s*["']aar["']\s*,\s*name\s*=\s*["']([^'"]+)["']/im) { names << "#{Regexp.last_match(1)}.aar" }
+
+        content.scan(/['"](?:\.\/)?libs\/([^'"]+\.aar)['"]/i) { names << Regexp.last_match(1) }
+
+        names.uniq
+      end
+
+      def build_android_resolver_aar_index(unity_root_path, resolver_xml)
+        index = {}
+        return index unless File.file?(resolver_xml)
+
+        require "rexml/document"
+        doc = REXML::Document.new(File.read(resolver_xml, encoding: "UTF-8"))
+        doc.elements.each("dependencies/files/file") do |e|
+          rel = e.text.to_s.strip
+          next if rel.empty?
+          next unless rel.end_with?(".aar")
+
+          abs = Pathname.new(rel).absolute? ? rel : File.join(unity_root_path, rel)
+          base = File.basename(rel)
+          (index[base] ||= []) << abs
+        end
+        index
+      rescue StandardError => e
+        raise Informative, "解析 AndroidResolverDependencies.xml 失败: #{e.message}\n请在 Unity 中执行 EDM4U Force Resolve 后重试。"
+      end
+
+      def resolve_aar_source_for_basename(basename, aar_index, unity_root_path)
+        (aar_index[basename] || []).each do |abs|
+          return abs if File.file?(abs)
+        end
+
+        generated = File.join(unity_root_path, "Assets", "GeneratedLocalRepo")
+        if File.directory?(generated)
+          hit = Dir.glob(File.join(generated, "**", basename)).find { |p| File.file?(p) }
+          return hit if hit
+        end
+
+        nil
+      end
+
       def extract_modules_from_settings(content)
         modules = []
         # 兼容 include ':app' / include(":app", ":lib")

data/lib/pindo/module/cert/mode/base_cert_operator.rb

@@ -160,9 +160,69 @@ module Pindo
           provisioning_info_array: provisioning_info_array
         )
 
+        # 清理 workspace 中其他工程（如 Unity-iPhone）的旧 PROVISIONING_PROFILE 设置
+        # gym 会扫描 workspace 下所有 project，旧的 UUID 会覆盖正确的 specifier
+        clean_stale_provisioning_profiles_in_workspace(project_dir: project_dir, provisioning_info_array: provisioning_info_array)
+
         Funlog.instance.fancyinfo_success("Xcode 工程配置完成！")
       end
 
+      # 清理 workspace 中其他工程的旧 PROVISIONING_PROFILE (UUID) 设置
+      # gym 扫描 workspace 下所有 project 时，旧的 PROVISIONING_PROFILE UUID 会覆盖
+      # 主工程中正确的 PROVISIONING_PROFILE_SPECIFIER，导致导出失败
+      def clean_stale_provisioning_profiles_in_workspace(project_dir:, provisioning_info_array:)
+        # 查找 workspace
+        workspace_file = Dir.glob(File.join(project_dir, "*.xcworkspace")).first
+        return unless workspace_file && File.exist?(workspace_file)
+
+        main_xcodeproj = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by { |f| File.mtime(f) }
+        return unless main_xcodeproj
+
+        main_proj_name = File.basename(main_xcodeproj)
+
+        # 解析 workspace 中的所有 project
+        workspace_data_file = File.join(workspace_file, "contents.xcworkspacedata")
+        return unless File.exist?(workspace_data_file)
+
+        require 'rexml/document'
+        doc = REXML::Document.new(File.read(workspace_data_file))
+        doc.elements.each('Workspace/FileRef') do |file_ref|
+          location = file_ref.attributes['location']
+          next unless location
+          relative_path = location.sub(/^group:/, '')
+          next unless relative_path.end_with?('.xcodeproj')
+          # 跳过主工程和 Pods 工程
+          next if relative_path == main_proj_name || relative_path.start_with?('Pods/')
+
+          full_path = File.join(project_dir, relative_path)
+          next unless File.exist?(full_path)
+
+          begin
+            sub_project = Xcodeproj::Project.open(full_path)
+            project_modified = false
+
+            sub_project.targets.each do |target|
+              target.build_configurations.each do |config|
+                # 清理旧的 PROVISIONING_PROFILE (UUID 格式的旧字段)
+                old_profile = config.build_settings['PROVISIONING_PROFILE']
+                if old_profile && !old_profile.empty?
+                  config.build_settings.delete('PROVISIONING_PROFILE')
+                  project_modified = true
+                end
+              end
+            end
+
+            if project_modified
+              sub_project.save
+              puts "  ✓ 已清理 #{relative_path} 中的旧 PROVISIONING_PROFILE 设置" if ENV['PINDO_DEBUG'] == '1' || ENV['PINDO_DEBUG'] == 'true'
+            end
+          rescue => e
+            # 不中断主流程
+            puts "  ⚠ 清理 #{relative_path} 时出错: #{e.message}" if ENV['PINDO_DEBUG'] == '1' || ENV['PINDO_DEBUG'] == 'true'
+          end
+        end
+      end
+
       # ========================================
       # 共享配置：Target 映射
       # ========================================
@@ -355,6 +415,14 @@ module Pindo
           unless provisioning_info["bundle_id"].include?("*")
             config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = provisioning_info["bundle_id"]
           end
+
+          if ENV['PINDO_DEBUG'] == '1' || ENV['PINDO_DEBUG'] == 'true'
+            puts "[DEBUG] configure_target_build_settings: target=#{target.name}, config=#{config.name}"
+            puts "[DEBUG]   PROVISIONING_PROFILE_SPECIFIER = #{config.build_settings['PROVISIONING_PROFILE_SPECIFIER']}"
+            puts "[DEBUG]   PRODUCT_BUNDLE_IDENTIFIER = #{config.build_settings['PRODUCT_BUNDLE_IDENTIFIER']}"
+            puts "[DEBUG]   profile_name(来源) = #{provisioning_info['profile_name']}"
+            puts "[DEBUG]   bundle_id(来源) = #{provisioning_info['bundle_id']}"
+          end
         end
       end
 

data/lib/pindo/module/cert/mode/custom_https_cert_operator.rb

@@ -218,6 +218,13 @@ module Pindo
         data = result['data'] || {}
         profiles = data['appleProfiles'] || []
 
+        if debug_mode?
+          Funlog.instance.info("JPS API 返回 #{profiles.size} 个描述文件:")
+          profiles.each_with_index do |p, i|
+            Funlog.instance.info("  [#{i}] name=#{p['name']}, bundleIdIdentifier=#{p['bundleIdIdentifier']}, profileUrl=#{p['profileUrl'] ? '(有)' : '(无)'}")
+          end
+        end
+
         if profiles.empty?
           raise Informative, "未找到匹配的描述文件 (apple_dev_account: #{apple_id}, bundle_ids=#{bundle_ids.join(', ')}， platform: #{platform}, type: #{profile_type})"
         end
@@ -299,9 +306,26 @@ module Pindo
           # 重新解析已安装的描述文件
           parsed_data = Provisioninghelper.parse(dest_path)
 
+          if debug_mode?
+            Funlog.instance.info("描述文件解析结果:")
+            Funlog.instance.info("  Name: #{parsed_data['Name']}")
+            Funlog.instance.info("  UUID: #{parsed_data['UUID']}")
+            Funlog.instance.info("  AppIDName: #{parsed_data['AppIDName']}")
+            Funlog.instance.info("  TeamIdentifier: #{parsed_data['TeamIdentifier']}")
+            Funlog.instance.info("  TeamName: #{parsed_data['TeamName']}")
+            entitlements = parsed_data['Entitlements'] || {}
+            Funlog.instance.info("  application-identifier: #{entitlements['application-identifier']}")
+            Funlog.instance.info("  ExpirationDate: #{parsed_data['ExpirationDate']}")
+          end
+
           # 从 bundle_id_map 中查找对应的 type
           type = bundle_id_map.key(actual_bundle_id) || 'bundle_id'
 
+          if debug_mode?
+            Funlog.instance.info("bundle_id 映射: actual_bundle_id=#{actual_bundle_id}, type=#{type}")
+            Funlog.instance.info("bundle_id_map: #{bundle_id_map.inspect}")
+          end
+
           # 构建 provisioning_info 对象
           provisioning_info = {
             'type' => type,
@@ -317,6 +341,15 @@ module Pindo
             provisioning_info['signing_identity'] = cert_info["Common Name"]
           end
 
+          if debug_mode?
+            Funlog.instance.info("provisioning_info 最终结果:")
+            Funlog.instance.info("  type: #{provisioning_info['type']}")
+            Funlog.instance.info("  bundle_id: #{provisioning_info['bundle_id']}")
+            Funlog.instance.info("  profile_name: #{provisioning_info['profile_name']}")
+            Funlog.instance.info("  signing_identity: #{provisioning_info['signing_identity']}")
+            Funlog.instance.info("  team_id: #{provisioning_info['team_id']}")
+          end
+
           provisioning_info_array << provisioning_info
 
           Funlog.instance.fancyinfo_success("处理完成: #{actual_bundle_id}") if debug_mode?

data/lib/pindo/module/task/model/unity/unity_export_task.rb

@@ -166,18 +166,17 @@ module Pindo
 
         result = execute_unity_build(platform)
 
-        # 确保导出产物中 `unityLibrary/libs` 物理存在 firebase-*-unity-*.aar，
-        # 以便下游仅携带导出目录时仍能正常集成 Firebase。
+        # 按导出 unityLibrary/build.gradle[.kts] 声明的本地 AAR，补齐 unityLibrary/libs（与 Resolver / GeneratedLocalRepo 对齐）。
         begin
-          copied = Pindo::AndroidProjectHelper.ensure_export_has_firebase_unity_aars!(
+          copied = Pindo::AndroidProjectHelper.ensure_export_unity_library_aars_from_gradle!(
             unity_root_path: @unity_root_path,
             export_path: @export_path
           )
-          puts "✓ 已同步 Firebase Unity AAR 到导出工程 unityLibrary/libs: #{copied.join(', ')}" if copied && !copied.empty?
+          puts "✓ 已按 Gradle 声明同步 AAR 到导出工程 unityLibrary/libs: #{copied.join(', ')}" if copied && !copied.empty?
         rescue Informative
           raise
         rescue StandardError => e
-          raise Informative, "同步 Firebase Unity AAR 失败: #{e.message}"
+          raise Informative, "同步 unityLibrary/libs AAR 失败: #{e.message}"
         end
 
         {

data/lib/pindo/module/utils/git_repo_helper.rb

@@ -162,9 +162,12 @@ module Pindo
               Pindo::GitHandler.git!(%W(-C #{git_root_dir} commit -m #{commit_message}))
               Funlog.instance.fancyinfo_success("已自动提交 .gitignore 更改")
 
-              # 推送到远程
-              Pindo::GitHandler.git!(%W(-C #{git_root_dir} push origin #{current_branch}))
-              Funlog.instance.fancyinfo_success("已自动推送 .gitignore 到远程仓库")
+              # 推送到远程（仅在 remote origin 存在时）
+              has_remote = Pindo::GitHandler.git!(%W(-C #{git_root_dir} remote)).strip
+              if has_remote.split("\n").include?("origin")
+                Pindo::GitHandler.git!(%W(-C #{git_root_dir} push origin #{current_branch}))
+                Funlog.instance.fancyinfo_success("已自动推送 .gitignore 到远程仓库")
+              end
             end
           rescue => e
             Funlog.instance.fancyinfo_error("Git 操作失败: #{e.message}")

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

@@ -442,6 +442,31 @@ module Pindo
             end
             info_plist_path = File.join(project_dir, relative_plist_path)
 
+            # 如果文件已存在于磁盘（如 GENERATE_INFOPLIST_FILE 模式下项目自带的 Info.plist）
+            if File.exist?(info_plist_path)
+                if raw_path.nil? || raw_path.empty?
+                    # 需要设置 INFOPLIST_FILE，让 ProcessInfoPlistFile 处理我们写入的配置
+                    # （URL Schemes、Facebook、AdMob、版本号等）
+                    # 对于 synchronized group，先排除 membership 避免 "Multiple commands produce" 冲突
+                    plist_dir = File.dirname(relative_plist_path)
+                    plist_name = File.basename(relative_plist_path)
+                    sync_group = if plist_dir == "." || plist_dir.empty?
+                                     project_obj.main_group.find_subpath(target_name, false)
+                                 else
+                                     project_obj.main_group.find_subpath(plist_dir, false)
+                                 end
+                    if sync_group.is_a?(Xcodeproj::Project::Object::PBXFileSystemSynchronizedRootGroup)
+                        add_membership_exception(sync_group, target, plist_name)
+                    end
+
+                    target.build_configurations.each do |config|
+                        config.build_settings['INFOPLIST_FILE'] = relative_plist_path
+                    end
+                    project_obj.save
+                end
+                return info_plist_path
+            end
+
             if is_generated_mode
                 Funlog.instance.fancyinfo_warning("Target #{target_name} 使用 GENERATE_INFOPLIST_FILE 模式，创建补充 Info.plist 用于复杂配置")
             else
@@ -453,14 +478,9 @@ module Pindo
             empty_plist = {}
             Xcodeproj::Plist.write_to_path(empty_plist, info_plist_path)
 
-            # 3.2 设置 build settings
-            target.build_configurations.each do |config|
-                config.build_settings['INFOPLIST_FILE'] = relative_plist_path
-                # 保持 GENERATE_INFOPLIST_FILE = YES，Xcode 自动合并
-                config.build_settings['GENERATE_INFOPLIST_FILE'] ||= 'YES'
-            end
-
-            # 3.3 将文件添加到 Xcode 工程引用，保持与实际相对路径一致
+            # 3.2 将文件添加到 Xcode 工程并设置 INFOPLIST_FILE
+            # 必须设置 INFOPLIST_FILE，否则写入的 URL Schemes、Facebook、AdMob 等配置
+            # 不会被 ProcessInfoPlistFile 处理，不会进入最终产物
             plist_dir = File.dirname(relative_plist_path)
             plist_name = File.basename(relative_plist_path)
             target_group =
@@ -470,10 +490,25 @@ module Pindo
                     project_obj.main_group.find_subpath(plist_dir, true)
                 end
 
-            unless target_group.files.any? { |f| f.path == plist_name } ||
-                   project_obj.files.any? { |f| f.path == relative_plist_path }
-                target_group.new_file(plist_name)
-                Funlog.instance.fancyinfo_success("已将 Info.plist 添加到 Xcode 工程: #{relative_plist_path}")
+            if target_group.is_a?(Xcodeproj::Project::Object::PBXFileSystemSynchronizedRootGroup)
+                # Xcode 16+ synchronized group：文件自动同步到 Copy Bundle Resources，
+                # 必须先排除 membership，再设置 INFOPLIST_FILE，避免 "Multiple commands produce" 冲突
+                add_membership_exception(target_group, target, plist_name)
+                Funlog.instance.fancyinfo_success("已将 Info.plist 从 target 编译成员中排除: #{plist_name}")
+            elsif target_group.respond_to?(:files)
+                # 传统 PBXGroup：手动添加文件引用
+                unless target_group.files.any? { |f| f.path == plist_name } ||
+                       project_obj.files.any? { |f| f.path == relative_plist_path }
+                    target_group.new_file(plist_name)
+                    Funlog.instance.fancyinfo_success("已将 Info.plist 添加到 Xcode 工程引用: #{relative_plist_path}")
+                end
+            end
+
+            # 设置 INFOPLIST_FILE，让 ProcessInfoPlistFile 处理此文件
+            target.build_configurations.each do |config|
+                config.build_settings['INFOPLIST_FILE'] = relative_plist_path
+                # GENERATE_INFOPLIST_FILE 模式下保持 YES，Xcode 会合并 build settings 和 plist 文件
+                config.build_settings['GENERATE_INFOPLIST_FILE'] ||= 'YES'
             end
 
             project_obj.save
@@ -481,6 +516,32 @@ module Pindo
             info_plist_path
         end
 
+        # 为 PBXFileSystemSynchronizedRootGroup 添加 membershipExceptions
+        # 将指定文件从 target 的编译成员中排除（Xcode 16+ 同步组机制）
+        # @param sync_group [PBXFileSystemSynchronizedRootGroup] 同步根组
+        # @param target [PBXNativeTarget] 目标 target
+        # @param file_name [String] 要排除的文件名（如 "Info.plist"）
+        def add_membership_exception(sync_group, target, file_name)
+            # 查找该 target 已有的 exception set
+            existing_exception = sync_group.exceptions.find { |e|
+                e.is_a?(Xcodeproj::Project::Object::PBXFileSystemSynchronizedBuildFileExceptionSet) && e.target == target
+            }
+
+            if existing_exception
+                # 已有 exception set，追加文件（避免重复）
+                existing_exception.membership_exceptions ||= []
+                unless existing_exception.membership_exceptions.include?(file_name)
+                    existing_exception.membership_exceptions << file_name
+                end
+            else
+                # 创建新的 PBXFileSystemSynchronizedBuildFileExceptionSet
+                exception_set = target.project.new(Xcodeproj::Project::Object::PBXFileSystemSynchronizedBuildFileExceptionSet)
+                exception_set.target = target
+                exception_set.membership_exceptions = [file_name]
+                sync_group.exceptions << exception_set
+            end
+        end
+
         def modify_info_plist(project_dir:nil, proj_name:nil, config_json:nil)
 
             ## Main Info.plist
@@ -707,6 +768,9 @@ module Pindo
                 end
             end
 
+            # 注意：Xcode 26+ 的 xcodebuild 会提示 "development" 已废弃建议用 "debugging"，
+            # 但 fastlane gym 的 export_method 白名单尚未支持 "debugging"，继续使用 "development"
+
             # 检查 Unity 测试模板
             if build_type.eql?("app-store") || build_type.eql?("ad-hoc")
                 if File.exist?(File.join(project_path, "Unity/Data/Raw/SettingsPluginFlag.txt"))
@@ -763,56 +827,34 @@ module Pindo
                 values[:export_options][:iCloudContainerEnvironment] = icloud_env
             end
 
-            # # 为所有 target 配置 provisioning profile（包括主应用和扩展）
-            # provisioning_profiles = {}
-            # project_obj.targets.each do |target|
-            #     # 获取 Release 配置（export 时使用的配置）
-            #     release_config = target.build_configurations.find { |config| config.name == 'Release' } || target.build_configurations.first
-
-            #     # 获取 target 的 Bundle ID（从 resolved_build_setting 获取实际值）
-            #     bundle_id = release_config.resolve_build_setting('PRODUCT_BUNDLE_IDENTIFIER')
-
-            #     # 如果 resolve_build_setting 返回 nil，尝试直接获取
-            #     if bundle_id.nil?
-            #         bundle_id = release_config.build_settings['PRODUCT_BUNDLE_IDENTIFIER']
-            #     end
-
-            #     puts "[DEBUG] Target: #{target.name}, Bundle ID: #{bundle_id}"
-
-            #     # 跳过没有 Bundle ID 的 target
-            #     next if bundle_id.nil? || bundle_id.to_s.empty? || bundle_id.to_s.include?('$(')
+            # 从主工程显式读取 provisioning profile 映射，避免 gym 自动扫描 workspace
+            # 时被其他工程（如 Unity-iPhone）中的旧 PROVISIONING_PROFILE UUID 污染
+            provisioning_profiles = {}
+            project_obj.targets.each do |target|
+                next unless target.respond_to?(:product_type)
 
-            #     # 获取 target 的 provisioning profile specifier
-            #     profile_specifier = release_config.build_settings['PROVISIONING_PROFILE_SPECIFIER']
+                release_config = target.build_configurations.find { |config| config.name == 'Release' } || target.build_configurations.first
+                next if release_config.nil?
 
-            #     # 如果没有找到，尝试查找 SDK 特定的配置（如 PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]）
-            #     if profile_specifier.nil? || profile_specifier.to_s.empty?
-            #         release_config.build_settings.each do |key, value|
-            #             if key.to_s.start_with?('PROVISIONING_PROFILE_SPECIFIER')
-            #                 profile_specifier = value
-            #                 puts "[DEBUG] Found SDK-specific profile: #{key} = #{value}"
-            #                 break
-            #             end
-            #         end
-            #     end
+                bundle_id = release_config.resolve_build_setting('PRODUCT_BUNDLE_IDENTIFIER')
+                bundle_id ||= release_config.build_settings['PRODUCT_BUNDLE_IDENTIFIER']
 
-            #     puts "[DEBUG] Profile Specifier: #{profile_specifier}"
+                # 跳过无效的 Bundle ID（空值、未解析变量、通配符）
+                next if bundle_id.nil? || bundle_id.to_s.empty?
+                next if bundle_id.to_s.include?('$(') || bundle_id.to_s.include?('*')
 
-            #     # 跳过没有 provisioning profile 的 target
-            #     next if profile_specifier.nil? || profile_specifier.to_s.empty?
+                # 优先读取 SDK 特定的配置，再回退到通用配置
+                profile_specifier = release_config.build_settings['PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]']
+                profile_specifier ||= release_config.build_settings['PROVISIONING_PROFILE_SPECIFIER']
 
-            #     # 添加到 provisioning profiles 映射
-            #     provisioning_profiles[bundle_id.to_s] = profile_specifier.to_s
-            #     puts "[DEBUG] Added: #{bundle_id} => #{profile_specifier}"
-            # end
+                next if profile_specifier.nil? || profile_specifier.to_s.empty?
 
-            # puts "[DEBUG] Total provisioning profiles: #{provisioning_profiles.inspect}"
+                provisioning_profiles[bundle_id.to_s] = profile_specifier.to_s
+            end
 
-            # # 只有在找到 provisioning profiles 时才添加配置
-            # if !provisioning_profiles.empty?
-            #     values[:export_options][:provisioningProfiles] = provisioning_profiles
-            #     puts "[DEBUG] Setting export_options[:provisioningProfiles] = #{provisioning_profiles.inspect}"
-            # end
+            if !provisioning_profiles.empty?
+                values[:export_options][:provisioningProfiles] = provisioning_profiles
+            end
 
             values
         end

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.18.9"
+  VERSION = "5.18.11"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.18.9
+  version: 5.18.11
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2026-04-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -524,7 +524,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.0.0
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 4.0.3
 specification_version: 4
 summary: easy work
 test_files: []