From aca914ab026f5d49748b45cb8ceb50705a2166cd Mon Sep 17 00:00:00 2001 From: huyufei Date: Thu, 30 May 2024 13:49:23 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E6=9B=B4=E6=96=B0=E6=89=93?= =?UTF-8?q?=E5=8C=85=E7=AE=A1=E7=BA=BF=E7=9A=84=E6=B3=A8=E5=85=A5=E6=97=B6?= =?UTF-8?q?=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyufei --- .../IOSPostBuild.Firebase.VersionFix.cs | 40 +++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/Editor/GuruBuildSuit/IOS_POST_FIREBASE/IOSPostBuild.Firebase.VersionFix.cs b/Editor/GuruBuildSuit/IOS_POST_FIREBASE/IOSPostBuild.Firebase.VersionFix.cs index a0bdb57..ab9fb38 100644 --- a/Editor/GuruBuildSuit/IOS_POST_FIREBASE/IOSPostBuild.Firebase.VersionFix.cs +++ b/Editor/GuruBuildSuit/IOS_POST_FIREBASE/IOSPostBuild.Firebase.VersionFix.cs @@ -42,7 +42,7 @@ namespace Guru.Editor - [PostProcessBuild(45)] // MAX POD Process Order + [PostProcessBuild(47)] // MAX POD Process Order public static void PostBuildFixPodDeps(BuildTarget target, string projPath) { if (target != BuildTarget.iOS) return; @@ -74,7 +74,7 @@ namespace Guru.Editor { if (line.Contains(libName)) { - lines[i] = FixOneFirebaseLibVersion(line, fixedVersion, minTargetSdk); + lines[i] = FixOneFirebaseLibVersion(line, fixedVersion); isDirty = true; } } @@ -84,33 +84,31 @@ namespace Guru.Editor if (line.Contains(libName)) { needAdded.Remove(libName); - lines[i] = FixOneFirebaseLibVersion(line, fixedVersion, minTargetSdk); - isDirty = true; - } - } - - if (needAdded.Count > 0) - { - // pod 'Firebase/DynamicLinks', '10.20.0' - foreach (var libName in needAdded) - { - idx++; - idx = Mathf.Min(idx, lines.Count - 1); - lines.Insert(idx, $"\tpod '{libName}', '{fixedVersion}'"); + lines[i] = FixOneFirebaseLibVersion(line, fixedVersion); isDirty = true; } } } + + if (needAdded.Count > 0) + { + // pod 'Firebase/DynamicLinks', '10.20.0' + foreach (var libName in needAdded) + { + idx++; + idx = Mathf.Min(idx, lines.Count - 1); + lines.Insert(idx, $"\tpod '{libName}', '{fixedVersion}'"); + isDirty = true; + } + } + if(isDirty) File.WriteAllLines(podfile, lines); } - private static string FixOneFirebaseLibVersion(string line, string fixedVersion, string minTargetSdk) + private static string FixOneFirebaseLibVersion(string line, string fixedVersion) { - line = line.Replace("version =", "version="); - string fixedLine = ""; - - fixedLine = line.Substring(line.IndexOf("version=") + 9) + $"\"{fixedVersion}\" minTargetSdk=\"{minTargetSdk}\""; - + if(!line.Contains("', '") || !line.Contains("pod")) return line; + string fixedLine = line.Substring(0, line.IndexOf("', '") + 4) + $"{fixedVersion}'"; return fixedLine; } }