From 791791e8a397f37aa0e918c79a9249c252bd8942 Mon Sep 17 00:00:00 2001
From: atusi <takamaisu1977@gmail.com>
Date: Mon, 20 Dec 2021 18:21:42 +0900
Subject: [PATCH] =?UTF-8?q?ios=E3=83=93=E3=83=AB=E3=83=89=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 popcorn/Assets/MyGame/Editor/PostProcessor.cs            | 7 +++++--
 .../Assets/USAYAUnityLib/Editor/DevelopmentBuilder.cs    | 6 +++---
 popcorn/ProjectSettings/GvhProjectSettings.xml           | 9 +++++++++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/popcorn/Assets/MyGame/Editor/PostProcessor.cs b/popcorn/Assets/MyGame/Editor/PostProcessor.cs
index f0d453dd..bca24414 100644
--- a/popcorn/Assets/MyGame/Editor/PostProcessor.cs
+++ b/popcorn/Assets/MyGame/Editor/PostProcessor.cs
@@ -28,7 +28,8 @@ public static class PostProcessor{
         PBXProject pj = new PBXProject ();
         pj.ReadFromString(File.ReadAllText(projectPath));
 
-        var target = pj.GetUnityMainTargetGuid();
+        var target = pj.GetUnityFrameworkTargetGuid();
+
         pj.SetBuildProperty (target, "ENABLE_BITCODE", "NO");
         // Enable Modules (C and Objective-C)をYESに設定する
         pj.SetBuildProperty(target, "CLANG_ENABLE_MODULES", "YES");
@@ -90,6 +91,8 @@ public static class PostProcessor{
         pj.AddFrameworkToProject(target, "AdSupport.framework", false);
         pj.AddFrameworkToProject(target, "iAd.framework", false);
 
+        var target2 = pj.GetUnityMainTargetGuid();
+
         foreach (KeyValuePair<string, Dictionary<string, string>> entry in appTextMap) {
         
             string appNameConverted = "";
@@ -122,7 +125,7 @@ public static class PostProcessor{
             w.Close();
         
             string fileGuid = pj.AddFile( Path.Combine(path, lprojDir), "/"+lprojDir, PBXSourceTree.Source  );
-            pj.AddFileToBuild( target, fileGuid );
+            pj.AddFileToBuild( target2, fileGuid );
             pj.WriteToFile( projectPath );
         }
 
diff --git a/popcorn/Assets/USAYAUnityLib/Editor/DevelopmentBuilder.cs b/popcorn/Assets/USAYAUnityLib/Editor/DevelopmentBuilder.cs
index 5fd42ab7..bc7c09a4 100644
--- a/popcorn/Assets/USAYAUnityLib/Editor/DevelopmentBuilder.cs
+++ b/popcorn/Assets/USAYAUnityLib/Editor/DevelopmentBuilder.cs
@@ -9,8 +9,8 @@ public class DevelopmentBuilder : IPreprocessBuildWithReport {
     }
 
     public void OnPreprocessBuild(BuildReport report) {
-        UnityEditor.EditorUserBuildSettings.development = true;
-        UnityEditor.EditorUserBuildSettings.iOSBuildConfigType = UnityEditor.iOSBuildType.Debug;
-        UnityEditor.AssetDatabase.SaveAssets();
+        // UnityEditor.EditorUserBuildSettings.development = true;
+        // UnityEditor.EditorUserBuildSettings.iOSBuildConfigType = UnityEditor.iOSBuildType.Debug;
+        // UnityEditor.AssetDatabase.SaveAssets();
     }
 }
\ No newline at end of file
diff --git a/popcorn/ProjectSettings/GvhProjectSettings.xml b/popcorn/ProjectSettings/GvhProjectSettings.xml
index f23635bb..eb60a0e6 100644
--- a/popcorn/ProjectSettings/GvhProjectSettings.xml
+++ b/popcorn/ProjectSettings/GvhProjectSettings.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <projectSettings>
+  <projectSetting />
   <projectSetting name="com.google.external-dependency-managerAnalyticsEnabled" value="False" />
+  <projectSetting name="Google.IOSResolver.AutoPodToolInstallInEditor" value="True" />
+  <projectSetting name="Google.IOSResolver.CocoapodsIntegrationMethod" value="1" />
+  <projectSetting name="Google.IOSResolver.PodfileAddUseFrameworks" value="True" />
+  <projectSetting name="Google.IOSResolver.PodfileAllowPodsInMultipleTargets" value="True" />
+  <projectSetting name="Google.IOSResolver.PodfileAlwaysAddMainTarget" value="True" />
+  <projectSetting name="Google.IOSResolver.PodfileEnabled" value="True" />
+  <projectSetting name="Google.IOSResolver.PodfileStaticLinkFrameworks" value="False" />
+  <projectSetting name="Google.IOSResolver.PodToolExecutionViaShellEnabled" value="True" />
   <projectSetting name="Google.IOSResolver.VerboseLoggingEnabled" value="False" />
   <projectSetting name="Google.PackageManagerResolver.VerboseLoggingEnabled" value="False" />
   <projectSetting name="Google.VersionHandler.VerboseLoggingEnabled" value="False" />