Apply updated Unity 6000 export scripts to master.

Author: timbotimbo

example/unity/DemoApp/Assets/FlutterUnityIntegration/Editor/Build.cs

@@ -210,14 +210,25 @@ private static void DoBuildAndroid(String buildPath, bool isPlugin, bool isRelea
                 // remove this line if you don't use a debugger and you want to speed up the flutter build
                 playerOptions.options = BuildOptions.AllowDebugging | BuildOptions.Development;
             }
-            #if UNITY_2022_1_OR_NEWER
+            #if UNITY_6000_0_OR_NEWER
+                PlayerSettings.SetIl2CppCompilerConfiguration(NamedBuildTarget.Android, isReleaseBuild ? Il2CppCompilerConfiguration.Release : Il2CppCompilerConfiguration.Debug);
+                PlayerSettings.SetIl2CppCodeGeneration(NamedBuildTarget.Android, isReleaseBuild ? Il2CppCodeGeneration.OptimizeSpeed : Il2CppCodeGeneration.OptimizeSize);
+            #elif UNITY_2022_1_OR_NEWER
                 PlayerSettings.SetIl2CppCompilerConfiguration(BuildTargetGroup.Android, isReleaseBuild ? Il2CppCompilerConfiguration.Release : Il2CppCompilerConfiguration.Debug);
                 PlayerSettings.SetIl2CppCodeGeneration(NamedBuildTarget.Android, isReleaseBuild ? Il2CppCodeGeneration.OptimizeSpeed : Il2CppCodeGeneration.OptimizeSize);
             #elif UNITY_2021_2_OR_NEWER
                 PlayerSettings.SetIl2CppCompilerConfiguration(BuildTargetGroup.Android, isReleaseBuild ? Il2CppCompilerConfiguration.Release : Il2CppCompilerConfiguration.Debug);
                 EditorUserBuildSettings.il2CppCodeGeneration = isReleaseBuild ? Il2CppCodeGeneration.OptimizeSpeed : Il2CppCodeGeneration.OptimizeSize;
             #endif
 
+
+#if UNITY_ANDROID && UNITY_6000_0_OR_NEWER
+            UnityEditor.Android.UserBuildSettings.DebugSymbols.level = isReleaseBuild ? Unity.Android.Types.DebugSymbolLevel.None : Unity.Android.Types.DebugSymbolLevel.SymbolTable;
+            UnityEditor.Android.UserBuildSettings.DebugSymbols.format = Unity.Android.Types.DebugSymbolFormat.LegacyExtensions;
+#endif
+#if UNITY_ANDROID && UNITY_2023_1_OR_NEWER
+            PlayerSettings.Android.applicationEntry = AndroidApplicationEntry.Activity;
+#endif
             // Switch to Android standalone build.
             EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTargetGroup.Android, BuildTarget.Android);
             // build addressable
@@ -229,6 +240,13 @@ private static void DoBuildAndroid(String buildPath, bool isPlugin, bool isRelea
 
             Copy(buildPath, AndroidExportPath);
 
+            // Unity 6000 shared folder
+            string sharedPath = Path.Combine(APKPath, "shared");
+            if (Directory.Exists(sharedPath)) 
+            {
+                Copy(sharedPath, Path.Combine(AndroidExportPath, "shared"));
+            }
+
             // Modify build.gradle
             ModifyAndroidGradle(isPlugin);
 
@@ -338,6 +356,10 @@ private static void ModifyAndroidGradle(bool isPlugin)
             // disable the Unity ndk path as it will conflict with Flutter.
             buildText = buildText.Replace("ndkPath \"", "// ndkPath \"");
 
+            // Untiy 6000, handle ../shared/
+            buildText = Regex.Replace(buildText, @"\.\./shared/", "./shared/");
+            
+
             // check for namespace definition (Android gradle plugin 8+), add a backwards compatible version if it is missing.
             if(!buildText.Contains("namespace")) 
             {
@@ -430,7 +452,10 @@ private static void BuildIOS(String path, bool isReleaseBuild)
                 EditorUserBuildSettings.iOSBuildConfigType = iOSBuildType.Release;
             #endif
 
-            #if UNITY_2022_1_OR_NEWER
+            #if UNITY_6000_0_OR_NEWER
+                PlayerSettings.SetIl2CppCompilerConfiguration(NamedBuildTarget.iOS, isReleaseBuild ? Il2CppCompilerConfiguration.Release : Il2CppCompilerConfiguration.Debug);
+                PlayerSettings.SetIl2CppCodeGeneration(NamedBuildTarget.iOS, isReleaseBuild ? Il2CppCodeGeneration.OptimizeSpeed : Il2CppCodeGeneration.OptimizeSize);
+            #elif UNITY_2022_1_OR_NEWER
                 PlayerSettings.SetIl2CppCompilerConfiguration(BuildTargetGroup.iOS, isReleaseBuild ? Il2CppCompilerConfiguration.Release : Il2CppCompilerConfiguration.Debug);
                 PlayerSettings.SetIl2CppCodeGeneration(NamedBuildTarget.iOS, isReleaseBuild ? Il2CppCodeGeneration.OptimizeSpeed : Il2CppCodeGeneration.OptimizeSize);
             #elif UNITY_2021_2_OR_NEWER

example/unity/DemoApp/Assets/FlutterUnityIntegration/Editor/XCodePostBuild.cs

@@ -41,6 +41,13 @@ public static class XcodePostBuild
     /// </summary>
     private const string TouchedMarker = "https://github.com/juicycleff/flutter-unity-view-widget";
 
+    // String used to detect where to inject function definitions in UnityAppController.h
+#if UNITY_6000_0_OR_NEWER
+    private const string hDetection = "#import <UnityFramework/RenderPluginDelegate.h>";
+#else
+    private const string hDetection = "include \"RenderPluginDelegate.h\"";
+#endif
+
     //trigger this manually from build.cs as [PostProcessBuild] or IPostprocessBuildWithReport don't always seem to trigger.
     public static void PostBuild(BuildTarget target, string pathToBuiltProject)
     {
@@ -124,7 +131,7 @@ private static bool MarkUnityAppControllerH(string path)
         var mark = false;
         EditCodeFile(path, line =>
         {
-            inScope |= line.Contains("include \"RenderPluginDelegate.h\"");
+            inScope |= line.Contains(hDetection);
             if (inScope)
             {
                 if (line.Trim() == "")
@@ -197,7 +204,7 @@ private static void EditUnityAppControllerH(string path)
         // Modify inline GetAppController
         EditCodeFile(path, line =>
         {
-            inScope |= line.Contains("include \"RenderPluginDelegate.h\"");
+            inScope |= line.Contains(hDetection);
 
             if (inScope && !markerDetected)
             {
@@ -230,7 +237,7 @@ private static void EditUnityAppControllerH(string path)
         // Modify inline GetAppController
         EditCodeFile(path, line =>
         {
-            inScope |= line.Contains("include \"RenderPluginDelegate.h\"");
+            inScope |= line.Contains(hDetection);
 
             if (inScope && !markerDetected)
             {

unitypackages/README.md

@@ -8,8 +8,10 @@ Using the files from the example project ensures you have the latest version.
 ### Which one do I pick?
 Try the newest one first.
 
-Package versions do not indicate supported unity versions.
-For example `fuw-2022.1.7f1.unitypackage` will work in Unity 2021 and even Unity 2019.
+Most changes are backwards compatible and package versions do not indicate required unity versions.
+For example `fuw-2022.1.7f1.unitypackage` will still work in Unity 2021 and even Unity 2019.
+And the `6000.0.1` package is backwards compatible with Unity 2022.3 and earlier.
+
 
 If you really can't get it to work try to match version numbers.
 e.g if you use an older plugin version in the 4.x range, you might have to try unitypackages with 4.x versions.
@@ -31,10 +33,22 @@ Using a wrong extension like `.dll.txt` will disable it.
 # CHANGELOG
 Changes for `2022.1.7f1` and earlier were collected retroactively and might not be complete.
 
-## Pending (master branch)
+## Pending
 > Example Unity project, not in a unitypackage yet.
+* None
+
+## 6000.0.1
+> fuw-6000.0.0.unitypackage
 * (Android) Handle missing `"game_view_content_description"` string in Unity output strings.xml.
 
+## 6000.0.0
+> fuw-6000.0.0.unitypackage
+* Fix Android exports for Unity 6000.0 breaking changes.  
+* Fix iOS exports for Unity 6000.0 breaking changes.   
+**Note** 
+* This package remains backwards compatible with previous Unity versions like 2022.3.
+* Android exports with Unity 6 are not compatible with the Flutter plugin 2022.x or earlier.
+
 ## 2022.3.0
 >fuw-2022.3.0.unitypackage
 * Avoid invalid iOS export when current build target is not iOS. [#838](https://github.com/juicycleff/flutter-unity-view-widget/pull/838)