Merge changes I7b0add0b,Id6388347,Id5611bcf

* changes:
  Update README
  Delay Android Resolver initialization
  Delay iOS Resolver initialization

Author: chkuang-g

README.md

@@ -172,7 +172,8 @@ package:
       you add the `-gvh_disable` option.
    1. Export your plugin by [running Unity from the command line](https://docs.unity3d.com/Manual/CommandLineArguments.html), ensuring that
       you:
-      - Include the contents of the `Assets/PlayServicesResolver` directory.
+      - Include the contents of the `Assets/PlayServicesResolver` and
+        `Assets/ExternalDependencyManager` directory.
       - Add the `-gvh_disable` option.
 
 You **must** specify the `-gvh_disable` option in order for the Version

source/AndroidResolver/src/PlayServicesResolver.cs

@@ -901,35 +901,74 @@ public static bool AutomaticResolutionEnabled {
         /// Initializes the <see cref="GooglePlayServices.PlayServicesResolver"/> class.
         /// </summary>
         static PlayServicesResolver() {
-            // Create the resolver.
-            if (EditorUserBuildSettings.activeBuildTarget == BuildTarget.Android) {
-                gradleResolver = new GradleResolver();
-                // Monitor Android dependency XML files to perform auto-resolution.
-                AddAutoResolutionFilePatterns(xmlDependencies.fileRegularExpressions);
+            // Cache the flag to prevent string comparison in every frame during
+            // PollOnUpdateUntilComplete()
+            bool isExecuteMethodEnabled =  ExecutionEnvironment.ExecuteMethodEnabled;
+
+            // Delay initialization until the build target is iOS and the editor is not in play
+            // mode.
+            RunOnMainThread.PollOnUpdateUntilComplete(() => {
+                if (EditorUserBuildSettings.activeBuildTarget != BuildTarget.Android ||
+                    EditorApplication.isPlayingOrWillChangePlaymode) {
+                    // If Unity is launched with -executeMethod, in some Unity versions, editor
+                    // update will never be called. As a result, PollOnUpdateUntilComplete() will
+                    // attempt to call this poll function repeating on current thread until it
+                    // returns true.  Therefore, return true immediately and stop the polling in
+                    // executeMethod mode.
+                    return isExecuteMethodEnabled;
+                }
+                Initialize();
+                return true;
+            });
+
+        }
 
-                svcSupport = PlayServicesSupport.CreateInstance(
-                    "PlayServicesResolver",
-                    AndroidSdkRoot,
-                    "ProjectSettings",
-                    logMessageWithLevel: LogDelegate);
+        /// <summary>
+        /// Whether Android Resolver have been initialized.
+        /// </summary>
+        private static bool isInitialized = false;
+
+        /// <summary>
+        /// Initialize the module. This should be called on the main thread only if
+        /// current active build target is Android and not in play mode.
+        /// </summary>
+        private static void Initialize() {
+            if (isInitialized) return;
+
+            if ( EditorUserBuildSettings.activeBuildTarget != BuildTarget.Android ) {
+                throw new Exception("PlayServiceResolver.Initialize() is called when active " +
+                        "build target is not Android. This should never happen. If it does, " +
+                        "please report to the developer.");
             }
+
+            // Create the resolver.
+            gradleResolver = new GradleResolver();
+            // Monitor Android dependency XML files to perform auto-resolution.
+            AddAutoResolutionFilePatterns(xmlDependencies.fileRegularExpressions);
+
+            svcSupport = PlayServicesSupport.CreateInstance(
+                "PlayServicesResolver",
+                AndroidSdkRoot,
+                "ProjectSettings",
+                logMessageWithLevel: LogDelegate);
+
             RunOnMainThread.OnUpdate -= PollBundleId;
             RunOnMainThread.OnUpdate += PollBundleId;
 
             // Initialize settings and resolve if required.
             OnSettingsChanged();
 
             // Setup events for auto resolution.
-            if (EditorUserBuildSettings.activeBuildTarget == BuildTarget.Android) {
-                BundleIdChanged += ResolveOnBundleIdChanged;
-                AndroidBuildSystemChanged += ResolveOnBuildSystemChanged;
-                AndroidAbisChanged += ResolveOnAndroidAbisChanged;
-                AndroidSdkRootChanged += ResolveOnAndroidSdkRootChange;
-                Reresolve();
+            BundleIdChanged += ResolveOnBundleIdChanged;
+            AndroidBuildSystemChanged += ResolveOnBuildSystemChanged;
+            AndroidAbisChanged += ResolveOnAndroidAbisChanged;
+            AndroidSdkRootChanged += ResolveOnAndroidSdkRootChange;
+            Reresolve();
 
-                if (SettingsDialogObj.EnableAutoResolution) LinkAutoResolution();
-            }
+            if (SettingsDialogObj.EnableAutoResolution) LinkAutoResolution();
 
+            isInitialized = true;
+            Log("Android Resolver Initialized", level: LogLevel.Verbose);
         }
 
         // Unregister events to monitor build system changes for the Android Resolver and other

source/IOSResolver/src/IOSResolver.cs

@@ -651,54 +651,90 @@ private static Assembly ResolveUnityEditoriOSXcodeExtension(
     static IOSResolver() {
         // Load log preferences.
         VerboseLoggingEnabled = VerboseLoggingEnabled;
+
         // NOTE: We can't reference the UnityEditor.iOS.Xcode module in this
         // method as the Mono runtime in Unity 4 and below requires all
         // dependencies of a method are loaded before the method is executed
         // so we install the DLL loader first then try using the Xcode module.
         RemapXcodeExtension();
+
+        // Cache the flag to prevent string comparison in every frame during
+        // PollOnUpdateUntilComplete()
+        bool isExecuteMethodEnabled =  ExecutionEnvironment.ExecuteMethodEnabled;
+
+        // Delay initialization until the build target is iOS and the editor is not in play mode.
+        RunOnMainThread.PollOnUpdateUntilComplete(() => {
+            if (EditorUserBuildSettings.activeBuildTarget != BuildTarget.iOS ||
+                EditorApplication.isPlayingOrWillChangePlaymode) {
+                // If Unity is launched with -executeMethod, in some Unity versions, editor
+                // update will never be called. As a result, PollOnUpdateUntilComplete() will
+                // attempt to call this poll function repeating on current thread until it returns
+                // true.  Therefore, return true immediately and stop the polling in executeMethod
+                // mode.
+                return isExecuteMethodEnabled;
+            }
+            Initialize();
+            return true;
+        });
+    }
+
+    /// <summary>
+    /// Whether iOSResolver have been initialized.
+    /// </summary>
+    private static bool isInitialized = false;
+
+    /// <summary>
+    /// Initialize the module. This should be called on the main thread only if
+    /// current active build target is iOS and not in play mode.
+    /// </summary>
+    private static void Initialize() {
+        if (isInitialized) return;
+
+        if ( EditorUserBuildSettings.activeBuildTarget != BuildTarget.iOS ) {
+            throw new Exception("IOSResolver.Initialize() is called when active build target " +
+                    "is not iOS. This should never happen.  If it does, please report to the " +
+                    "developer.");
+        }
+
         // NOTE: It's not possible to catch exceptions a missing reference
         // to the UnityEditor.iOS.Xcode assembly in this method as the runtime
         // will attempt to load the assembly before the method is executed so
         // we handle exceptions here.
         try {
             InitializeTargetName();
         } catch (Exception exception) {
-            if (EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS) {
-                Log("Failed: " + exception.ToString(), level: LogLevel.Error);
-                if (exception is FileNotFoundException ||
-                    exception is TypeInitializationException ||
-                    exception is TargetInvocationException) {
-                    // It's likely we failed to load the iOS Xcode extension.
-                    Debug.LogWarning(
-                        "Failed to load the " +
-                        "UnityEditor.iOS.Extensions.Xcode dll.  " +
-                        "Is iOS support installed?");
-                } else {
-                    throw exception;
-                }
+            Log("Failed: " + exception.ToString(), level: LogLevel.Error);
+            if (exception is FileNotFoundException ||
+                exception is TypeInitializationException ||
+                exception is TargetInvocationException) {
+                // It's likely we failed to load the iOS Xcode extension.
+                Debug.LogWarning(
+                    "Failed to load the " +
+                    "UnityEditor.iOS.Extensions.Xcode dll.  " +
+                    "Is iOS support installed?");
+            } else {
+                throw exception;
             }
         }
 
         // If Cocoapod tool auto-installation is enabled try installing on the first update of
         // the editor when the editor environment has been initialized.
-        if (EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS &&
-            AutoPodToolInstallInEditorEnabled && CocoapodsIntegrationEnabled &&
+        if (AutoPodToolInstallInEditorEnabled && CocoapodsIntegrationEnabled &&
             !ExecutionEnvironment.InBatchMode) {
-            RunOnMainThread.Run(() => { AutoInstallCocoapods(); }, runNow: false);
+            AutoInstallCocoapods();
         }
         // Install / remove target SDK property poller.
         SetEnablePollTargetSdk(PodfileGenerationEnabled);
         // Load XML dependencies on the next editor update.
         if (PodfileGenerationEnabled) {
-            RunOnMainThread.Run(RefreshXmlDependencies, runNow: false);
+            RefreshXmlDependencies();
         }
 
         // Prompt the user to use workspaces if they aren't at least using project level
         // integration.
-        if (EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS &&
-            (CocoapodsIntegrationMethod)settings.GetInt(PREFERENCE_COCOAPODS_INTEGRATION_METHOD,
+        if ((CocoapodsIntegrationMethod)settings.GetInt(PREFERENCE_COCOAPODS_INTEGRATION_METHOD,
                 CocoapodsIntegrationUpgradeDefault) == CocoapodsIntegrationMethod.None &&
-            !ExecutionEnvironment.InBatchMode && !UpgradeToWorkspaceWarningDisabled) {
+                !ExecutionEnvironment.InBatchMode && !UpgradeToWorkspaceWarningDisabled) {
 
             DialogWindow.Display(
                 "Warning: CocoaPods integration is disabled!",
@@ -721,6 +757,9 @@ exception is TypeInitializationException ||
                     }
                 });
         }
+        isInitialized = true;
+
+        Log("IOSResolver Initialized", verbose: true);
     }
 
     /// <summary>