Merge branch 'master' into experimental/unity_6000

Author: timbotimbo

README.md

@@ -194,7 +194,10 @@ This requires a flutter_unity_widget version that is newer than 2022.2.1.
 
 ```diff
      dependencies {
+         // build.gradle
 +        implementation project(':flutter_unity_widget')
+         // build.gradle.kts (Flutter 3.29+)
++        implementation(project(":flutter_unity_widget"))
      }
 ```
 - 3.2. Edit your android MainActivity file.  
@@ -241,15 +244,23 @@ But if you want to manually set up the changes made by the export, continue.
 5. Open the *android/settings.gradle* file and change the following:
 
 ```diff
+// build.gradle
 +    include ":unityLibrary"
 +    project(":unityLibrary").projectDir = file("./unityLibrary")
+
+// build.gradle.kts (Flutter 3.29+)
++    include(":unityLibrary")
++    project(":unityLibrary").projectDir = file("./unityLibrary")
 ```
 
 6. Open the *android/app/build.gradle* file and change the following:
 
 ```diff
      dependencies {
+          // app/build.gradle
 +        implementation project(':unityLibrary')
+         // app/build.gradle.kts (Flutter 3.29+)
++        implementation(project(":unityLibrary"))
      }
 ```
 
@@ -259,7 +270,10 @@ But if you want to manually set up the changes made by the export, continue.
 allprojects {
     repositories {
 +       flatDir {
+            // build.gradle
 +           dirs "${project(':unityLibrary').projectDir}/libs"
+            // build.gradle.kts (Flutter 3.29+)
++           dirs(file("${project(":unityLibrary").projectDir}/libs"))
 +       }
         google()
         mavenCentral()
@@ -401,7 +415,11 @@ allprojects {
   3. If your `XR Plugin Management` plugin is version 4.4 or higher, Unity also exports the xrmanifest.androidlib folder.
      Make sure to include it by adding the following line to `android/settings.gradle`
      ```
+     // settings.gradle
      include ":unityLibrary:xrmanifest.androidlib"
+
+     // settings.gradle.kts (Flutter 3.29+)
+     include(":unityLibrary:xrmanifest.androidlib")
      ```
   4. With some Unity versions AR might crash at runtine with an error like:  
    `java.lang.NoSuchFieldError: no "Ljava/lang/Object;" field "mUnityPlayer" in class`.  

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

@@ -539,6 +539,12 @@ private static void SetupAndroidProject()
             var appBuildPath = Path.Combine(androidAppPath, "build.gradle");
             var settingsPath = Path.Combine(androidPath, "settings.gradle");
 
+            // switch to Kotlin DSL gradle if .kts file is detected (Fluter 3.29+ by default)
+            if (File.Exists(projBuildPath + ".kts")) {
+                SetupAndroidProjectKotlin();
+                return;
+            }
+
             var projBuildScript = File.ReadAllText(projBuildPath);
             var settingsScript = File.ReadAllText(settingsPath);
             var appBuildScript = File.ReadAllText(appBuildPath);
@@ -592,6 +598,71 @@ implementation project(':unityLibrary')
             }
         }
 
+
+        // Copy of SetupAndroidProject() adapted to Kotlin DLS .gradle.kts. Generated since Flutter 3.29
+        private static void SetupAndroidProjectKotlin()
+        {
+            var androidPath = Path.GetFullPath(Path.Combine(ProjectPath, "../../android"));
+            var androidAppPath = Path.GetFullPath(Path.Combine(ProjectPath, "../../android/app"));
+            var projBuildPath = Path.Combine(androidPath, "build.gradle.kts");
+            var appBuildPath = Path.Combine(androidAppPath, "build.gradle.kts");
+            var settingsPath = Path.Combine(androidPath, "settings.gradle.kts");
+
+
+            var projBuildScript = File.ReadAllText(projBuildPath);
+            var settingsScript = File.ReadAllText(settingsPath);
+            var appBuildScript = File.ReadAllText(appBuildPath);
+
+            // Sets up the project build.gradle files correctly
+            if (!Regex.IsMatch(projBuildScript, @"flatDir[^/]*[^}]*}"))
+            {
+                var regex = new Regex(@"allprojects \{[^\{]*\{", RegexOptions.Multiline);
+                projBuildScript = regex.Replace(projBuildScript, @"
+allprojects {
+    repositories {
+        flatDir {
+            dirs(file(""${project("":unityLibrary"").projectDir}/libs""))
+        }
+");
+                File.WriteAllText(projBuildPath, projBuildScript);
+            }
+
+            // Sets up the project settings.gradle files correctly
+            if (!Regex.IsMatch(settingsScript, @"include("":unityLibrary"")"))
+            {
+                settingsScript += @"
+
+include("":unityLibrary"")
+project("":unityLibrary"").projectDir = file(""./unityLibrary"")
+";
+                File.WriteAllText(settingsPath, settingsScript);
+            }
+
+
+            // Sets up the project app build.gradle files correctly
+            if (!Regex.IsMatch(appBuildScript, @"dependencies \{"))
+            {
+                appBuildScript += @"
+dependencies {
+    implementation(project("":unityLibrary""))
+}
+";
+                File.WriteAllText(appBuildPath, appBuildScript);
+            }
+            else
+            {
+                if (!appBuildScript.Contains(@"implementation(project("":unityLibrary"")"))
+                {
+                    var regex = new Regex(@"dependencies \{", RegexOptions.Multiline);
+                    appBuildScript = regex.Replace(appBuildScript, @"
+dependencies {
+    implementation(project("":unityLibrary""))
+");
+                    File.WriteAllText(appBuildPath, appBuildScript);
+                }
+            }
+        }
+
         /// <summary>
         /// This method tries to autome the build setup required for Android
         /// </summary>
@@ -601,6 +672,11 @@ private static void SetupAndroidProjectForPlugin()
             var projBuildPath = Path.Combine(androidPath, "build.gradle");
             var settingsPath = Path.Combine(androidPath, "settings.gradle");
 
+            if (File.Exists(projBuildPath + ".kts")) {
+                SetupAndroidProjectForPluginKotlin();
+                return;
+            }
+
             var projBuildScript = File.ReadAllText(projBuildPath);
             var settingsScript = File.ReadAllText(settingsPath);
 
@@ -628,6 +704,40 @@ private static void SetupAndroidProjectForPlugin()
             }
         }
 
+        // Copy of SetupAndroidProjectForPlugin() adapted to Kotlin DLS .gradle.kts. Generated since Flutter 3.29
+        private static void SetupAndroidProjectForPluginKotlin()
+        {
+            var androidPath = Path.GetFullPath(Path.Combine(ProjectPath, "../../android"));
+            var projBuildPath = Path.Combine(androidPath, "build.gradle.kts");
+            var settingsPath = Path.Combine(androidPath, "settings.gradle.kts");
+
+            var projBuildScript = File.ReadAllText(projBuildPath);
+            var settingsScript = File.ReadAllText(settingsPath);
+
+            // Sets up the project build.gradle files correctly
+            if (Regex.IsMatch(projBuildScript, @"// BUILD_ADD_UNITY_LIBS"))
+            {
+                var regex = new Regex(@"// BUILD_ADD_UNITY_LIBS", RegexOptions.Multiline);
+                projBuildScript = regex.Replace(projBuildScript, @"
+        flatDir {
+            dirs(file(""${project("":unityLibrary"").projectDir}/libs""))
+        }
+");
+                File.WriteAllText(projBuildPath, projBuildScript);
+            }
+
+            // Sets up the project settings.gradle files correctly
+            if (!Regex.IsMatch(settingsScript, @"include("":unityLibrary"")"))
+            {
+                settingsScript += @"
+
+include("":unityLibrary"")
+project("":unityLibrary"").projectDir = file(""./unityLibrary"")
+";
+                File.WriteAllText(settingsPath, settingsScript);
+            }
+        }
+
         private static void SetupIOSProjectForPlugin()
         {
             var iosRunnerPath = Path.GetFullPath(Path.Combine(ProjectPath, "../../ios"));