release(android-v14.0.1): updated version and RELEASENOTES.md

This reverts commit 2258d33a72.

.github/workflows/ci.yml

@@ -17,7 +17,13 @@
 
 name: Node CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches-ignore:
+      - 'dependabot/**'
+  pull_request:
+    branches:
+      - '*'
 
 jobs:
   test:
@@ -27,7 +33,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x, 18.x, 20.x, 22.x]
+        node-version: [20.x, 22.x]
         os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:

.github/workflows/release-audit.yml

@@ -17,7 +17,13 @@
 
 name: Release Auditing
 
-on: [push, pull_request]
+on:
+  push:
+    branches-ignore:
+      - 'dependabot/**'
+  pull_request:
+    branches:
+      - '*'
 
 jobs:
   test:

.gitignore

@@ -31,6 +31,7 @@ example
 /test/.externalNativeBuild
 /test/androidx/cdv-gradle-config.json
 /test/androidx/tools
+/test/androidx/build
 /test/assets/www/.tmp*
 /test/assets/www/cordova.js
 /test/bin

README.md

@@ -32,7 +32,7 @@ Cordova Android is an Android application library that allows for Cordova-based
 
 ## Requirements
 
-* Java Development Kit (JDK) 11
+* Java Development Kit (JDK) 17
 * [Android SDK](https://developer.android.com/)
 * [Node.js](https://nodejs.org)
 

RELEASENOTES.md

@@ -20,6 +20,61 @@
 -->
 ## Release Notes for Cordova (Android)
 
+### 14.0.1 (Apr 24, 2025)
+
+**Fixes:**
+
+* [GH-1795](https://github.com/apache/cordova-android/pull/1795) fix: configure gradle `java.home`
+* [GH-1793](https://github.com/apache/cordova-android/pull/1793) fix(windows): get gradle path with `which` command
+
+### 14.0.0 (Mar 23, 2025)
+
+**Breaking Changes:**
+
+* [GH-1788](https://github.com/apache/cordova-android/pull/1788) dep!: bump npm packages
+  * nyc@17.1.0
+  * which@5.0.0
+  * semver@7.7.1
+  * jasmine@5.6.0
+  * android-versions@2.1.0
+  * cordova-common@5.0.1
+  * fast-glob@3.3.3
+  * nopt@8.1.0
+* [GH-1789](https://github.com/apache/cordova-android/pull/1789) feat!: bump node engine requirement `>=20.5.0`
+* [GH-1784](https://github.com/apache/cordova-android/pull/1784) feat!: bump java default targets to 11
+* [GH-1771](https://github.com/apache/cordova-android/pull/1771) feat!: deprecate CordovaPlugin's method initialize
+* [GH-1767](https://github.com/apache/cordova-android/pull/1767) feat!: use kotlin-stdlib instead of kotlin-stdlib-jdk*
+* [GH-1763](https://github.com/apache/cordova-android/pull/1763) feat!: SDK 35 Support
+
+**Features:**
+
+* [GH-1785](https://github.com/apache/cordova-android/pull/1785) feat: bump gradle to 8.13
+* [GH-1779](https://github.com/apache/cordova-android/pull/1779) feat: add `AndroidEdgeToEdge` preference & theme flag
+* [GH-1778](https://github.com/apache/cordova-android/pull/1778) feat: Account for Node security patch
+* [GH-1768](https://github.com/apache/cordova-android/pull/1768) feat: `androidx.core:core-splashscreen@1.0.1`
+* [GH-1766](https://github.com/apache/cordova-android/pull/1766) feat: `com.google.gms:google-services@4.4.2`
+* [GH-1765](https://github.com/apache/cordova-android/pull/1765) feat: `androidx.webkit:webkit@1.12.1`
+* [GH-1764](https://github.com/apache/cordova-android/pull/1764) feat: `androidx.appcompat:appcompat@1.7.0`
+
+**Fixes:**
+
+* [GH-1790](https://github.com/apache/cordova-android/pull/1790) fix: replace fs-extra.ensureFileSync with fs.writeFileSync
+* [GH-1781](https://github.com/apache/cordova-android/pull/1781) fix: copy gradle wrapper from tools to platform root dir
+* [GH-1770](https://github.com/apache/cordova-android/pull/1770) fix: creation of cdv-gradle-config.json w/ --link flag
+* [GH-1739](https://github.com/apache/cordova-android/pull/1739) fix(docs): Incorrect JDK requirement stated in README
+* [GH-1718](https://github.com/apache/cordova-android/pull/1718) fix: app restart when BT keyboard is connected in some devices
+
+**Chores & Refactoring:**
+
+* [GH-1786](https://github.com/apache/cordova-android/pull/1786) chore: add AndroidX build test to gitignore
+* [GH-1774](https://github.com/apache/cordova-android/pull/1774) style: update & resolve doc block warnings
+* [GH-1772](https://github.com/apache/cordova-android/pull/1772) refactor: replace fs-extra with node:fs
+* [GH-1769](https://github.com/apache/cordova-android/pull/1769) refactor: prefix node:*
+* [GH-1748](https://github.com/apache/cordova-android/pull/1748) chore(deps): bump cross-spawn from 7.0.3 to 7.0.6
+* [GH-1750](https://github.com/apache/cordova-android/pull/1750) chore(ci): Fix dependabot PR failures
+* [GH-1736](https://github.com/apache/cordova-android/pull/1736) chore(deps): bump micromatch from 4.0.5 to 4.0.8
+* [GH-1716](https://github.com/apache/cordova-android/pull/1716) chore(deps): bump braces from 3.0.2 to 3.0.3
+
 ### 13.0.0 (May 15, 2024)
 
 **Breaking Changes:**

cordova-js-src/plugin/android/app.js

@@ -31,14 +31,14 @@ module.exports = {
     },
 
     /**
-    * Load the url into the webview or into new browser instance.
+    * Load the url into the WebView or into new browser instance.
     *
     * @param url           The URL to load
     * @param props         Properties that can be passed in to the activity:
     *      wait: int                           => wait msec before loading URL
     *      loadingDialog: "Title,Message"      => display a native loading dialog
     *      loadUrlTimeoutValue: int            => time in msec to wait before triggering a timeout error
-    *      clearHistory: boolean              => clear webview history (default=false)
+    *      clearHistory: boolean              => clear WebView history (default=false)
     *      openExternal: boolean              => open in a new browser (default=false)
     *
     * Example:

framework/cdv-gradle-config-defaults.json

@@ -1,19 +1,19 @@
 {
     "MIN_SDK_VERSION": 24,
-    "SDK_VERSION": 34,
+    "SDK_VERSION": 35,
     "COMPILE_SDK_VERSION": null,
-    "GRADLE_VERSION": "8.7",
-    "MIN_BUILD_TOOLS_VERSION": "34.0.0",
-    "AGP_VERSION": "8.3.0",
+    "GRADLE_VERSION": "8.13",
+    "MIN_BUILD_TOOLS_VERSION": "35.0.0",
+    "AGP_VERSION": "8.7.3",
     "KOTLIN_VERSION": "1.9.24",
-    "ANDROIDX_APP_COMPAT_VERSION": "1.6.1",
-    "ANDROIDX_WEBKIT_VERSION": "1.6.0",
-    "ANDROIDX_CORE_SPLASHSCREEN_VERSION": "1.0.0",
-    "GRADLE_PLUGIN_GOOGLE_SERVICES_VERSION": "4.3.15",
+    "ANDROIDX_APP_COMPAT_VERSION": "1.7.0",
+    "ANDROIDX_WEBKIT_VERSION": "1.12.1",
+    "ANDROIDX_CORE_SPLASHSCREEN_VERSION": "1.0.1",
+    "GRADLE_PLUGIN_GOOGLE_SERVICES_VERSION": "4.4.2",
     "IS_GRADLE_PLUGIN_GOOGLE_SERVICES_ENABLED": false,
     "IS_GRADLE_PLUGIN_KOTLIN_ENABLED": false,
     "PACKAGE_NAMESPACE": "io.cordova.helloCordova",
-    "JAVA_SOURCE_COMPATIBILITY": 8,
-    "JAVA_TARGET_COMPATIBILITY": 8,
+    "JAVA_SOURCE_COMPATIBILITY": 11,
+    "JAVA_TARGET_COMPATIBILITY": 11,
     "KOTLIN_JVM_TARGET": null
 }

framework/cordova.gradle

@@ -150,7 +150,7 @@ def doGetConfigPreference(name, defaultValue) {
 }
 
 def doApplyCordovaConfigCustomization() {
-    // Apply user overide properties that comes from the "--gradleArg=-P" parameters
+    // Apply user override properties that comes from the "--gradleArg=-P" parameters
     if (project.hasProperty('cdvMinSdkVersion')) {
         cordovaConfig.MIN_SDK_VERSION = Integer.parseInt('' + cdvMinSdkVersion)
     }

framework/src/org/apache/cordova/AllowListPlugin.java

@@ -39,7 +39,7 @@ public class AllowListPlugin extends CordovaPlugin {
     // Used when instantiated via reflection by PluginManager
     public AllowListPlugin() { }
 
-    // These can be used by embedders to allow Java-configuration of an allow list.
+    // These can be used by plugin developers to allow Java-configuration of an allow list.
     public AllowListPlugin(Context context) {
         this(new AllowList(), new AllowList(), null);
         new CustomConfigXmlParser().parse(context);

framework/src/org/apache/cordova/AuthenticationToken.java

@@ -37,8 +37,7 @@ public class AuthenticationToken {
     /**
      * Sets the user name.
      *
-     * @param userName
-     *            the new user name
+     * @param userName the new user name
      */
     public void setUserName(String userName) {
         this.userName = userName;
@@ -56,8 +55,7 @@ public class AuthenticationToken {
     /**
      * Sets the password.
      *
-     * @param password
-     *            the new password
+     * @param password the new password
      */
     public void setPassword(String password) {
         this.password = password;

framework/src/org/apache/cordova/CallbackMap.java

@@ -54,7 +54,7 @@ public class CallbackMap {
      * obtained from registerCallback()
      *
      * @param mappedId      The request code obtained from registerCallback()
-     * @return              The CordovaPlugin and orignal request code that correspond to the
+     * @return              The CordovaPlugin and original request code that correspond to the
      *                      given mappedCode
      */
     public synchronized Pair<CordovaPlugin, Integer> getAndRemoveCallback(int mappedId) {

framework/src/org/apache/cordova/Config.java

@@ -23,7 +23,7 @@ import java.util.List;
 
 import android.app.Activity;
 
-@Deprecated // Use AllowList, CordovaPrefences, etc. directly.
+@Deprecated // Use AllowList, CordovaPreferences, etc. directly.
 public class Config {
     private static final String TAG = "Config";
 

framework/src/org/apache/cordova/CordovaActivity.java

@@ -49,7 +49,7 @@ import androidx.core.splashscreen.SplashScreen;
  * application. It should be extended by the user to load the specific
  * html file that contains the application.
  *
- * As an example:
+ * <p>As an example:</p>
  *
  * <pre>
  *     package org.apache.cordova.examples;
@@ -68,17 +68,16 @@ import androidx.core.splashscreen.SplashScreen;
  *     }
  * </pre>
  *
- * Cordova xml configuration: Cordova uses a configuration file at
- * res/xml/config.xml to specify its settings. See "The config.xml File"
- * guide in cordova-docs at http://cordova.apache.org/docs for the documentation
- * for the configuration. The use of the set*Property() methods is
- * deprecated in favor of the config.xml file.
+ * <p>Cordova xml configuration: Cordova uses a configuration file at
+ * res/xml/config.xml to specify its settings. See the "Config.xml API" documentation for
+ * configuration details at <a href="https://cordova.apache.org/docs">Apache Cordova Docs</a>.</p>
  *
+ * <p>The use of the set*Property() methods is deprecated in favor of the config.xml file.</p>
  */
 public class CordovaActivity extends AppCompatActivity {
     public static String TAG = "CordovaActivity";
 
-    // The webview for our app
+    // The WebView for our app
     protected CordovaWebView appView;
 
     private static int ACTIVITY_STARTING = 0;
@@ -206,7 +205,7 @@ public class CordovaActivity extends AppCompatActivity {
     /**
      * Construct the default web view object.
      * <p/>
-     * Override this to customize the webview that is used.
+     * Override this to customize the WebView that is used.
      */
     protected CordovaWebView makeWebView() {
         return new CordovaWebViewImpl(makeWebViewEngine());
@@ -227,7 +226,7 @@ public class CordovaActivity extends AppCompatActivity {
     }
 
     /**
-     * Load the url into the webview.
+     * Load the url into the WebView.
      */
     public void loadUrl(String url) {
         if (appView == null) {
@@ -250,7 +249,7 @@ public class CordovaActivity extends AppCompatActivity {
 
         if (this.appView != null) {
             // CB-9382 If there is an activity that started for result and main activity is waiting for callback
-            // result, we shoudn't stop WebView Javascript timers, as activity for result might be using them
+            // result, we shouldn't stop WebView Javascript timers, as activity for result might be using them
             boolean keepRunning = this.keepRunning || this.cordovaInterface.activityResultCallback != null;
             this.appView.handlePause(keepRunning);
         }

framework/src/org/apache/cordova/CordovaClientCertRequest.java

@@ -47,8 +47,8 @@ public class CordovaClientCertRequest implements ICordovaClientCertRequest {
         request.cancel();
     }
 
-    /*
-     * Returns the host name of the server requesting the certificate.
+    /**
+     * @return the host name of the server requesting the certificate.
      */
     @SuppressLint("NewApi")
     @Override
@@ -57,8 +57,8 @@ public class CordovaClientCertRequest implements ICordovaClientCertRequest {
         return request.getHost();
     }
 
-    /*
-     * Returns the acceptable types of asymmetric keys (can be null).
+    /**
+     * @return the acceptable types of asymmetric keys (can be null).
      */
     @SuppressLint("NewApi")
     @Override
@@ -67,8 +67,8 @@ public class CordovaClientCertRequest implements ICordovaClientCertRequest {
         return request.getKeyTypes();
     }
 
-    /*
-     * Returns the port number of the server requesting the certificate.
+    /**
+     * @return the port number of the server requesting the certificate.
      */
     @SuppressLint("NewApi")
     @Override
@@ -77,8 +77,8 @@ public class CordovaClientCertRequest implements ICordovaClientCertRequest {
         return request.getPort();
     }
 
-    /*
-     * Returns the acceptable certificate issuers for the certificate matching the private key (can be null).
+    /**
+     * @return the acceptable certificate issuers for the certificate matching the private key (can be null).
      */
     @SuppressLint("NewApi")
     @Override
@@ -87,7 +87,7 @@ public class CordovaClientCertRequest implements ICordovaClientCertRequest {
         return request.getPrincipals();
     }
 
-    /*
+    /**
      * Ignore the request for now. Do not remember user's choice.
      */
     @SuppressLint("NewApi")
@@ -97,7 +97,7 @@ public class CordovaClientCertRequest implements ICordovaClientCertRequest {
         request.ignore();
     }
 
-    /*
+    /**
      * Proceed with the specified private key and client certificate chain. Remember the user's positive choice and use it for future requests.
      *
      * @param privateKey The privateKey

framework/src/org/apache/cordova/CordovaDialogsHelper.java

@@ -118,8 +118,8 @@ public class CordovaDialogsHelper {
      * If the client returns true, WebView will assume that the client will
      * handle the prompt dialog and call the appropriate JsPromptResult method.
      *
-     * Since we are hacking prompts for our own purposes, we should not be using them for
-     * this purpose, perhaps we should hack console.log to do this instead!
+     * <p>Since we are hacking prompts for our own purposes, we should not be using them for
+     * this purpose, perhaps we should hack console.log to do this instead!</p>
      */
     public void showPrompt(String message, String defaultValue, final Result result) {
         // Returning false would also show a dialog, but the default one shows the origin (ugly).

framework/src/org/apache/cordova/CordovaInterface.java

@@ -51,7 +51,8 @@ public interface CordovaInterface {
     /**
      * Get the Android activity.
      *
-     * If a custom engine lives outside of the Activity's lifecycle the return value may be null.
+     * <p>If a custom engine lives outside of the Activity's lifecycle the return value
+     * may be null.</p>
      *
      * @return the Activity
      */
@@ -74,7 +75,7 @@ public interface CordovaInterface {
     public Object onMessage(String id, Object data);
 
     /**
-     * Returns a shared thread pool that can be used for background tasks.
+     * @return a shared thread pool that can be used for background tasks.
      */
     public ExecutorService getThreadPool();
 
@@ -89,7 +90,9 @@ public interface CordovaInterface {
     public void requestPermissions(CordovaPlugin plugin, int requestCode, String [] permissions);
 
     /**
-     * Check for a permission.  Returns true if the permission is granted, false otherwise.
+     * Check for a permission.
+     *
+     * @return true if the permission is granted, false otherwise.
      */
     public boolean hasPermission(String permission);
 

framework/src/org/apache/cordova/CordovaInterfaceImpl.java

@@ -135,7 +135,9 @@ public class CordovaInterfaceImpl implements CordovaInterface {
     }
 
     /**
-     * Routes the result to the awaiting plugin. Returns false if no plugin was waiting.
+     * Routes the result to the awaiting plugin.
+     *
+     * @return false if no plugin was waiting.
      */
     public boolean onActivityResult(int requestCode, int resultCode, Intent intent) {
         CordovaPlugin callback = activityResultCallback;

framework/src/org/apache/cordova/CordovaPlugin.java

@@ -64,7 +64,11 @@ public class CordovaPlugin {
      * Called after plugin construction and fields have been initialized.
      * Prefer to use pluginInitialize instead since there is no value in
      * having parameters on the initialize() function.
+     *
+     * @deprecated Use {@link #pluginInitialize()} instead. This method is no longer recommended
+     *             and will be removed in future versions.
      */
+    @Deprecated
     public void initialize(CordovaInterface cordova, CordovaWebView webView) {
     }
 
@@ -75,7 +79,7 @@ public class CordovaPlugin {
     }
 
     /**
-     * Returns the plugin's service name (what you'd use when calling pluginManger.getPlugin())
+     * @return the plugin's service name (what you'd use when calling pluginManger.getPlugin())
      */
     public String getServiceName() {
         return serviceName;
@@ -84,11 +88,14 @@ public class CordovaPlugin {
     /**
      * Executes the request.
      *
-     * This method is called from the WebView thread. To do a non-trivial amount of work, use:
-     *     cordova.getThreadPool().execute(runnable);
+     * <p>This method is called from the WebView thread. To do a non-trivial
+     * amount of work, use:</p>
      *
-     * To run on the UI thread, use:
-     *     cordova.getActivity().runOnUiThread(runnable);
+     * <pre>cordova.getThreadPool().execute(runnable);</pre>
+     *
+     * <p>To run on the UI thread, use:</p>
+     *
+     * <pre>cordova.getActivity().runOnUiThread(runnable);</pre>
      *
      * @param action          The action to execute.
      * @param rawArgs         The exec() arguments in JSON form.
@@ -103,11 +110,13 @@ public class CordovaPlugin {
     /**
      * Executes the request.
      *
-     * This method is called from the WebView thread. To do a non-trivial amount of work, use:
-     *     cordova.getThreadPool().execute(runnable);
+     * <p>This method is called from the WebView thread. To do a non-trivial amount of work, use:</p>
      *
-     * To run on the UI thread, use:
-     *     cordova.getActivity().runOnUiThread(runnable);
+     * <pre>cordova.getThreadPool().execute(runnable);</pre>
+     *
+     * <p>To run on the UI thread, use:</p>
+     *
+     * <pre>cordova.getActivity().runOnUiThread(runnable);</pre>
      *
      * @param action          The action to execute.
      * @param args            The exec() arguments.
@@ -122,10 +131,10 @@ public class CordovaPlugin {
     /**
      * Executes the request.
      *
-     * This method is called from the WebView thread. To do a non-trivial amount of work, use:
+     * <p>This method is called from the WebView thread. To do a non-trivial amount of work, use:</p>
      *     cordova.getThreadPool().execute(runnable);
      *
-     * To run on the UI thread, use:
+     * <p>To run on the UI thread, use:</p>
      *     cordova.getActivity().runOnUiThread(runnable);
      *
      * @param action          The action to execute.
@@ -227,18 +236,18 @@ public class CordovaPlugin {
     /**
      * Hook for blocking the loading of external resources.
      *
-     * This will be called when the WebView's shouldInterceptRequest wants to
+     * <p>This will be called when the WebView's shouldInterceptRequest wants to
      * know whether to open a connection to an external resource. Return false
      * to block the request: if any plugin returns false, Cordova will block
      * the request. If all plugins return null, the default policy will be
      * enforced. If at least one plugin returns true, and no plugins return
-     * false, then the request will proceed.
+     * false, then the request will proceed.</p>
      *
-     * Note that this only affects resource requests which are routed through
+     * <p>Note that this only affects resource requests which are routed through
      * WebViewClient.shouldInterceptRequest, such as XMLHttpRequest requests and
      * img tag loads. WebSockets and media requests (such as <video> and <audio>
      * tags) are not affected by this method. Use CSP headers to control access
-     * to such resources.
+     * to such resources.</p>
      */
     public Boolean shouldAllowRequest(String url) {
         return null;
@@ -246,13 +255,13 @@ public class CordovaPlugin {
 
     /**
      * Hook for blocking navigation by the Cordova WebView. This applies both to top-level and
-     * iframe navigations.
+     * iframe navigation.
      *
-     * This will be called when the WebView's needs to know whether to navigate
+     * <p>This will be called when the WebView's needs to know whether to navigate
      * to a new page. Return false to block the navigation: if any plugin
      * returns false, Cordova will block the navigation. If all plugins return
      * null, the default policy will be enforced. It at least one plugin returns
-     * true, and no plugins return false, then the navigation will proceed.
+     * true, and no plugins return false, then the navigation will proceed.</p>
      */
     public Boolean shouldAllowNavigation(String url) {
         return null;
@@ -270,12 +279,12 @@ public class CordovaPlugin {
     /**
      * Hook for blocking the launching of Intents by the Cordova application.
      *
-     * This will be called when the WebView will not navigate to a page, but
+     * <p>This will be called when the WebView will not navigate to a page, but
      * could launch an intent to handle the URL. Return false to block this: if
      * any plugin returns false, Cordova will block the navigation. If all
      * plugins return null, the default policy will be enforced. If at least one
      * plugin returns true, and no plugins return false, then the URL will be
-     * opened.
+     * opened.</p>
      */
     public Boolean shouldOpenExternalUrl(String url) {
         return null;
@@ -284,8 +293,8 @@ public class CordovaPlugin {
     /**
      * Allows plugins to handle a link being clicked. Return true here to cancel the navigation.
      *
-     * @param url           The URL that is trying to be loaded in the Cordova webview.
-     * @return              Return true to prevent the URL from loading. Default is false.
+     * @param url           The URL that is trying to be loaded in the Cordova WebView.
+     * @return              true to prevent the URL from loading. Default is false.
      */
     public boolean onOverrideUrlLoading(String url) {
         return false;
@@ -295,17 +304,20 @@ public class CordovaPlugin {
      * Hook for redirecting requests. Applies to WebView requests as well as requests made by plugins.
      * To handle the request directly, return a URI in the form:
      *
-     *    cdvplugin://pluginId/...
+     * <pre>cdvplugin://pluginId/...</pre>
      *
-     * And implement handleOpenForRead().
-     * To make this easier, use the toPluginUri() and fromPluginUri() helpers:
+     * <p>And implement handleOpenForRead().</p>
      *
+     * <p>To make this easier, use the toPluginUri() and fromPluginUri() helpers:</p>
+     *
+     * <pre>
      *     public Uri remapUri(Uri uri) { return toPluginUri(uri); }
      *
      *     public CordovaResourceApi.OpenForReadResult handleOpenForRead(Uri uri) throws IOException {
      *         Uri origUri = fromPluginUri(uri);
      *         ...
      *     }
+     * </pre>
      */
     public Uri remapUri(Uri uri) {
         return null;
@@ -343,9 +355,9 @@ public class CordovaPlugin {
     /**
      * Called when the WebView does a top-level navigation or refreshes.
      *
-     * Plugins should stop any long-running processes and clean up internal state.
+     * <p>Plugins should stop any long-running processes and clean up internal state.</p>
      *
-     * Does nothing by default.
+     * <p>Does nothing by default.</p>
      */
     public void onReset() {
     }
@@ -358,9 +370,7 @@ public class CordovaPlugin {
      * @param handler           The HttpAuthHandler used to set the WebView's response
      * @param host              The host requiring authentication
      * @param realm             The realm for which authentication is required
-     *
-     * @return                  Returns True if plugin will resolve this auth challenge, otherwise False
-     *
+     * @return                  true if the plugin will resolve this auth challenge, else false
      */
     public boolean onReceivedHttpAuthRequest(CordovaWebView view, ICordovaHttpAuthHandler handler, String host, String realm) {
         return false;
@@ -372,9 +382,7 @@ public class CordovaPlugin {
      *
      * @param view              The WebView that is initiating the callback
      * @param request           The client certificate request
-     *
-     * @return                  Returns True if plugin will resolve this auth challenge, otherwise False
-     *
+     * @return                  True if plugin will resolve this auth challenge, otherwise False
      */
     public boolean onReceivedClientCertRequest(CordovaWebView view, ICordovaClientCertRequest request) {
         return false;
@@ -392,20 +400,17 @@ public class CordovaPlugin {
      * Called by the Plugin Manager when we need to actually request permissions
      *
      * @param requestCode   Passed to the activity to track the request
-     *
-     * @return              Returns the permission that was stored in the plugin
+     * @return              The permission that was stored in the plugin
      */
-
     public void requestPermissions(int requestCode) {
     }
 
-    /*
+    /**
      * Called by the WebView implementation to check for geolocation permissions, can be used
      * by other Java methods in the event that a plugin is using this as a dependency.
      *
-     * @return          Returns true if the plugin has all the permissions it needs to operate.
+     * @return          True if the plugin has all the permissions it needs to operate.
      */
-
     public boolean hasPermisssion() {
         return true;
     }
@@ -416,7 +421,6 @@ public class CordovaPlugin {
      * @param requestCode
      * @param permissions
      * @param grantResults
-     * 
      * @deprecated Use {@link #onRequestPermissionsResult} instead.
      */
     @Deprecated
@@ -439,6 +443,7 @@ public class CordovaPlugin {
 
     /**
      * Allow plugins to supply a PathHandler for the WebViewAssetHandler
+     *
      * @return a CordovaPluginPathHandler which listen for paths and returns a response
      */
     public CordovaPluginPathHandler getPathHandler() {
@@ -446,11 +451,13 @@ public class CordovaPlugin {
     }
 
     /**
-     * Called when the WebView's render process has exited. Can be used to collect information regarding the crash for crashlytics or optionally attempt to gracefully handle/recover the crashed webview by recreating it.
+     * Called when the WebView's render process has exited. Can be used to collect information
+     * regarding the crash for crashlytics or optionally attempt to gracefully handle/recover the
+     * crashed WebView by recreating it.
      *
-     * See <a href="https://developer.android.com/reference/android/webkit/WebViewClient#onRenderProcessGone(android.webkit.WebView,%20android.webkit.RenderProcessGoneDetail)">WebViewClient#onRenderProcessGone</a>
+     * <p>See <a href="https://developer.android.com/reference/android/webkit/WebViewClient#onRenderProcessGone(android.webkit.WebView,%20android.webkit.RenderProcessGoneDetail)">WebViewClient#onRenderProcessGone</a></p>
      *
-     * Note: A plugin must not attempt to recover a webview that it does not own/manage.
+     * <p>Note: A plugin must not attempt to recover a WebView that it does not own/manage.</p>
      *
      * @return  true if the host application handled the situation that process has exited,
      *          otherwise, application will crash if render process crashed, or be killed

framework/src/org/apache/cordova/CordovaResourceApi.java

@@ -45,21 +45,36 @@ import java.util.zip.GZIPInputStream;
 
 /**
  * What this class provides:
- * 1. Helpers for reading & writing to URLs.
- *   - E.g. handles assets, resources, content providers, files, data URIs, http[s]
- *   - E.g. Can be used to query for mime-type & content length.
  *
- * 2. To allow plugins to redirect URLs (via remapUrl).
- *   - All plugins should call remapUrl() on URLs they receive from JS *before*
- *     passing the URL onto other utility functions in this class.
- *   - For an example usage of this, refer to the org.apache.cordova.file plugin.
+ * <ol>
+ *   <li>
+ *     Helpers for reading & writing to URLs.
+ *     <ul>
+ *       <li>E.g. handles assets, resources, content providers, files, data URIs, http[s]</li>
+ *       <li>E.g. Can be used to query for mime-type & content length.</p></li>
+ *     </ul>
+ *   </li>
+ *   <li>
+ *     To allow plugins to redirect URLs (via remapUrl).
+ *     <ul>
+ *       <li>
+ *          All plugins should call remapUrl() on URLs they receive from JS *before* passing the URL onto other utility functions in this class.
+ *       </li>
+ *       <li>For an example usage of this, refer to the org.apache.cordova.file plugin.</li>
+ *     </ul>
+ *   </li>
+ * </ol>
  *
- * Future Work:
- *   - Consider using a Cursor to query content URLs for their size (like the file plugin does).
- *   - Allow plugins to remapUri to "cdv-plugin://plugin-name/foo", which CordovaResourceApi
- *     would then delegate to pluginManager.getPlugin(plugin-name).openForRead(url)
- *     - Currently, plugins *can* do this by remapping to a data: URL, but it's inefficient
- *       for large payloads.
+ * <p>Future Work:</p>
+ * <ul>
+ *   <li>Consider using a Cursor to query content URLs for their size (like the file plugin does).</li>
+ *   <li>
+ *     Allow plugins to remapUri to "cdv-plugin://plugin-name/foo", which CordovaResourceApi would then delegate to pluginManager.getPlugin(plugin-name).openForRead(url)
+ *     <ul>
+ *       <li>Currently, plugins *can* do this by remapping to a data: URL, but it's inefficient for large payloads.</li>
+ *     </ul>
+ *   </li>
+ * </ul>
  */
 public class CordovaResourceApi {
     @SuppressWarnings("unused")
@@ -143,8 +158,7 @@ public class CordovaResourceApi {
     }
 
     /**
-     * Returns a File that points to the resource, or null if the resource
-     * is not on the local filesystem.
+     * @return A file that points to the resource, or null if the resource is not on the local filesystem.
      */
     public File mapUriToFile(Uri uri) {
         assertBackgroundThread();
@@ -223,11 +237,12 @@ public class CordovaResourceApi {
 
     /**
      * Opens a stream to the given URI, also providing the MIME type & length.
+     *
      * @return Never returns null.
-     * @throws Throws an InvalidArgumentException for relative URIs. Relative URIs should be
-     *     resolved before being passed into this function.
-     * @throws Throws an IOException if the URI cannot be opened.
-     * @throws Throws an IllegalStateException if called on a foreground thread.
+     * @throws IllegalArgumentException For relative URIs. Relative URIs should be resolved before
+     *                                  being passed into this function.
+     * @throws IOException              If the URI cannot be opened.
+     * @throws IllegalStateException    If called on a foreground thread.
      */
     public OpenForReadResult openForRead(Uri uri) throws IOException {
         return openForRead(uri, false);
@@ -235,11 +250,12 @@ public class CordovaResourceApi {
 
     /**
      * Opens a stream to the given URI, also providing the MIME type & length.
+     *
      * @return Never returns null.
-     * @throws Throws an InvalidArgumentException for relative URIs. Relative URIs should be
-     *     resolved before being passed into this function.
-     * @throws Throws an IOException if the URI cannot be opened.
-     * @throws Throws an IllegalStateException if called on a foreground thread and skipThreadCheck is false.
+     * @throws IllegalArgumentException For relative URIs. Relative URIs should be resolved before
+     *                                  being passed into this function.
+     * @throws IOException              If the URI cannot be opened.
+     * @throws IllegalStateException    If called on a foreground thread and skipThreadCheck is false.
      */
     public OpenForReadResult openForRead(Uri uri, boolean skipThreadCheck) throws IOException {
         if (!skipThreadCheck) {
@@ -320,10 +336,11 @@ public class CordovaResourceApi {
 
     /**
      * Opens a stream to the given URI.
+     *
      * @return Never returns null.
-     * @throws Throws an InvalidArgumentException for relative URIs. Relative URIs should be
-     *     resolved before being passed into this function.
-     * @throws Throws an IOException if the URI cannot be opened.
+     * @throws IllegalArgumentException For relative URIs. Relative URIs should be resolved before
+     *                                  being passed into this function.
+     * @throws IOException              If the URI cannot be opened.
      */
     public OutputStream openOutputStream(Uri uri, boolean append) throws IOException {
         assertBackgroundThread();

framework/src/org/apache/cordova/CordovaWebView.java

@@ -25,13 +25,13 @@ import android.view.View;
 import android.webkit.WebChromeClient.CustomViewCallback;
 
 /**
- * Main interface for interacting with a Cordova webview - implemented by CordovaWebViewImpl.
+ * Main interface for interacting with a Cordova WebView - implemented by CordovaWebViewImpl.
  * This is an interface so that it can be easily mocked in tests.
- * Methods may be added to this interface without a major version bump, as plugins & embedders
+ * Methods may be added to this interface without a major version bump, as plugins/developer
  * are not expected to implement it.
  */
 public interface CordovaWebView {
-    public static final String CORDOVA_VERSION = "13.0.0";
+    public static final String CORDOVA_VERSION = "14.0.1";
 
     void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);
 
@@ -70,34 +70,47 @@ public interface CordovaWebView {
     /**
      * Send JavaScript statement back to JavaScript.
      *
-     * Deprecated (https://issues.apache.org/jira/browse/CB-6851)
+     * <p>Deprecated (<a href="https://issues.apache.org/jira/browse/CB-6851">CB-6851</a>)
      * Instead of executing snippets of JS, you should use the exec bridge
-     * to create a Java->JS communication channel.
-     * To do this:
-     * 1. Within plugin.xml (to have your JS run before deviceready):
-     *    <js-module><runs/></js-module>
-     * 2. Within your .js (call exec on start-up):
+     * to create a Java->JS communication channel.</p>
+     *
+     * <p>To do this:</p>
+     *
+     * <p>1. Within plugin.xml (to have your JS run before deviceready):</p>
+     *
+     * <pre>
+     * <js-module><runs/></js-module>
+     * </pre>
+     *
+     * <p>2. Within your .js (call exec on start-up):</p>
+     *
+     * <pre>
      *    require('cordova/channel').onCordovaReady.subscribe(function() {
      *      require('cordova/exec')(win, null, 'Plugin', 'method', []);
      *      function win(message) {
      *        ... process message from java here ...
      *      }
      *    });
-     * 3. Within your .java:
+     * </pre>
+     *
+     * <p>3. Within your .java:</p>
+     *
+     * <pre>
      *    PluginResult dataResult = new PluginResult(PluginResult.Status.OK, CODE);
      *    dataResult.setKeepCallback(true);
      *    savedCallbackContext.sendPluginResult(dataResult);
+     * </pre>
      */
     @Deprecated
     void sendJavascript(String statememt);
 
     /**
-     * Load the specified URL in the Cordova webview or a new browser instance.
+     * Load the specified URL in the Cordova WebView or a new browser instance.
      *
-     * NOTE: If openExternal is false, only allow listed URLs can be loaded.
+     * <p>NOTE: If openExternal is false, only allow listed URLs can be loaded.</p>
      *
      * @param url           The url to load.
-     * @param openExternal  Load url in browser instead of Cordova webview.
+     * @param openExternal  Load url in browser instead of Cordova WebView.
      * @param clearHistory  Clear the history stack, so new page becomes top of history
      * @param params        Parameters for new app
      */

framework/src/org/apache/cordova/CordovaWebViewEngine.java

@@ -59,7 +59,7 @@ public interface CordovaWebViewEngine {
     /** Clean up all resources associated with the WebView. */
     void destroy();
 
-    /** Add the evaulate Javascript method **/
+    /** Add the evaluate Javascript method **/
     void evaluateJavascript(String js, ValueCallback<String> callback);
 
     /**

framework/src/org/apache/cordova/CordovaWebViewImpl.java

@@ -43,7 +43,7 @@ import java.util.Map;
 import java.util.Set;
 
 /**
- * Main class for interacting with a Cordova webview. Manages plugins, events, and a CordovaWebViewEngine.
+ * Main class for interacting with a Cordova WebView. Manages plugins, events, and a CordovaWebViewEngine.
  * Class uses two-phase initialization. You must call init() before calling any other methods.
  */
 public class CordovaWebViewImpl implements CordovaWebView {
@@ -154,7 +154,7 @@ public class CordovaWebViewImpl implements CordovaWebView {
                 stopLoading();
                 LOG.e(TAG, "CordovaWebView: TIMEOUT ERROR!");
 
-                // Handle other errors by passing them to the webview in JS
+                // Handle other errors by passing them to the WebView in JS
                 JSONObject data = new JSONObject();
                 try {
                     data.put("errorCode", -6);
@@ -219,7 +219,7 @@ public class CordovaWebViewImpl implements CordovaWebView {
             engine.clearHistory();
         }
 
-        // If loading into our webview
+        // If loading into our WebView
         if (!openExternal) {
             // Make sure url is in allow list
             if (pluginManager.shouldAllowNavigation(url)) {
@@ -487,7 +487,7 @@ public class CordovaWebViewImpl implements CordovaWebView {
 
         // If app doesn't want to run in background
         if (!keepRunning) {
-            // Pause JavaScript timers. This affects all webviews within the app!
+            // Pause JavaScript timers. This affects all WebViews within the app!
             engine.setPaused(true);
         }
     }
@@ -497,7 +497,7 @@ public class CordovaWebViewImpl implements CordovaWebView {
             return;
         }
 
-        // Resume JavaScript timers. This affects all webviews within the app!
+        // Resume JavaScript timers. This affects all WebViews within the app!
         engine.setPaused(false);
         this.pluginManager.onResume(keepRunning);
 
@@ -537,7 +537,7 @@ public class CordovaWebViewImpl implements CordovaWebView {
         // We should use a blank data: url instead so it's more obvious
         this.loadUrl("about:blank");
 
-        // TODO: Should not destroy webview until after about:blank is done loading.
+        // TODO: Should not destroy WebView until after about:blank is done loading.
         engine.destroy();
         hideCustomView();
     }

framework/src/org/apache/cordova/CoreAndroid.java

@@ -69,8 +69,9 @@ public class CoreAndroid extends CordovaPlugin {
      * Executes the request and returns PluginResult.
      *
      * @param action            The action to execute.
-     * @param args              JSONArry of arguments for the plugin.
+     * @param args              JSONArray of arguments for the plugin.
      * @param callbackContext   The callback context from which we were invoked.
+     *
      * @return                  A PluginResult object with a status and message.
      */
     @Override
@@ -83,9 +84,9 @@ public class CoreAndroid extends CordovaPlugin {
                 this.clearCache();
             }
             else if (action.equals("show")) {
-                // This gets called from JavaScript onCordovaReady to show the webview.
+                // This gets called from JavaScript onCordovaReady to show the WebView.
                 // I recommend we change the name of the Message as spinner/stop is not
-                // indicative of what this actually does (shows the webview).
+                // indicative of what this actually does (shows the WebView).
                 cordova.getActivity().runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
@@ -154,7 +155,7 @@ public class CoreAndroid extends CordovaPlugin {
     }
 
     /**
-     * Load the url into the webview.
+     * Load the url into the WebView.
      *
      * @param url
      * @param props			Properties that can be passed in to the Cordova activity (i.e. loadingDialog, wait, ...)
@@ -354,9 +355,8 @@ public class CoreAndroid extends CordovaPlugin {
         }
     }
 
-    /*
+    /**
      * Unregister the receiver
-     *
      */
     @Override
     public void onDestroy()

framework/src/org/apache/cordova/ICordovaClientCertRequest.java

@@ -31,32 +31,32 @@ public interface ICordovaClientCertRequest {
      */
     public void cancel();
 
-    /*
-     * Returns the host name of the server requesting the certificate.
+    /**
+     * @return the host name of the server requesting the certificate.
      */
     public String getHost();
 
-    /*
-     * Returns the acceptable types of asymmetric keys (can be null).
+    /**
+     * @return the acceptable types of asymmetric keys (can be null).
      */
     public String[] getKeyTypes();
 
-    /*
-     * Returns the port number of the server requesting the certificate.
+    /**
+     * @return the port number of the server requesting the certificate.
      */
     public int getPort();
 
-    /*
-     * Returns the acceptable certificate issuers for the certificate matching the private key (can be null).
+    /**
+     * @return the acceptable certificate issuers for the certificate matching the private key (can be null).
      */
     public Principal[] getPrincipals();
 
-    /*
+    /**
      * Ignore the request for now. Do not remember user's choice.
      */
     public void ignore();
 
-    /*
+    /**
      * Proceed with the specified private key and client certificate chain. Remember the user's positive choice and use it for future requests.
      *
      * @param privateKey The privateKey

framework/src/org/apache/cordova/LOG.java

@@ -23,8 +23,8 @@ import android.util.Log;
 /**
  * Log to Android logging system.
  *
- * Log message can be a string or a printf formatted string with arguments.
- * See http://developer.android.com/reference/java/util/Formatter.html
+ * <p>Log message can be a string or a printf formatted string with arguments.
+ * See <a href="http://developer.android.com/reference/java/util/Formatter.html">Formatter</a></p>
  */
 public class LOG {
 

framework/src/org/apache/cordova/NativeToJsMessageQueue.java

@@ -124,12 +124,10 @@ public class NativeToJsMessageQueue {
     }
 
     /**
-     * Combines and returns queued messages combined into a single string.
-     *
      * Combines as many messages as possible, without exceeding
      * COMBINED_RESPONSE_CUTOFF in case of multiple response messages.
      *
-     * Returns null if the queue is empty.
+     * @return a string of queued messages combined or null if the queue is empty.
      */
     public String popAndEncode(boolean fromOnlineEvent) {
         synchronized (this) {

framework/src/org/apache/cordova/PermissionHelper.java

@@ -66,7 +66,6 @@ public class PermissionHelper {
      *
      * @param plugin        The plugin the permission is being checked against
      * @param permission    The permission to be checked
-     *
      * @return              True if the permission has already been granted and false otherwise
      */
     public static boolean hasPermission(CordovaPlugin plugin, String permission) {

framework/src/org/apache/cordova/PluginEntry.java

@@ -48,36 +48,36 @@ public final class PluginEntry {
     /**
      * Constructs with a CordovaPlugin already instantiated.
      *
-     * @param service               The name of the service
-     * @param pluginClass           The plugin class name
+     * @param service   The name of the service
+     * @param plugin    The plugin class name
      */
     public PluginEntry(String service, CordovaPlugin plugin) {
         this(service, plugin.getClass().getName(), true, plugin);
     }
 
     /**
-     * @param service               The name of the service
-     * @param plugin                The CordovaPlugin already instantiated
-     * @param onload                Create plugin object when HTML page is loaded
+     * @param service   The name of the service
+     * @param plugin    The CordovaPlugin already instantiated
+     * @param onload    Create plugin object when HTML page is loaded
      */
     public PluginEntry(String service, CordovaPlugin plugin, boolean onload) {
         this(service, plugin.getClass().getName(), onload, plugin);
     }
 
     /**
-     * @param service               The name of the service
-     * @param pluginClass           The plugin class name
-     * @param onload                Create plugin object when HTML page is loaded
+     * @param service       The name of the service
+     * @param pluginClass   The plugin class name
+     * @param onload        Create plugin object when HTML page is loaded
      */
     public PluginEntry(String service, String pluginClass, boolean onload) {
         this(service, pluginClass, onload, null);
     }
 
     /**
-     * @param service               The name of the service
-     * @param pluginClass           The plugin class name
-     * @param onload                Create plugin object when HTML page is loaded
-     * @param plugin                The CordovaPlugin already instantiated
+     * @param service       The name of the service
+     * @param pluginClass   The plugin class name
+     * @param onload        Create plugin object when HTML page is loaded
+     * @param plugin        The CordovaPlugin already instantiated
      */
     private PluginEntry(String service, String pluginClass, boolean onload, CordovaPlugin plugin) {
         this.service = service;

framework/src/org/apache/cordova/PluginManager.java

@@ -38,8 +38,8 @@ import android.webkit.WebView;
 /**
  * PluginManager is exposed to JavaScript in the Cordova WebView.
  *
- * Calling native plugin code can be done by calling PluginManager.exec(...)
- * from JavaScript.
+ * <p>Calling native plugin code can be done by calling PluginManager.exec(...)
+ * from JavaScript.</p>
  */
 public class PluginManager {
     private static String TAG = "PluginManager";
@@ -87,7 +87,7 @@ public class PluginManager {
     }
 
     /**
-     * Init when loading a new HTML page into webview.
+     * Init when loading a new HTML page into WebView.
      */
     public void init() {
         LOG.d(TAG, "init()");
@@ -121,9 +121,9 @@ public class PluginManager {
      * Receives a request for execution and fulfills it by finding the appropriate
      * Java class and calling it's execute method.
      *
-     * PluginManager.exec can be used either synchronously or async. In either case, a JSON encoded
+     * <p>PluginManager.exec can be used either synchronously or async. In either case, a JSON encoded
      * string is returned that will indicate if any errors have occurred when trying to find
-     * or execute the class denoted by the clazz argument.
+     * or execute the class denoted by the clazz argument.</p>
      *
      * @param service       String containing the service to run
      * @param action        String containing the action that the class is supposed to perform. This is
@@ -252,9 +252,7 @@ public class PluginManager {
      * @param handler           The HttpAuthHandler used to set the WebView's response
      * @param host              The host requiring authentication
      * @param realm             The realm for which authentication is required
-     *
-     * @return                  Returns True if there is a plugin which will resolve this auth challenge, otherwise False
-     *
+     * @return                  True if there is a plugin which will resolve this auth challenge, otherwise False
      */
     public boolean onReceivedHttpAuthRequest(CordovaWebView view, ICordovaHttpAuthHandler handler, String host, String realm) {
         synchronized (this.pluginMap) {
@@ -273,9 +271,7 @@ public class PluginManager {
      *
      * @param view              The WebView that is initiating the callback
      * @param request           The client certificate request
-     *
-     * @return                  Returns True if plugin will resolve this auth challenge, otherwise False
-     *
+     * @return                  True if plugin will resolve this auth challenge, otherwise False
      */
     public boolean onReceivedClientCertRequest(CordovaWebView view, ICordovaClientCertRequest request) {
         synchronized (this.pluginMap) {
@@ -375,12 +371,14 @@ public class PluginManager {
     }
 
     /**
-     * @todo should we move this somewhere public and accessible by all plugins?
-     * For now, it is placed where it is used and kept private so we can decide later and move without causing a breaking change.
-     * An ideal location might be in the "ConfigXmlParser" at the time it generates the "launchUrl".
+     * TODO: should we move this somewhere public and accessible by all plugins?
      *
-     * @todo should we be restrictive on the "file://" return? e.g. "file:///android_asset/www/"
-     * Would be considered as a breaking change if we apply a more granular check.
+     * <p>For now, it is placed where it is used and kept private so we can decide later and move without causing a breaking change.
+     * An ideal location might be in the "ConfigXmlParser" at the time it generates the "launchUrl".</p>
+     *
+     * TODO: should we be restrictive on the "file://" return? e.g. "file:///android_asset/www/"
+     *
+     * <p>Would be considered as a breaking change if we apply a more granular check.</p>
      */
     private String getLaunchUrlPrefix() {
         if (!app.getPreferences().getBoolean("AndroidInsecureFileModeEnabled", false)) {
@@ -393,14 +391,14 @@ public class PluginManager {
     }
 
     /**
-     * Called when the webview is going to request an external resource.
+     * Called when the WebView is going to request an external resource.
      *
-     * This delegates to the installed plugins, and returns true/false for the
+     * <p>This delegates to the installed plugins, and returns true/false for the
      * first plugin to provide a non-null result.  If no plugins respond, then
-     * the default policy is applied.
+     * the default policy is applied.</p>
      *
      * @param url       The URL that is being requested.
-     * @return          Returns true to allow the resource to load,
+     * @return          true to allow the resource to load,
      *                  false to block the resource.
      */
     public boolean shouldAllowRequest(String url) {
@@ -425,7 +423,7 @@ public class PluginManager {
             return true;
         }
         if (url.startsWith("file://")) {
-            //This directory on WebKit/Blink based webviews contains SQLite databases!
+            //This directory on WebKit/Blink based WebViews contains SQLite databases!
             //DON'T CHANGE THIS UNLESS YOU KNOW WHAT YOU'RE DOING!
             return !url.contains("/app_webview/");
         }
@@ -433,14 +431,14 @@ public class PluginManager {
     }
 
     /**
-     * Called when the webview is going to change the URL of the loaded content.
+     * Called when the WebView is going to change the URL of the loaded content.
      *
-     * This delegates to the installed plugins, and returns true/false for the
+     * <p>This delegates to the installed plugins, and returns true/false for the
      * first plugin to provide a non-null result.  If no plugins respond, then
-     * the default policy is applied.
+     * the default policy is applied.</p>
      *
      * @param url       The URL that is being requested.
-     * @return          Returns true to allow the navigation,
+     * @return          true to allow the navigation,
      *                  false to block the navigation.
      */
     public boolean shouldAllowNavigation(String url) {
@@ -462,7 +460,7 @@ public class PluginManager {
 
 
     /**
-     * Called when the webview is requesting the exec() bridge be enabled.
+     * Called when the WebView is requesting the exec() bridge be enabled.
      */
     public boolean shouldAllowBridgeAccess(String url) {
         synchronized (this.entryMap) {
@@ -482,15 +480,15 @@ public class PluginManager {
     }
 
     /**
-     * Called when the webview is going not going to navigate, but may launch
+     * Called when the WebView is going not going to navigate, but may launch
      * an Intent for an URL.
      *
-     * This delegates to the installed plugins, and returns true/false for the
+     * <p>This delegates to the installed plugins, and returns true/false for the
      * first plugin to provide a non-null result.  If no plugins respond, then
-     * the default policy is applied.
+     * the default policy is applied.</p>
      *
      * @param url       The URL that is being requested.
-     * @return          Returns true to allow the URL to launch an intent,
+     * @return          true to allow the URL to launch an intent,
      *                  false to block the intent.
      */
     public Boolean shouldOpenExternalUrl(String url) {
@@ -511,7 +509,7 @@ public class PluginManager {
     }
 
     /**
-     * Called when the URL of the webview changes.
+     * Called when the URL of the WebView changes.
      *
      * @param url               The URL that is being changed to.
      * @return                  Return false to allow the URL to load, return true to prevent the URL from loading.
@@ -623,9 +621,9 @@ public class PluginManager {
     /**
      * Called when the WebView's render process has exited.
      *
-     * See https://developer.android.com/reference/android/webkit/WebViewClient#onRenderProcessGone(android.webkit.WebView,%20android.webkit.RenderProcessGoneDetail)
+     * <p>See <a href="https://developer.android.com/reference/android/webkit/WebViewClient#onRenderProcessGone(android.webkit.WebView,%20android.webkit.RenderProcessGoneDetail)">WebViewClient#onRenderProcessGone</a></p>
      *
-     * @return  true if the host application handled the situation that process has exited,
+     * @return true if the host application handled the situation that process has exited,
      *          otherwise, application will crash if render process crashed, or be killed 
      *          if render process was killed by the system.
      */

framework/src/org/apache/cordova/PluginResult.java

@@ -118,8 +118,7 @@ public class PluginResult {
     }
 
     /**
-     * If messageType == MESSAGE_TYPE_STRING, then returns the message string.
-     * Otherwise, returns null.
+     * @return message string when messageType is MESSAGE_TYPE_STRING otherwise null.
      */
     public String getStrMessage() {
         return strMessage;

framework/src/org/apache/cordova/SplashScreenPlugin.java

@@ -45,25 +45,25 @@ public class SplashScreenPlugin extends CordovaPlugin {
 
     // Config preference values
     /**
-     * @param boolean autoHide to auto splash screen (default=true)
+     * Boolean flag to auto hide splash screen (default=true)
      */
     private boolean autoHide;
     /**
-     * @param int delayTime in milliseconds (default=-1)
+     * Integer value of how long to delay in milliseconds (default=-1)
      */
     private int delayTime;
     /**
-     * @param int fade to fade out splash screen (default=true)
+     * Boolean flag if to fade to fade out splash screen (default=true)
      */
     private boolean isFadeEnabled;
     /**
-     * @param int fadeDuration fade out duration in milliseconds (default=500)
+     * Integer value of the fade duration in milliseconds (default=500)
      */
     private int fadeDuration;
 
     // Internal variables
     /**
-     * @param boolean keepOnScreen flag to determine if the splash screen remains visible.
+     * Boolean flag to determine if the splash screen remains visible.
      */
     private boolean keepOnScreen = true;
 

framework/src/org/apache/cordova/engine/SystemWebChromeClient.java

@@ -119,8 +119,8 @@ public class SystemWebChromeClient extends WebChromeClient {
      * If the client returns true, WebView will assume that the client will
      * handle the prompt dialog and call the appropriate JsPromptResult method.
      *
-     * Since we are hacking prompts for our own purposes, we should not be using them for
-     * this purpose, perhaps we should hack console.log to do this instead!
+     * <p>Since we are hacking prompts for our own purposes, we should not be using them for
+     * this purpose, perhaps we should hack console.log to do this instead!</p>
      */
     @Override
     public boolean onJsPrompt(WebView view, String origin, String message, String defaultValue, final JsPromptResult result) {
@@ -155,15 +155,15 @@ public class SystemWebChromeClient extends WebChromeClient {
         quotaUpdater.updateQuota(MAX_QUOTA);
     }
 
-    @Override
     /**
      * Instructs the client to show a prompt to ask the user to set the Geolocation permission state for the specified origin.
      *
-     * This also checks for the Geolocation Plugin and requests permission from the application  to use Geolocation.
+     * <p>This also checks for the Geolocation Plugin and requests permission from the application  to use Geolocation.</p>
      *
      * @param origin
      * @param callback
      */
+    @Override
     public void onGeolocationPermissionsShowPrompt(String origin, Callback callback) {
         super.onGeolocationPermissionsShowPrompt(origin, callback);
         callback.invoke(origin, true, false);
@@ -188,12 +188,13 @@ public class SystemWebChromeClient extends WebChromeClient {
         parentEngine.getCordovaWebView().hideCustomView();
     }
 
-    @Override
     /**
      * Ask the host application for a custom progress view to show while
      * a <video> is loading.
+     *
      * @return View The progress view.
      */
+    @Override
     public View getVideoLoadingProgressView() {
         if (mVideoProgressView == null) {
             // Create a new Loading view programmatically.
@@ -204,7 +205,7 @@ public class SystemWebChromeClient extends WebChromeClient {
             RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
             layoutParams.addRule(RelativeLayout.CENTER_IN_PARENT);
             layout.setLayoutParams(layoutParams);
-            // the proress bar
+            // the progress bar
             ProgressBar bar = new ProgressBar(parentEngine.getView().getContext());
             LinearLayout.LayoutParams barLayoutParams = new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
             barLayoutParams.gravity = Gravity.CENTER;

framework/src/org/apache/cordova/engine/SystemWebViewClient.java

@@ -199,7 +199,7 @@ public class SystemWebViewClient extends WebViewClient {
      * one time for the main frame. This also means that onPageStarted will not be called when the contents of an
      * embedded frame changes, i.e. clicking a link whose target is an iframe.
      *
-     * @param view          The webview initiating the callback.
+     * @param view          The WebView initiating the callback.
      * @param url           The url of the page.
      */
     @Override
@@ -216,7 +216,7 @@ public class SystemWebViewClient extends WebViewClient {
      * This method is called only for main frame. When onPageFinished() is called, the rendering picture may not be updated yet.
      *
      *
-     * @param view          The webview initiating the callback.
+     * @param view          The WebView initiating the callback.
      * @param url           The url of the page.
      */
     @Override
@@ -228,7 +228,7 @@ public class SystemWebViewClient extends WebViewClient {
         }
         isCurrentlyLoading = false;
 
-        /**
+        /*
          * Because of a timing issue we need to clear this history in onPageFinished as well as
          * onPageStarted. However we only want to do this if the doClearHistory boolean is set to
          * true. You see when you load a url with a # in it which is common in jQuery applications
@@ -332,7 +332,6 @@ public class SystemWebViewClient extends WebViewClient {
      *
      * @param host
      * @param realm
-     *
      * @return the authentication token or null if did not exist
      */
     public AuthenticationToken removeAuthenticationToken(String host, String realm) {
@@ -342,15 +341,16 @@ public class SystemWebViewClient extends WebViewClient {
     /**
      * Gets the authentication token.
      *
-     * In order it tries:
-     * 1- host + realm
-     * 2- host
-     * 3- realm
-     * 4- no host, no realm
+     * <p>In order it tries:</p>
+     * <ol>
+     *  <li>host + realm</li>
+     *  <li>host</li>
+     *  <li>realm</li>
+     *  <li>no host, no realm</li>
+     * </ol>
      *
      * @param host
      * @param realm
-     *
      * @return the authentication token
      */
     public AuthenticationToken getAuthenticationToken(String host, String realm) {

framework/src/org/apache/cordova/engine/SystemWebViewEngine.java

@@ -110,7 +110,7 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {
         nativeToJsMessageQueue.addBridgeMode(new NativeToJsMessageQueue.OnlineEventsBridgeMode(new NativeToJsMessageQueue.OnlineEventsBridgeMode.OnlineEventsBridgeModeDelegate() {
             @Override
             public void setNetworkAvailable(boolean value) {
-                //sometimes this can be called after calling webview.destroy() on destroy()
+                //sometimes this can be called after calling webView.destroy() on destroy()
                 //thus resulting in a NullPointerException
                 if(webView!=null) {
                    webView.setNetworkAvailable(value);
@@ -175,9 +175,9 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {
         String databasePath = webView.getContext().getApplicationContext().getDir("database", Context.MODE_PRIVATE).getPath();
         settings.setDatabaseEnabled(true);
 
-        // The default is to use the module's debuggable state to decide if the webview inspecter
-        // should be enabled. However, users can configure InspectableWebview preference to forcefully enable
-        // or disable the webview inspecter.
+        // The default is to use the module's debuggable state to decide if the WebView inspector
+        // should be enabled. However, users can configure InspectableWebView preference to forcefully enable
+        // or disable the WebView inspector.
         String inspectableWebview = preferences.getString("InspectableWebview", null);
         boolean shouldEnableInspector = false;
         if (inspectableWebview == null) {
@@ -249,7 +249,7 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {
 
 
     /**
-     * Load the url into the webview.
+     * Load the url into the WebView.
      */
     @Override
     public void loadUrl(final String url, boolean clearNavigationStack) {
@@ -288,7 +288,7 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {
      */
     @Override
     public boolean goBack() {
-        // Check webview first to see if there is a history
+        // Check WebView first to see if there is a history
         // This is needed to support curPage#diffLink, since they are added to parentEngine's history, but not our history url array (JQMobile behavior)
         if (webView.canGoBack()) {
             webView.goBack();

lib/Adb.js

@@ -17,7 +17,7 @@
     under the License.
 */
 
-const os = require('os');
+const os = require('node:os');
 const execa = require('execa');
 const events = require('cordova-common').events;
 const CordovaError = require('cordova-common').CordovaError;

lib/AndroidManifest.js

@@ -17,7 +17,7 @@
     under the License.
 */
 
-const fs = require('fs');
+const fs = require('node:fs');
 const xml = require('cordova-common').xmlHelpers;
 
 const DEFAULT_ORIENTATION = 'default';

lib/AndroidProject.js

@@ -17,8 +17,8 @@
     under the License.
 */
 
-const fs = require('fs');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
 const properties_parser = require('properties-parser');
 const pluginHandlers = require('./pluginHandlers');
 const CordovaGradleConfigParserFactory = require('./config/CordovaGradleConfigParserFactory');

lib/Api.js

@@ -17,7 +17,7 @@
     under the License.
 */
 
-const path = require('path');
+const path = require('node:path');
 
 const AndroidProject = require('./AndroidProject');
 const PluginManager = require('cordova-common').PluginManager;

lib/build.js

@@ -17,8 +17,8 @@
        under the License.
 */
 
-const path = require('path');
-const fs = require('fs');
+const path = require('node:path');
+const fs = require('node:fs');
 const nopt = require('nopt');
 const untildify = require('untildify');
 const { parseArgsStringToArgv } = require('string-argv');

lib/builders/ProjectBuilder.js

@@ -17,8 +17,9 @@
        under the License.
 */
 
-const fs = require('fs-extra');
-const path = require('path');
+const fs = require('node:fs');
+const fsp = require('node:fs/promises');
+const path = require('node:path');
 const execa = require('execa');
 const glob = require('fast-glob');
 const events = require('cordova-common').events;
@@ -174,7 +175,7 @@ class ProjectBuilder {
             try {
                 fs.accessSync(subProjectGradle, fs.F_OK);
             } catch (e) {
-                fs.copySync(pluginBuildGradle, subProjectGradle);
+                fs.cpSync(pluginBuildGradle, subProjectGradle);
             }
         };
 
@@ -207,7 +208,7 @@ class ProjectBuilder {
             settingsGradlePaths.join(''));
 
         // Touch empty cdv-gradle-name.gradle file if missing.
-        if (!fs.pathExistsSync(path.join(this.root, 'cdv-gradle-name.gradle'))) {
+        if (!fs.existsSync(path.join(this.root, 'cdv-gradle-name.gradle'))) {
             fs.writeFileSync(path.join(this.root, 'cdv-gradle-name.gradle'), '');
         }
 
@@ -285,21 +286,60 @@ class ProjectBuilder {
     prepEnv (opts) {
         const self = this;
         const config = this._getCordovaConfig();
+        const configPropertiesPath = path.join(self.root, 'tools', '.gradle', 'config.properties');
+
         return check_reqs.check_gradle()
             .then(function () {
                 events.emit('verbose', `Using Gradle: ${config.GRADLE_VERSION}`);
                 return self.installGradleWrapper(config.GRADLE_VERSION);
+            }).then(async function () {
+                try {
+                    // Try to create "config.properties" file if missing
+                    const fd = fs.openSync(configPropertiesPath, 'wx+', 0o600);
+                    fs.writeFileSync(fd, '', 'utf8');
+                    fs.closeSync(fd);
+                } catch {
+                    // File already existed, nothing to do.
+                }
+
+                // Loads "config.properties"for editing
+                const configProperties = createEditor(configPropertiesPath);
+                /*
+                 * File is replaced on each build. "before_build" hook scripts can inject
+                 * custom settings before this step runs. This step will still overwrite
+                 * the "java.home" setting. Ensure environment variables are properly
+                 * configured if want to use custom "java.home".
+                 *
+                 * Sets "java.home" using the "CORDOVA_JAVA_HOME" environment variable.
+                 * If unavailable, fallback to "JAVA_HOME".
+                 * If neither is set, "java.home" is removed (if previously set),
+                 * allowing Android Studio to display a warning and auto-configure
+                 * to use its internal (bundled) Java.
+                 */
+                const javaHome = process.env.CORDOVA_JAVA_HOME || process.env.JAVA_HOME || false;
+                if (javaHome) {
+                    configProperties.set('java.home', javaHome);
+                } else {
+                    configProperties.unset('java.home');
+                }
+                // Saves changes
+                configProperties.save();
+            }).then(async function () {
+                await fsp.cp(path.join(self.root, 'tools', 'gradle'), path.join(self.root, 'gradle'), { recursive: true, force: true });
+                await fsp.cp(path.join(self.root, 'tools', 'gradlew'), path.join(self.root, 'gradlew'), { recursive: true, force: true });
+                await fsp.cp(path.join(self.root, 'tools', 'gradlew.bat'), path.join(self.root, 'gradlew.bat'), { recursive: true, force: true });
+                await fsp.cp(path.join(self.root, 'tools', '.gradle'), path.join(self.root, '.gradle'), { recursive: true, force: true });
             }).then(function () {
                 return self.prepBuildFiles();
             }).then(() => {
                 const signingPropertiesPath = path.join(self.root, `${opts.buildType}${SIGNING_PROPERTIES}`);
-
-                if (fs.existsSync(signingPropertiesPath)) fs.removeSync(signingPropertiesPath);
                 if (opts.packageInfo) {
-                    fs.ensureFileSync(signingPropertiesPath);
+                    fs.writeFileSync(signingPropertiesPath, '', 'utf8');
                     const signingProperties = createEditor(signingPropertiesPath);
                     signingProperties.addHeadComment(TEMPLATE);
                     opts.packageInfo.appendToProperties(signingProperties);
+                } else {
+                    fs.rmSync(signingPropertiesPath, { force: true });
                 }
             });
     }
@@ -309,7 +349,7 @@ class ProjectBuilder {
      * @returns The user defined configs
      */
     _getCordovaConfig () {
-        return fs.readJSONSync(path.join(this.root, 'cdv-gradle-config.json'));
+        return JSON.parse(fs.readFileSync(path.join(this.root, 'cdv-gradle-config.json'), 'utf-8') || '{}');
     }
 
     /*
@@ -342,7 +382,7 @@ class ProjectBuilder {
         const args = this.getArgs('clean', opts);
         return execa(wrapper, args, { stdio: 'inherit', cwd: path.resolve(this.root) })
             .then(() => {
-                fs.removeSync(path.join(this.root, 'out'));
+                fs.rmSync(path.join(this.root, 'out'), { recursive: true, force: true });
 
                 ['debug', 'release'].map(config => path.join(this.root, `${config}${SIGNING_PROPERTIES}`))
                     .forEach(file => {
@@ -350,7 +390,7 @@ class ProjectBuilder {
                         const hasMarker = hasFile && fs.readFileSync(file, 'utf8')
                             .includes(MARKER);
 
-                        if (hasFile && hasMarker) fs.removeSync(file);
+                        if (hasFile && hasMarker) fs.rmSync(file);
                     });
             });
     }

lib/check_reqs.js

@@ -17,9 +17,8 @@
        under the License.
 */
 
-const execa = require('execa');
-const path = require('path');
-const fs = require('fs-extra');
+const path = require('node:path');
+const fs = require('node:fs');
 const { forgivingWhichSync, isWindows, isDarwin } = require('./utils');
 const java = require('./env/java');
 const { CordovaError, ConfigParser, events } = require('cordova-common');
@@ -104,44 +103,7 @@ function getUserCompileSdkVersion (projectRoot) {
 }
 
 module.exports.get_gradle_wrapper = function () {
-    let androidStudioPath;
-    let i = 0;
-    let foundStudio = false;
-    let program_dir;
-    // OK, This hack only works on Windows, not on Mac OS or Linux.  We will be deleting this eventually!
-    if (module.exports.isWindows()) {
-        const result = execa.sync(path.join(__dirname, 'getASPath.bat'));
-        // console.log('result.stdout =' + result.stdout.toString());
-        // console.log('result.stderr =' + result.stderr.toString());
-
-        if (result.stderr.toString().length > 0) {
-            const androidPath = path.join(process.env.ProgramFiles, 'Android') + '/';
-            if (fs.existsSync(androidPath)) {
-                program_dir = fs.readdirSync(androidPath);
-                while (i < program_dir.length && !foundStudio) {
-                    if (program_dir[i].startsWith('Android Studio')) {
-                        foundStudio = true;
-                        androidStudioPath = path.join(process.env.ProgramFiles, 'Android', program_dir[i], 'gradle');
-                    } else { ++i; }
-                }
-            }
-        } else {
-            // console.log('got android studio path from registry');
-            // remove the (os independent) new line char at the end of stdout
-            // add gradle to match the above.
-            androidStudioPath = path.join(result.stdout.toString().split('\r\n')[0], 'gradle');
-        }
-    }
-
-    if (androidStudioPath !== null && fs.existsSync(androidStudioPath)) {
-        const dirs = fs.readdirSync(androidStudioPath);
-        if (dirs[0].split('-')[0] === 'gradle') {
-            return path.join(androidStudioPath, dirs[0], 'bin', 'gradle');
-        }
-    } else {
-        // OK, let's try to check for Gradle!
-        return forgivingWhichSync('gradle');
-    }
+    return forgivingWhichSync('gradle');
 };
 
 // Returns a promise. Called only by build and clean commands.

lib/config/CordovaGradleConfigParser.js

@@ -17,8 +17,8 @@
     under the License.
 */
 
-const fs = require('fs-extra');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
 const events = require('cordova-common').events;
 
 class CordovaGradleConfigParser {
@@ -41,7 +41,7 @@ class CordovaGradleConfigParser {
      * @returns {Record<any, any>} The parsed JSON object representing the gradle config.
      */
     _readConfig (configPath) {
-        return fs.readJSONSync(configPath, 'utf-8');
+        return JSON.parse(fs.readFileSync(configPath, 'utf-8') || '{}');
     }
 
     setPackageName (packageName) {
@@ -64,7 +64,7 @@ class CordovaGradleConfigParser {
      */
     write () {
         events.emit('verbose', '[Cordova Gradle Config] Saving File');
-        fs.writeJSONSync(this._cdvGradleConfigFilePath, this._cdvGradleConfig, 'utf-8');
+        fs.writeFileSync(this._cdvGradleConfigFilePath, JSON.stringify(this._cdvGradleConfig, null, 2), 'utf-8');
     }
 }
 

lib/config/GradlePropertiesParser.js

@@ -17,8 +17,8 @@
     under the License.
 */
 
-const fs = require('fs');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
 const propertiesParser = require('properties-parser');
 const events = require('cordova-common').events;
 

lib/create.js

@@ -17,8 +17,8 @@
        under the License.
 */
 
-const path = require('path');
-const fs = require('fs-extra');
+const path = require('node:path');
+const fs = require('node:fs');
 const utils = require('./utils');
 const check_reqs = require('./check_reqs');
 const ROOT = path.join(__dirname, '..');
@@ -49,27 +49,27 @@ function copyJsAndLibrary (projectPath, shared, projectName, targetAPI) {
     const app_path = path.join(projectPath, 'app', 'src', 'main');
     const platform_www = path.join(projectPath, 'platform_www');
 
-    fs.copySync(srcCordovaJsPath, path.join(app_path, 'assets', 'www', 'cordova.js'));
+    fs.cpSync(srcCordovaJsPath, path.join(app_path, 'assets', 'www', 'cordova.js'));
 
     // Copy the cordova.js file to platforms/<platform>/platform_www/
     // The www dir is nuked on each prepare so we keep cordova.js in platform_www
-    fs.ensureDirSync(platform_www);
-    fs.copySync(srcCordovaJsPath, path.join(platform_www, 'cordova.js'));
+    fs.mkdirSync(platform_www, { recursive: true });
+    fs.cpSync(srcCordovaJsPath, path.join(platform_www, 'cordova.js'));
+    fs.cpSync(path.join(ROOT, 'framework', 'cdv-gradle-config-defaults.json'), path.join(projectPath, 'cdv-gradle-config.json'));
 
     if (shared) {
         const relativeFrameworkPath = path.relative(projectPath, getFrameworkDir(projectPath, true));
         fs.symlinkSync(relativeFrameworkPath, nestedCordovaLibPath, 'dir');
     } else {
-        fs.ensureDirSync(nestedCordovaLibPath);
-        fs.copySync(path.join(ROOT, 'framework', 'AndroidManifest.xml'), path.join(nestedCordovaLibPath, 'AndroidManifest.xml'));
+        fs.mkdirSync(nestedCordovaLibPath, { recursive: true });
+        fs.cpSync(path.join(ROOT, 'framework', 'AndroidManifest.xml'), path.join(nestedCordovaLibPath, 'AndroidManifest.xml'));
         const propertiesEditor = createEditor(path.join(ROOT, 'framework', 'project.properties'));
         propertiesEditor.set('target', targetAPI);
         propertiesEditor.save(path.join(nestedCordovaLibPath, 'project.properties'));
-        fs.copySync(path.join(ROOT, 'framework', 'build.gradle'), path.join(nestedCordovaLibPath, 'build.gradle'));
-        fs.copySync(path.join(ROOT, 'framework', 'cordova.gradle'), path.join(nestedCordovaLibPath, 'cordova.gradle'));
-        fs.copySync(path.join(ROOT, 'framework', 'repositories.gradle'), path.join(nestedCordovaLibPath, 'repositories.gradle'));
-        fs.copySync(path.join(ROOT, 'framework', 'src'), path.join(nestedCordovaLibPath, 'src'));
-        fs.copySync(path.join(ROOT, 'framework', 'cdv-gradle-config-defaults.json'), path.join(projectPath, 'cdv-gradle-config.json'));
+        fs.cpSync(path.join(ROOT, 'framework', 'build.gradle'), path.join(nestedCordovaLibPath, 'build.gradle'));
+        fs.cpSync(path.join(ROOT, 'framework', 'cordova.gradle'), path.join(nestedCordovaLibPath, 'cordova.gradle'));
+        fs.cpSync(path.join(ROOT, 'framework', 'repositories.gradle'), path.join(nestedCordovaLibPath, 'repositories.gradle'));
+        fs.cpSync(path.join(ROOT, 'framework', 'src'), path.join(nestedCordovaLibPath, 'src'), { recursive: true });
     }
 }
 
@@ -116,10 +116,10 @@ function prepBuildFiles (projectPath) {
 function copyBuildRules (projectPath) {
     const srcDir = path.join(ROOT, 'templates', 'project');
 
-    fs.copySync(path.join(srcDir, 'build.gradle'), path.join(projectPath, 'build.gradle'));
-    fs.copySync(path.join(srcDir, 'app', 'build.gradle'), path.join(projectPath, 'app', 'build.gradle'));
-    fs.copySync(path.join(srcDir, 'app', 'repositories.gradle'), path.join(projectPath, 'app', 'repositories.gradle'));
-    fs.copySync(path.join(srcDir, 'repositories.gradle'), path.join(projectPath, 'repositories.gradle'));
+    fs.cpSync(path.join(srcDir, 'build.gradle'), path.join(projectPath, 'build.gradle'));
+    fs.cpSync(path.join(srcDir, 'app', 'build.gradle'), path.join(projectPath, 'app', 'build.gradle'));
+    fs.cpSync(path.join(srcDir, 'app', 'repositories.gradle'), path.join(projectPath, 'app', 'repositories.gradle'));
+    fs.cpSync(path.join(srcDir, 'repositories.gradle'), path.join(projectPath, 'repositories.gradle'));
 
     copyGradleTools(projectPath);
 }
@@ -128,9 +128,9 @@ function copyScripts (projectPath) {
     const srcScriptsDir = path.join(ROOT, 'templates', 'cordova');
     const destScriptsDir = path.join(projectPath, 'cordova');
     // Delete old scripts directory if this is an update.
-    fs.removeSync(destScriptsDir);
+    fs.rmSync(destScriptsDir, { recursive: true, force: true });
     // Copy in the new ones.
-    fs.copySync(srcScriptsDir, destScriptsDir);
+    fs.cpSync(srcScriptsDir, destScriptsDir, { recursive: true });
 }
 
 /**
@@ -174,7 +174,7 @@ function validateProjectName (project_name) {
 function copyGradleTools (projectPath) {
     const srcDir = path.join(ROOT, 'templates', 'project');
 
-    fs.copySync(path.resolve(srcDir, 'tools'), path.resolve(projectPath, 'tools'));
+    fs.cpSync(path.resolve(srcDir, 'tools'), path.resolve(projectPath, 'tools'), { recursive: true });
 }
 
 /**
@@ -232,13 +232,13 @@ exports.create = function (project_path, config, options, events) {
             const app_path = path.join(project_path, 'app', 'src', 'main');
 
             // copy project template
-            fs.ensureDirSync(app_path);
-            fs.copySync(path.join(project_template_dir, 'assets'), path.join(app_path, 'assets'));
-            fs.copySync(path.join(project_template_dir, 'res'), path.join(app_path, 'res'));
-            fs.copySync(path.join(project_template_dir, 'gitignore'), path.join(project_path, '.gitignore'));
+            fs.mkdirSync(app_path, { recursive: true });
+            fs.cpSync(path.join(project_template_dir, 'assets'), path.join(app_path, 'assets'), { recursive: true });
+            fs.cpSync(path.join(project_template_dir, 'res'), path.join(app_path, 'res'), { recursive: true });
+            fs.cpSync(path.join(project_template_dir, 'gitignore'), path.join(project_path, '.gitignore'));
 
             // Manually create directories that would be empty within the template (since git doesn't track directories).
-            fs.ensureDirSync(path.join(app_path, 'libs'));
+            fs.mkdirSync(path.join(app_path, 'libs'), { recursive: true });
 
             // copy cordova.js, cordova.jar
             exports.copyJsAndLibrary(project_path, options.link, safe_activity_name, target_api);
@@ -247,9 +247,9 @@ exports.create = function (project_path, config, options, events) {
             const java_path = path.join(app_path, 'java');
             const assets_path = path.join(app_path, 'assets');
             const resource_path = path.join(app_path, 'res');
-            fs.ensureDirSync(java_path);
-            fs.ensureDirSync(assets_path);
-            fs.ensureDirSync(resource_path);
+            fs.mkdirSync(java_path, { recursive: true });
+            fs.mkdirSync(assets_path, { recursive: true });
+            fs.mkdirSync(resource_path, { recursive: true });
 
             // store package name in cdv-gradle-config
             const cdvGradleConfig = CordovaGradleConfigParserFactory.create(project_path);
@@ -261,8 +261,8 @@ exports.create = function (project_path, config, options, events) {
             const activity_dir = path.join(java_path, packagePath);
             const activity_path = path.join(activity_dir, safe_activity_name + '.java');
 
-            fs.ensureDirSync(activity_dir);
-            fs.copySync(path.join(project_template_dir, 'Activity.java'), activity_path);
+            fs.mkdirSync(activity_dir, { recursive: true });
+            fs.cpSync(path.join(project_template_dir, 'Activity.java'), activity_path);
             utils.replaceFileContents(activity_path, /__ACTIVITY__/, safe_activity_name);
             utils.replaceFileContents(path.join(app_path, 'res', 'values', 'strings.xml'), /__NAME__/, utils.escape(project_name));
             utils.replaceFileContents(activity_path, /__ID__/, package_name);

lib/emulator.js

@@ -18,9 +18,9 @@
 */
 
 const execa = require('execa');
-const fs = require('fs-extra');
+const fs = require('node:fs');
 const android_versions = require('android-versions');
-const path = require('path');
+const path = require('node:path');
 const Adb = require('./Adb');
 const events = require('cordova-common').events;
 const CordovaError = require('cordova-common').CordovaError;

lib/env/java.js

@@ -18,8 +18,8 @@
 */
 
 const execa = require('execa');
-const fs = require('fs-extra');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
 const glob = require('fast-glob');
 const { CordovaError, events } = require('cordova-common');
 const utils = require('../utils');

lib/pluginHandlers.js

@@ -14,8 +14,8 @@
  *
 */
 
-const fs = require('fs-extra');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
 const isPathInside = require('is-path-inside');
 const events = require('cordova-common').events;
 const CordovaError = require('cordova-common').CordovaError;
@@ -166,13 +166,13 @@ const handlers = {
             scriptContent = 'cordova.define("' + moduleName + '", function(require, exports, module) {\n' + scriptContent + '\n});\n';
 
             const wwwDest = path.resolve(project.www, 'plugins', plugin.id, obj.src);
-            fs.ensureDirSync(path.dirname(wwwDest));
+            fs.mkdirSync(path.dirname(wwwDest), { recursive: true });
             fs.writeFileSync(wwwDest, scriptContent, 'utf-8');
 
             if (options && options.usePlatformWww) {
                 // CB-11022 copy file to both directories if usePlatformWww is specified
                 const platformWwwDest = path.resolve(project.platformWww, 'plugins', plugin.id, obj.src);
-                fs.ensureDirSync(path.dirname(platformWwwDest));
+                fs.mkdirSync(path.dirname(platformWwwDest), { recursive: true });
                 fs.writeFileSync(platformWwwDest, scriptContent, 'utf-8');
             }
         },
@@ -217,11 +217,11 @@ function copyFile (plugin_dir, src, project_dir, dest, link) {
     // check that dest path is located in project directory
     if (!isPathInside(dest, project_dir)) { throw new CordovaError('Destination "' + dest + '" for source file "' + src + '" is located outside the project'); }
 
-    fs.ensureDirSync(path.dirname(dest));
+    fs.mkdirSync(path.dirname(dest), { recursive: true });
     if (link) {
         symlinkFileOrDirTree(src, dest);
     } else {
-        fs.copySync(src, dest);
+        fs.cpSync(src, dest, { recursive: true });
     }
 }
 
@@ -235,11 +235,11 @@ function copyNewFile (plugin_dir, src, project_dir, dest, link) {
 
 function symlinkFileOrDirTree (src, dest) {
     if (fs.existsSync(dest)) {
-        fs.removeSync(dest);
+        fs.rmSync(dest, { recursive: true, force: true });
     }
 
     if (fs.statSync(src).isDirectory()) {
-        fs.ensureDirSync(path.dirname(dest));
+        fs.mkdirSync(path.dirname(dest), { recursive: true });
         fs.readdirSync(src).forEach(function (entry) {
             symlinkFileOrDirTree(path.join(src, entry), path.join(dest, entry));
         });
@@ -249,7 +249,7 @@ function symlinkFileOrDirTree (src, dest) {
 }
 
 function removeFile (file) {
-    fs.removeSync(file);
+    fs.rmSync(file);
 }
 
 // Sometimes we want to remove some java, and prune any unnecessary empty directories

lib/prepare.js

@@ -17,8 +17,8 @@
     under the License.
 */
 
-const fs = require('fs-extra');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
 const nopt = require('nopt');
 const glob = require('fast-glob');
 const dedent = require('dedent');
@@ -93,7 +93,7 @@ function updateUserProjectGradleConfig (project) {
 
     // Write out changes
     const projectGradleConfigPath = path.join(project.root, 'cdv-gradle-config.json');
-    fs.writeJSONSync(projectGradleConfigPath, projectGradleConfig, { spaces: 2 });
+    fs.writeFileSync(projectGradleConfigPath, JSON.stringify(projectGradleConfig, null, 2), 'utf-8');
 }
 
 function getUserGradleConfig (configXml) {
@@ -198,7 +198,7 @@ function updateConfigFilesFrom (sourceConfig, configMunger, locations) {
 
     // First cleanup current config and merge project's one into own
     // Overwrite platform config.xml with defaults.xml.
-    fs.copySync(locations.defaultConfigXml, locations.configXml);
+    fs.cpSync(locations.defaultConfigXml, locations.configXml);
 
     // Then apply config changes from global munge to all config files
     // in project (including project's config)
@@ -271,7 +271,7 @@ function cleanWww (projectRoot, locations) {
  */
 function updateProjectAccordingTo (platformConfig, locations) {
     updateProjectStrings(platformConfig, locations);
-    updateProjectSplashScreen(platformConfig, locations);
+    updateProjectTheme(platformConfig, locations);
 
     const name = platformConfig.name();
 
@@ -316,14 +316,14 @@ function updateProjectAccordingTo (platformConfig, locations) {
     const newDestFile = path.join(locations.root, 'app', 'src', 'main', 'java', androidPkgName.replace(/\./g, '/'), path.basename(destFile));
     if (newDestFile.toLowerCase() !== destFile.toLowerCase()) {
         // If package was name changed we need to create new java with main activity in path matching new package name
-        fs.ensureDirSync(path.dirname(newDestFile));
+        fs.mkdirSync(path.dirname(newDestFile), { recursive: true });
         events.emit('verbose', `copy ${destFile} to ${newDestFile}`);
-        fs.copySync(destFile, newDestFile);
+        fs.cpSync(destFile, newDestFile);
         utils.replaceFileContents(newDestFile, /package [\w.]*;/, 'package ' + androidPkgName + ';');
         events.emit('verbose', 'Wrote out Android package name "' + androidPkgName + '" to ' + newDestFile);
         // If package was name changed we need to remove old java with main activity
         events.emit('verbose', `remove ${destFile}`);
-        fs.removeSync(destFile);
+        fs.rmSync(destFile);
         // remove any empty directories
         let currentDir = path.dirname(destFile);
         const sourcesRoot = path.resolve(locations.root, 'src');
@@ -376,11 +376,31 @@ function warnForDeprecatedSplashScreen (cordovaProject) {
  *   be used to update project
  * @param   {Object}  locations       A map of locations for this platform
  */
-function updateProjectSplashScreen (platformConfig, locations) {
+function updateProjectTheme (platformConfig, locations) {
     // res/values/themes.xml
     const themes = xmlHelpers.parseElementtreeSync(locations.themes);
     const splashScreenTheme = themes.find('style[@name="Theme.App.SplashScreen"]');
 
+    // Update edge-to-edge settings in app theme.
+    let hasE2E = false; // default case
+
+    const preferenceE2E = platformConfig.getPreference('AndroidEdgeToEdge', this.platform);
+    if (!preferenceE2E) {
+        events.emit('verbose', 'The preference name "AndroidEdgeToEdge" was not set. Defaulting to "false".');
+    } else {
+        const hasInvalidPreferenceE2E = preferenceE2E !== 'true' && preferenceE2E !== 'false';
+        if (hasInvalidPreferenceE2E) {
+            events.emit('verbose', 'Preference name "AndroidEdgeToEdge" has an invalid value. Valid values are "true" or "false". Defaulting to "false"');
+        }
+        hasE2E = hasInvalidPreferenceE2E ? false : preferenceE2E === 'true';
+    }
+
+    const optOutE2EKey = 'android:windowOptOutEdgeToEdgeEnforcement';
+    const optOutE2EItem = splashScreenTheme.find(`item[@name="${optOutE2EKey}"]`);
+    const optOutE2EValue = !hasE2E ? 'true' : 'false';
+    optOutE2EItem.text = optOutE2EValue;
+    events.emit('verbose', `Updating theme item "${optOutE2EKey}" with value "${optOutE2EValue}"`);
+
     let splashBg = platformConfig.getPreference('AndroidWindowSplashScreenBackground', this.platform);
     if (!splashBg) {
         splashBg = platformConfig.getPreference('SplashScreenBackgroundColor', this.platform);
@@ -397,6 +417,7 @@ function updateProjectSplashScreen (platformConfig, locations) {
     splashBgNode.text = '@color/cdv_splashscreen_background';
 
     [
+        // Splash Screen
         'windowSplashScreenAnimatedIcon',
         'windowSplashScreenAnimationDuration',
         'android:windowSplashScreenBrandingImage',
@@ -536,16 +557,16 @@ function updateProjectSplashScreenIconBackgroundColor (splashIconBackgroundColor
 
 function cleanupAndSetProjectSplashScreenImage (srcFile, destFilePath, possiblePreviousDestFilePath, cleanupOnly = false) {
     if (fs.existsSync(possiblePreviousDestFilePath)) {
-        fs.removeSync(possiblePreviousDestFilePath);
+        fs.rmSync(possiblePreviousDestFilePath);
     }
 
     if (cleanupOnly && fs.existsSync(destFilePath)) {
         // Also remove dest file path for cleanup even if previous was not use.
-        fs.removeSync(destFilePath);
+        fs.rmSync(destFilePath);
     }
 
     if (!cleanupOnly && srcFile && fs.existsSync(srcFile)) {
-        fs.copySync(srcFile, destFilePath);
+        fs.cpSync(srcFile, destFilePath);
     }
 }
 

lib/target.js

@@ -17,7 +17,7 @@
        under the License.
 */
 
-const { inspect } = require('util');
+const { inspect } = require('node:util');
 const execa = require('execa');
 const Adb = require('./Adb');
 const build = require('./build');

lib/utils.js

@@ -23,9 +23,9 @@
 
 // TODO: Perhaps this should live in cordova-common?
 
-const fs = require('fs-extra');
+const fs = require('node:fs');
 const which = require('which');
-const os = require('os');
+const os = require('node:os');
 
 /**
  * Reads, searches, and replaces the found occurences with replacementString and then writes the file back out.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-android",
-  "version": "13.0.0",
+  "version": "14.0.1",
   "description": "cordova-android release",
   "types": "./types/index.d.ts",
   "main": "lib/Api.js",
@@ -24,31 +24,31 @@
   "author": "Apache Software Foundation",
   "license": "Apache-2.0",
   "dependencies": {
-    "android-versions": "^2.0.0",
-    "cordova-common": "^5.0.0",
+    "android-versions": "^2.1.0",
+    "cordova-common": "^5.0.1",
     "dedent": "^1.5.3",
     "execa": "^5.1.1",
-    "fast-glob": "^3.3.2",
-    "fs-extra": "^11.2.0",
+    "fast-glob": "^3.3.3",
     "is-path-inside": "^3.0.3",
-    "nopt": "^7.2.1",
+    "nopt": "^8.1.0",
     "properties-parser": "^0.6.0",
-    "semver": "^7.6.2",
+    "semver": "^7.7.1",
     "string-argv": "^0.3.1",
     "untildify": "^4.0.0",
-    "which": "^4.0.0"
+    "which": "^5.0.0"
   },
   "devDependencies": {
     "@cordova/eslint-config": "^5.1.0",
     "cordova-js": "^6.1.0",
     "elementtree": "^0.1.7",
-    "jasmine": "^5.1.0",
+    "jasmine": "^5.6.0",
     "jasmine-spec-reporter": "^7.0.0",
-    "nyc": "^15.1.0",
-    "rewire": "^7.0.0"
+    "nyc": "^17.1.0",
+    "rewire": "^7.0.0",
+    "tmp": "^0.2.3"
   },
   "engines": {
-    "node": ">=16.13.0"
+    "node": ">=20.5.0"
   },
   "nyc": {
     "include": [

spec/e2e/e2e.spec.js

@@ -17,9 +17,9 @@
  under the License.
  */
 
-const os = require('os');
-const fs = require('fs-extra');
-const path = require('path');
+const os = require('node:os');
+const fs = require('node:fs');
+const path = require('node:path');
 const { EventEmitter } = require('events');
 const { ConfigParser, PluginInfoProvider } = require('cordova-common');
 const Api = require('../../lib/Api');
@@ -49,14 +49,15 @@ describe('E2E', function () {
         api = await makeProject(projectPath);
     });
     afterEach(() => {
-        fs.removeSync(tmpDir);
+        fs.rmSync(tmpDir, { recursive: true, force: true });
     });
 
     it('loads the API from a project directory', async () => {
         // Allow test project to find the `cordova-android` module
-        fs.ensureSymlinkSync(
-            path.join(__dirname, '../..'),
-            path.join(tmpDir, 'node_modules/cordova-android'),
+        fs.mkdirSync(path.join(tmpDir, 'node_modules'), { recursive: true });
+        fs.symlinkSync(
+            path.join(__dirname, '..', '..'),
+            path.join(tmpDir, 'node_modules', 'cordova-android'),
             'junction'
         );
 

spec/unit/AndroidManifest.spec.js

@@ -17,9 +17,9 @@
     under the License.
 */
 
-const fs = require('fs');
-const os = require('os');
-const path = require('path');
+const fs = require('node:fs');
+const os = require('node:os');
+const path = require('node:path');
 const rewire = require('rewire');
 
 describe('AndroidManifest', () => {

spec/unit/AndroidProject.spec.js

@@ -17,7 +17,7 @@
     under the License.
 */
 
-const path = require('path');
+const path = require('node:path');
 const rewire = require('rewire');
 const MockCordovaGradleConfigParser = require('./mocks/config/MockCordovaGradleConfigParser');
 const CordovaGradleConfigParserFactory = require('../../lib/config/CordovaGradleConfigParserFactory');

spec/unit/Api.spec.js

@@ -17,8 +17,8 @@
     under the License.
 */
 
-const os = require('os');
-const path = require('path');
+const os = require('node:os');
+const path = require('node:path');
 const common = require('cordova-common');
 const EventEmitter = require('events');
 

spec/unit/android_sdk.spec.js

@@ -17,8 +17,8 @@
     under the License.
 */
 
-const fs = require('fs');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
 const rewire = require('rewire');
 
 describe('android_sdk', () => {

spec/unit/builders/ProjectBuilder.spec.js

@@ -17,8 +17,8 @@
     under the License.
 */
 
-const fs = require('fs-extra');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
 const rewire = require('rewire');
 const { isWindows } = require('../../../lib/utils');
 
@@ -134,14 +134,14 @@ describe('ProjectBuilder', () => {
             execaSpy.and.resolveTo();
         });
 
-        it('should run gradle wrapper 8.7', async () => {
-            await builder.installGradleWrapper('8.7');
-            expect(execaSpy).toHaveBeenCalledWith('gradle', ['-p', path.normalize('/root/tools'), 'wrapper', '--gradle-version', '8.7'], jasmine.any(Object));
+        it('should run gradle wrapper 8.13', async () => {
+            await builder.installGradleWrapper('8.13');
+            expect(execaSpy).toHaveBeenCalledWith('gradle', ['-p', path.normalize('/root/tools'), 'wrapper', '--gradle-version', '8.13'], jasmine.any(Object));
         });
 
         it('CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL should override gradle version', async () => {
             process.env.CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL = 'https://dist.local';
-            await builder.installGradleWrapper('8.7');
+            await builder.installGradleWrapper('8.13');
             delete process.env.CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL;
             expect(execaSpy).toHaveBeenCalledWith('gradle', ['-p', path.normalize('/root/tools'), 'wrapper', '--gradle-distribution-url', 'https://dist.local'], jasmine.any(Object));
         });
@@ -220,7 +220,7 @@ describe('ProjectBuilder', () => {
         beforeEach(() => {
             const marker = ProjectBuilder.__get__('MARKER');
             spyOn(fs, 'readFileSync').and.returnValue(`Some Header Here: ${marker}`);
-            spyOn(fs, 'removeSync');
+            spyOn(fs, 'rmSync');
             spyOn(builder, 'getArgs');
             execaSpy.and.returnValue(Promise.resolve());
         });
@@ -250,7 +250,7 @@ describe('ProjectBuilder', () => {
 
         it('should remove "out" folder', () => {
             return builder.clean({}).then(() => {
-                expect(fs.removeSync).toHaveBeenCalledWith(path.join(rootDir, 'out'));
+                expect(fs.rmSync).toHaveBeenCalledWith(path.join(rootDir, 'out'), { recursive: true, force: true });
             });
         });
 
@@ -261,8 +261,8 @@ describe('ProjectBuilder', () => {
             spyOn(fs, 'existsSync').and.returnValue(true);
 
             return builder.clean({}).then(() => {
-                expect(fs.removeSync).toHaveBeenCalledWith(debugSigningFile);
-                expect(fs.removeSync).toHaveBeenCalledWith(releaseSigningFile);
+                expect(fs.rmSync).toHaveBeenCalledWith(debugSigningFile);
+                expect(fs.rmSync).toHaveBeenCalledWith(releaseSigningFile);
             });
         });
 
@@ -273,8 +273,8 @@ describe('ProjectBuilder', () => {
             spyOn(fs, 'existsSync').and.returnValue(false);
 
             return builder.clean({}).then(() => {
-                expect(fs.removeSync).not.toHaveBeenCalledWith(debugSigningFile);
-                expect(fs.removeSync).not.toHaveBeenCalledWith(releaseSigningFile);
+                expect(fs.rmSync).not.toHaveBeenCalledWith(debugSigningFile);
+                expect(fs.rmSync).not.toHaveBeenCalledWith(releaseSigningFile);
             });
         });
     });

spec/unit/check_reqs.spec.js

@@ -19,8 +19,8 @@
 
 const rewire = require('rewire');
 const android_sdk = require('../../lib/android_sdk');
-const fs = require('fs-extra');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
 const events = require('cordova-common').events;
 const which = require('which');
 

spec/unit/create.spec.js

@@ -21,8 +21,8 @@ const rewire = require('rewire');
 const utils = require('../../lib/utils');
 const create = rewire('../../lib/create');
 const check_reqs = require('../../lib/check_reqs');
-const fs = require('fs-extra');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
 const MockCordovaGradleConfigParser = require('./mocks/config/MockCordovaGradleConfigParser');
 const CordovaGradleConfigParserFactory = require('../../lib/config/CordovaGradleConfigParserFactory');
 
@@ -142,8 +142,8 @@ describe('create', function () {
             spyOn(create, 'prepBuildFiles');
             revert_manifest_mock = create.__set__('AndroidManifest', Manifest_mock);
             spyOn(fs, 'existsSync').and.returnValue(false);
-            spyOn(fs, 'copySync');
-            spyOn(fs, 'ensureDirSync');
+            spyOn(fs, 'cpSync');
+            spyOn(fs, 'mkdirSync');
             spyOn(utils, 'replaceFileContents');
             config_mock = jasmine.createSpyObj('ConfigParser mock instance', ['packageName', 'android_packageName', 'name', 'android_activityName']);
             events_mock = jasmine.createSpyObj('EventEmitter mock instance', ['emit']);
@@ -238,17 +238,17 @@ describe('create', function () {
         describe('happy path', function () {
             it('should copy project templates from a specified custom template', () => {
                 return create.create(project_path, config_mock, { customTemplate: '/template/path' }, events_mock).then(() => {
-                    expect(fs.copySync).toHaveBeenCalledWith(path.join('/template/path', 'assets'), path.join(app_path, 'assets'));
-                    expect(fs.copySync).toHaveBeenCalledWith(path.join('/template/path', 'res'), path.join(app_path, 'res'));
-                    expect(fs.copySync).toHaveBeenCalledWith(path.join('/template/path', 'gitignore'), path.join(project_path, '.gitignore'));
+                    expect(fs.cpSync).toHaveBeenCalledWith(path.join('/template/path', 'assets'), path.join(app_path, 'assets'), { recursive: true });
+                    expect(fs.cpSync).toHaveBeenCalledWith(path.join('/template/path', 'res'), path.join(app_path, 'res'), { recursive: true });
+                    expect(fs.cpSync).toHaveBeenCalledWith(path.join('/template/path', 'gitignore'), path.join(project_path, '.gitignore'));
                 });
             });
 
             it('should copy project templates from the default templates location if no custom template is provided', () => {
                 return create.create(project_path, config_mock, {}, events_mock).then(() => {
-                    expect(fs.copySync).toHaveBeenCalledWith(path.join(default_templates, 'assets'), path.join(app_path, 'assets'));
-                    expect(fs.copySync).toHaveBeenCalledWith(path.join(default_templates, 'res'), path.join(app_path, 'res'));
-                    expect(fs.copySync).toHaveBeenCalledWith(path.join(default_templates, 'gitignore'), path.join(project_path, '.gitignore'));
+                    expect(fs.cpSync).toHaveBeenCalledWith(path.join(default_templates, 'assets'), path.join(app_path, 'assets'), { recursive: true });
+                    expect(fs.cpSync).toHaveBeenCalledWith(path.join(default_templates, 'res'), path.join(app_path, 'res'), { recursive: true });
+                    expect(fs.cpSync).toHaveBeenCalledWith(path.join(default_templates, 'gitignore'), path.join(project_path, '.gitignore'));
                 });
             });
 
@@ -261,7 +261,7 @@ describe('create', function () {
             it('should create a java src directory based on the provided project package name', () => {
                 config_mock.packageName.and.returnValue('org.apache.cordova');
                 return create.create(project_path, config_mock, {}, events_mock).then(() => {
-                    expect(fs.ensureDirSync).toHaveBeenCalledWith(path.join(app_path, 'java', 'org', 'apache', 'cordova'));
+                    expect(fs.mkdirSync).toHaveBeenCalledWith(path.join(app_path, 'java', 'org', 'apache', 'cordova'), { recursive: true });
                 });
             });
 
@@ -270,7 +270,7 @@ describe('create', function () {
                 config_mock.android_activityName.and.returnValue('CEEDEEVEE');
                 const activity_path = path.join(app_path, 'java', 'org', 'apache', 'cordova', 'CEEDEEVEE.java');
                 return create.create(project_path, config_mock, {}, events_mock).then(() => {
-                    expect(fs.copySync).toHaveBeenCalledWith(path.join(default_templates, 'Activity.java'), activity_path);
+                    expect(fs.cpSync).toHaveBeenCalledWith(path.join(default_templates, 'Activity.java'), activity_path);
                     expect(utils.replaceFileContents).toHaveBeenCalledWith(activity_path, /__ACTIVITY__/, 'CEEDEEVEE');
                     expect(utils.replaceFileContents).toHaveBeenCalledWith(activity_path, /__ID__/, 'org.apache.cordova');
                 });

spec/unit/emulator.spec.js

@@ -17,8 +17,8 @@
     under the License.
 */
 
-const fs = require('fs-extra');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
 const rewire = require('rewire');
 const which = require('which');
 

spec/unit/java.spec.js

@@ -17,7 +17,7 @@
     under the License.
 */
 
-const path = require('path');
+const path = require('node:path');
 const rewire = require('rewire');
 const { CordovaError } = require('cordova-common');
 const utils = require('../../lib/utils');

spec/unit/pluginHandlers/common.spec.js

@@ -18,27 +18,41 @@
 
 const rewire = require('rewire');
 const common = rewire('../../../lib/pluginHandlers');
-const path = require('path');
-const fs = require('fs-extra');
-const osenv = require('os');
+const path = require('node:path');
+const fs = require('node:fs');
+const tmp = require('tmp');
 
-const test_dir = path.join(osenv.tmpdir(), 'test_plugman');
+tmp.setGracefulCleanup();
+
+const tempdir = tmp.dirSync({ unsafeCleanup: true });
+const test_dir = path.join(tempdir.name, 'test_plugman');
 const project_dir = path.join(test_dir, 'project');
 const src = path.join(project_dir, 'src');
 const dest = path.join(project_dir, 'dest');
 const java_dir = path.join(src, 'one', 'two', 'three');
 const java_file = path.join(java_dir, 'test.java');
 const symlink_file = path.join(java_dir, 'symlink');
-const non_plugin_file = path.join(osenv.tmpdir(), 'non_plugin_file');
+const non_plugin_file = path.join(tempdir.name, 'non_plugin_file');
 
 const copyFile = common.__get__('copyFile');
 const deleteJava = common.__get__('deleteJava');
 const copyNewFile = common.__get__('copyNewFile');
 
+function outputFileSync (file, content) {
+    const dir = path.dirname(file);
+    fs.mkdirSync(dir, { recursive: true });
+    fs.writeFileSync(file, content, 'utf-8');
+}
+
 describe('common platform handler', function () {
+    afterAll(() => {
+        // Remove tempdir after all specs complete
+        fs.rmSync(tempdir.name, { recursive: true, force: true });
+    });
+
     afterEach(() => {
-        fs.removeSync(test_dir);
-        fs.removeSync(non_plugin_file);
+        fs.rmSync(test_dir, { recursive: true, force: true });
+        fs.rmSync(non_plugin_file, { recursive: true, force: true });
     });
 
     describe('copyFile', function () {
@@ -48,15 +62,15 @@ describe('common platform handler', function () {
         });
 
         it('Test#002 : should throw if src not in plugin directory', function () {
-            fs.ensureDirSync(project_dir);
-            fs.outputFileSync(non_plugin_file, 'contents');
+            fs.mkdirSync(project_dir, { recursive: true });
+            outputFileSync(non_plugin_file, 'contents');
             const outside_file = '../non_plugin_file';
             expect(function () { copyFile(test_dir, outside_file, project_dir, dest); })
                 .toThrow(new Error('File "' + path.resolve(test_dir, outside_file) + '" is located outside the plugin directory "' + test_dir + '"'));
         });
 
         it('Test#003 : should allow symlink src, if inside plugin', function () {
-            fs.outputFileSync(java_file, 'contents');
+            outputFileSync(java_file, 'contents');
 
             // This will fail on windows if not admin - ignore the error in that case.
             if (ignoreEPERMonWin32(java_file, symlink_file)) {
@@ -67,8 +81,8 @@ describe('common platform handler', function () {
         });
 
         it('Test#004 : should throw if symlink is linked to a file outside the plugin', function () {
-            fs.ensureDirSync(java_dir);
-            fs.outputFileSync(non_plugin_file, 'contents');
+            fs.mkdirSync(java_dir, { recursive: true });
+            outputFileSync(non_plugin_file, 'contents');
 
             // This will fail on windows if not admin - ignore the error in that case.
             if (ignoreEPERMonWin32(non_plugin_file, symlink_file)) {
@@ -80,37 +94,37 @@ describe('common platform handler', function () {
         });
 
         it('Test#005 : should throw if dest is outside the project directory', function () {
-            fs.outputFileSync(java_file, 'contents');
+            outputFileSync(java_file, 'contents');
             expect(function () { copyFile(test_dir, java_file, project_dir, non_plugin_file); })
                 .toThrow(new Error('Destination "' + path.resolve(project_dir, non_plugin_file) + '" for source file "' + path.resolve(test_dir, java_file) + '" is located outside the project'));
         });
 
-        it('Test#006 : should call mkdir -p on target path', function () {
-            fs.outputFileSync(java_file, 'contents');
+        it('Test#006 : should call mkdirSync target path', function () {
+            outputFileSync(java_file, 'contents');
 
-            const s = spyOn(fs, 'ensureDirSync').and.callThrough();
+            const s = spyOn(fs, 'mkdirSync').and.callThrough();
             const resolvedDest = path.resolve(project_dir, dest);
 
             copyFile(test_dir, java_file, project_dir, dest);
 
             expect(s).toHaveBeenCalled();
-            expect(s).toHaveBeenCalledWith(path.dirname(resolvedDest));
+            expect(s).toHaveBeenCalledWith(path.dirname(resolvedDest), { recursive: true });
         });
 
         it('Test#007 : should call cp source/dest paths', function () {
-            fs.outputFileSync(java_file, 'contents');
+            outputFileSync(java_file, 'contents');
 
-            const s = spyOn(fs, 'copySync').and.callThrough();
+            const s = spyOn(fs, 'cpSync').and.callThrough();
             const resolvedDest = path.resolve(project_dir, dest);
 
             copyFile(test_dir, java_file, project_dir, dest);
 
             expect(s).toHaveBeenCalled();
-            expect(s).toHaveBeenCalledWith(java_file, resolvedDest);
+            expect(s).toHaveBeenCalledWith(java_file, resolvedDest, { recursive: true });
         });
 
         it('should handle relative paths when checking for sub paths', () => {
-            fs.outputFileSync(java_file, 'contents');
+            outputFileSync(java_file, 'contents');
             const relativeProjectPath = path.relative(process.cwd(), project_dir);
 
             expect(() => {
@@ -121,7 +135,7 @@ describe('common platform handler', function () {
 
     describe('copyNewFile', function () {
         it('Test#008 : should throw if target path exists', function () {
-            fs.ensureDirSync(dest);
+            fs.mkdirSync(dest, { recursive: true });
             expect(function () { copyNewFile(test_dir, src, project_dir, dest); })
                 .toThrow(new Error('"' + dest + '" already exists!'));
         });
@@ -129,11 +143,11 @@ describe('common platform handler', function () {
 
     describe('deleteJava', function () {
         beforeEach(function () {
-            fs.outputFileSync(java_file, 'contents');
+            outputFileSync(java_file, 'contents');
         });
 
         it('Test#009 : should call fs.unlinkSync on the provided paths', function () {
-            const s = spyOn(fs, 'removeSync').and.callThrough();
+            const s = spyOn(fs, 'rmSync').and.callThrough();
             deleteJava(project_dir, java_file);
             expect(s).toHaveBeenCalled();
             expect(s).toHaveBeenCalledWith(path.resolve(project_dir, java_file));

spec/unit/pluginHandlers/handlers.spec.js

@@ -20,9 +20,9 @@
 const rewire = require('rewire');
 const common = rewire('../../../lib/pluginHandlers');
 const android = common.__get__('handlers');
-const path = require('path');
-const fs = require('fs-extra');
-const os = require('os');
+const path = require('node:path');
+const fs = require('node:fs');
+const os = require('node:os');
 const temp = path.join(os.tmpdir(), 'plugman');
 const plugins_dir = path.join(temp, 'cordova/plugins');
 const dummyplugin = path.join(__dirname, '../../fixtures/org.test.plugins.dummyplugin');
@@ -56,14 +56,14 @@ describe('android project handler', function () {
         let dummyProject;
 
         beforeEach(function () {
-            fs.ensureDirSync(temp);
+            fs.mkdirSync(temp, { recursive: true });
             dummyProject = AndroidProject.getProjectFile(temp);
             copyFileSpy.calls.reset();
             common.__set__('copyFile', copyFileSpy);
         });
 
         afterEach(function () {
-            fs.removeSync(temp);
+            fs.rmSync(temp, { recursive: true, force: true });
             common.__set__('copyFile', copyFileOrig);
         });
 
@@ -83,7 +83,7 @@ describe('android project handler', function () {
 
         describe('of <source-file> elements', function () {
             beforeEach(function () {
-                fs.copySync(android_studio_project, temp);
+                fs.cpSync(android_studio_project, temp, { recursive: true });
             });
 
             it('Test#003 : should copy stuff from one location to another by calling common.copyFile', function () {
@@ -102,7 +102,7 @@ describe('android project handler', function () {
             it('Test#006 : should throw if target file already exists', function () {
                 // write out a file
                 let target = path.resolve(temp, 'app', 'src', 'main', 'java', 'com', 'phonegap', 'plugins', 'dummyplugin');
-                fs.ensureDirSync(target);
+                fs.mkdirSync(target, { recursive: true });
                 target = path.join(target, 'DummyPlugin.java');
                 fs.writeFileSync(target, 'some bs', 'utf-8');
 
@@ -192,7 +192,7 @@ describe('android project handler', function () {
             const copyNewFileSpy = jasmine.createSpy('copyNewFile');
 
             beforeEach(function () {
-                fs.copySync(android_studio_project, temp);
+                fs.cpSync(android_studio_project, temp, { recursive: true });
 
                 spyOn(dummyProject, 'addSystemLibrary');
                 spyOn(dummyProject, 'addSubProject');
@@ -222,7 +222,7 @@ describe('android project handler', function () {
 
             it('Test#010 : should not copy anything if "custom" attribute is not set', function () {
                 const framework = { src: 'plugin-lib' };
-                const cpSpy = spyOn(fs, 'copySync');
+                const cpSpy = spyOn(fs, 'cpSync');
                 android.framework.install(framework, dummyPluginInfo, dummyProject);
                 expect(dummyProject.addSystemLibrary).toHaveBeenCalledWith(someString, framework.src);
                 expect(cpSpy).not.toHaveBeenCalled();
@@ -289,23 +289,23 @@ describe('android project handler', function () {
 
     describe('uninstallation', function () {
         const deleteJavaOrig = common.__get__('deleteJava');
-        const originalRemoveSync = fs.removeSync;
+        const originalRmSync = fs.rmSync;
         const deleteJavaSpy = jasmine.createSpy('deleteJava');
         let dummyProject;
-        let removeSyncSpy;
+        let rmSyncSpy;
 
         beforeEach(function () {
-            fs.ensureDirSync(temp);
-            fs.ensureDirSync(plugins_dir);
-            fs.copySync(android_studio_project, temp);
+            fs.mkdirSync(temp, { recursive: true });
+            fs.mkdirSync(plugins_dir, { recursive: true });
+            fs.cpSync(android_studio_project, temp, { recursive: true });
             AndroidProject.purgeCache();
             dummyProject = AndroidProject.getProjectFile(temp);
-            removeSyncSpy = spyOn(fs, 'removeSync');
+            rmSyncSpy = spyOn(fs, 'rmSync');
             common.__set__('deleteJava', deleteJavaSpy);
         });
 
         afterEach(function () {
-            originalRemoveSync.call(fs, temp);
+            originalRmSync.call(fs, temp, { recursive: true });
             common.__set__('deleteJava', deleteJavaOrig);
         });
 
@@ -313,7 +313,7 @@ describe('android project handler', function () {
             it('Test#017 : should remove jar files for Android Studio projects', function () {
                 android['lib-file'].install(valid_libs[0], dummyPluginInfo, dummyProject);
                 android['lib-file'].uninstall(valid_libs[0], dummyPluginInfo, dummyProject);
-                expect(removeSyncSpy).toHaveBeenCalledWith(path.join(dummyProject.projectDir, 'app/libs/TestLib.jar'));
+                expect(rmSyncSpy).toHaveBeenCalledWith(path.join(dummyProject.projectDir, 'app/libs/TestLib.jar'));
             });
         });
 
@@ -321,7 +321,7 @@ describe('android project handler', function () {
             it('Test#018 : should remove files for Android Studio projects', function () {
                 android['resource-file'].install(valid_resources[0], dummyPluginInfo, dummyProject);
                 android['resource-file'].uninstall(valid_resources[0], dummyPluginInfo, dummyProject);
-                expect(removeSyncSpy).toHaveBeenCalledWith(path.join(dummyProject.projectDir, 'app', 'src', 'main', 'res', 'xml', 'dummy.xml'));
+                expect(rmSyncSpy).toHaveBeenCalledWith(path.join(dummyProject.projectDir, 'app', 'src', 'main', 'res', 'xml', 'dummy.xml'));
             });
         });
 
@@ -341,49 +341,49 @@ describe('android project handler', function () {
             it('Test#019b : should remove stuff by calling common.removeFile for Android Studio projects, of jar with new app target-dir scheme', function () {
                 android['source-file'].install(valid_source[2], dummyPluginInfo, dummyProject, { android_studio: true });
                 android['source-file'].uninstall(valid_source[2], dummyPluginInfo, dummyProject, { android_studio: true });
-                expect(removeSyncSpy).toHaveBeenCalledWith(path.join(dummyProject.projectDir, 'app/libs/TestLib.jar'));
+                expect(rmSyncSpy).toHaveBeenCalledWith(path.join(dummyProject.projectDir, 'app/libs/TestLib.jar'));
             });
 
             it('Test#019c : should remove stuff by calling common.removeFile for Android Studio projects, of aar with new app target-dir scheme', function () {
                 android['source-file'].install(valid_source[3], dummyPluginInfo, dummyProject, { android_studio: true });
                 android['source-file'].uninstall(valid_source[3], dummyPluginInfo, dummyProject, { android_studio: true });
-                expect(removeSyncSpy).toHaveBeenCalledWith(path.join(dummyProject.projectDir, 'app/libs/TestAar.aar'));
+                expect(rmSyncSpy).toHaveBeenCalledWith(path.join(dummyProject.projectDir, 'app/libs/TestAar.aar'));
             });
 
             it('Test#019d : should remove stuff by calling common.removeFile for Android Studio projects, of xml with old target-dir scheme', function () {
                 android['source-file'].install(valid_source[4], dummyPluginInfo, dummyProject, { android_studio: true });
                 android['source-file'].uninstall(valid_source[4], dummyPluginInfo, dummyProject, { android_studio: true });
-                expect(removeSyncSpy).toHaveBeenCalledWith(path.join(dummyProject.projectDir, 'app/src/main/res/xml/mysettings.xml'));
+                expect(rmSyncSpy).toHaveBeenCalledWith(path.join(dummyProject.projectDir, 'app/src/main/res/xml/mysettings.xml'));
             });
 
             it('Test#019e : should remove stuff by calling common.removeFile for Android Studio projects, of file with other extension with old target-dir scheme', function () {
                 android['source-file'].install(valid_source[5], dummyPluginInfo, dummyProject, { android_studio: true });
                 android['source-file'].uninstall(valid_source[5], dummyPluginInfo, dummyProject, { android_studio: true });
-                expect(removeSyncSpy).toHaveBeenCalledWith(path.join(dummyProject.projectDir, 'app/src/main/res/values/other.extension'));
+                expect(rmSyncSpy).toHaveBeenCalledWith(path.join(dummyProject.projectDir, 'app/src/main/res/values/other.extension'));
             });
 
             it('Test#019f : should remove stuff by calling common.removeFile for Android Studio projects, of aidl with old target-dir scheme (GH-547)', function () {
                 android['source-file'].install(valid_source[6], dummyPluginInfo, dummyProject, { android_studio: true });
                 android['source-file'].uninstall(valid_source[6], dummyPluginInfo, dummyProject, { android_studio: true });
-                expect(removeSyncSpy).toHaveBeenCalledWith(path.join(dummyProject.projectDir, 'app/src/main/aidl/com/mytest/myapi.aidl'));
+                expect(rmSyncSpy).toHaveBeenCalledWith(path.join(dummyProject.projectDir, 'app/src/main/aidl/com/mytest/myapi.aidl'));
             });
 
             it('Test#019g : should remove stuff by calling common.removeFile for Android Studio projects, of aar with old target-dir scheme (GH-547)', function () {
                 android['source-file'].install(valid_source[7], dummyPluginInfo, dummyProject, { android_studio: true });
                 android['source-file'].uninstall(valid_source[7], dummyPluginInfo, dummyProject, { android_studio: true });
-                expect(removeSyncSpy).toHaveBeenCalledWith(path.join(dummyProject.projectDir, 'app/libs/testaar2.aar'));
+                expect(rmSyncSpy).toHaveBeenCalledWith(path.join(dummyProject.projectDir, 'app/libs/testaar2.aar'));
             });
 
             it('Test#019h : should remove stuff by calling common.removeFile for Android Studio projects, of jar with old target-dir scheme (GH-547)', function () {
                 android['source-file'].install(valid_source[8], dummyPluginInfo, dummyProject, { android_studio: true });
                 android['source-file'].uninstall(valid_source[8], dummyPluginInfo, dummyProject, { android_studio: true });
-                expect(removeSyncSpy).toHaveBeenCalledWith(path.join(dummyProject.projectDir, 'app/libs/testjar2.jar'));
+                expect(rmSyncSpy).toHaveBeenCalledWith(path.join(dummyProject.projectDir, 'app/libs/testjar2.jar'));
             });
 
             it('Test#019i : should remove stuff by calling common.removeFile for Android Studio projects, of .so lib file with old target-dir scheme (GH-547)', function () {
                 android['source-file'].install(valid_source[9], dummyPluginInfo, dummyProject, { android_studio: true });
                 android['source-file'].uninstall(valid_source[9], dummyPluginInfo, dummyProject, { android_studio: true });
-                expect(removeSyncSpy).toHaveBeenCalledWith(path.join(dummyProject.projectDir, 'app/src/main/jniLibs/x86/libnative.so'));
+                expect(rmSyncSpy).toHaveBeenCalledWith(path.join(dummyProject.projectDir, 'app/src/main/jniLibs/x86/libnative.so'));
             });
 
             it('Test#019j : should remove stuff by calling common.deleteJava for Android Studio projects, with target-dir that includes "app"', function () {
@@ -397,7 +397,7 @@ describe('android project handler', function () {
             const someString = jasmine.any(String);
 
             beforeEach(function () {
-                fs.ensureDirSync(path.join(dummyProject.projectDir, dummyPluginInfo.id));
+                fs.mkdirSync(path.join(dummyProject.projectDir, dummyPluginInfo.id), { recursive: true });
 
                 spyOn(dummyProject, 'removeSystemLibrary');
                 spyOn(dummyProject, 'removeSubProject');
@@ -424,13 +424,13 @@ describe('android project handler', function () {
                 const framework = { src: 'plugin-lib', custom: true };
                 android.framework.uninstall(framework, dummyPluginInfo, dummyProject);
                 expect(dummyProject.removeSubProject).toHaveBeenCalledWith(dummyProject.projectDir, someString);
-                expect(removeSyncSpy).toHaveBeenCalledWith(someString);
+                expect(rmSyncSpy).toHaveBeenCalledWith(someString);
             });
 
             it('Test#24 : should install gradleReference using project.removeGradleReference', function () {
                 const framework = { src: 'plugin-lib', custom: true, type: 'gradleReference' };
                 android.framework.uninstall(framework, dummyPluginInfo, dummyProject);
-                expect(removeSyncSpy).toHaveBeenCalledWith(someString);
+                expect(rmSyncSpy).toHaveBeenCalledWith(someString);
                 expect(dummyProject.removeGradleReference).toHaveBeenCalledWith(dummyProject.projectDir, someString);
             });
         });
@@ -453,14 +453,14 @@ describe('android project handler', function () {
 
             it('Test#025 : should put module to both www and platform_www when options.usePlatformWww flag is specified', function () {
                 android['js-module'].uninstall(jsModule, dummyPluginInfo, dummyProject, { usePlatformWww: true });
-                expect(removeSyncSpy).toHaveBeenCalledWith(wwwDest);
-                expect(removeSyncSpy).toHaveBeenCalledWith(platformWwwDest);
+                expect(rmSyncSpy).toHaveBeenCalledWith(wwwDest);
+                expect(rmSyncSpy).toHaveBeenCalledWith(platformWwwDest);
             });
 
             it('Test#026 : should put module to www only when options.usePlatformWww flag is not specified', function () {
                 android['js-module'].uninstall(jsModule, dummyPluginInfo, dummyProject);
-                expect(removeSyncSpy).toHaveBeenCalledWith(wwwDest);
-                expect(removeSyncSpy).not.toHaveBeenCalledWith(platformWwwDest);
+                expect(rmSyncSpy).toHaveBeenCalledWith(wwwDest);
+                expect(rmSyncSpy).not.toHaveBeenCalledWith(platformWwwDest);
             });
         });
 
@@ -481,14 +481,14 @@ describe('android project handler', function () {
 
             it('Test#027 : should put module to both www and platform_www when options.usePlatformWww flag is specified', function () {
                 android.asset.uninstall(asset, dummyPluginInfo, dummyProject, { usePlatformWww: true });
-                expect(removeSyncSpy).toHaveBeenCalledWith(wwwDest);
-                expect(removeSyncSpy).toHaveBeenCalledWith(platformWwwDest);
+                expect(rmSyncSpy).toHaveBeenCalledWith(wwwDest);
+                expect(rmSyncSpy).toHaveBeenCalledWith(platformWwwDest);
             });
 
             it('Test#028 : should put module to www only when options.usePlatformWww flag is not specified', function () {
                 android.asset.uninstall(asset, dummyPluginInfo, dummyProject);
-                expect(removeSyncSpy).toHaveBeenCalledWith(wwwDest);
-                expect(removeSyncSpy).not.toHaveBeenCalledWith(platformWwwDest);
+                expect(rmSyncSpy).toHaveBeenCalledWith(wwwDest);
+                expect(rmSyncSpy).not.toHaveBeenCalledWith(platformWwwDest);
             });
         });
     });

spec/unit/prepare.spec.js

@@ -18,7 +18,7 @@
 */
 
 const rewire = require('rewire');
-const path = require('path');
+const path = require('node:path');
 const CordovaError = require('cordova-common').CordovaError;
 const GradlePropertiesParser = require('../../lib/config/GradlePropertiesParser');
 const utils = require('../../lib/utils');
@@ -899,9 +899,9 @@ describe('prepare', () => {
 
         // Spies
         let replaceFileContents;
-        let ensureDirSyncSpy;
-        let copySyncSpy;
-        let removeSyncSpy;
+        let mkdirSyncSpy;
+        let cpSyncSpy;
+        let rmSyncSpy;
 
         // Mock Data
         let cordovaProject;
@@ -950,7 +950,7 @@ describe('prepare', () => {
 
             prepare.__set__('updateWww', jasmine.createSpy('updateWww'));
             prepare.__set__('updateIcons', jasmine.createSpy('updateIcons').and.returnValue(Promise.resolve()));
-            prepare.__set__('updateProjectSplashScreen', jasmine.createSpy('updateProjectSplashScreen'));
+            prepare.__set__('updateProjectTheme', jasmine.createSpy('updateProjectTheme'));
             prepare.__set__('warnForDeprecatedSplashScreen', jasmine.createSpy('warnForDeprecatedSplashScreen')
                 .and.returnValue(Promise.resolve()));
             prepare.__set__('updateFileResources', jasmine.createSpy('updateFileResources').and.returnValue(Promise.resolve()));
@@ -1001,16 +1001,15 @@ describe('prepare', () => {
                 `))
             });
 
-            ensureDirSyncSpy = jasmine.createSpy('ensureDirSync');
-            copySyncSpy = jasmine.createSpy('copySync');
-            removeSyncSpy = jasmine.createSpy('removeSync');
+            mkdirSyncSpy = jasmine.createSpy('mkdirSync');
+            cpSyncSpy = jasmine.createSpy('cpSync');
+            rmSyncSpy = jasmine.createSpy('rmSync');
 
             prepare.__set__('fs', {
                 writeFileSync: jasmine.createSpy('writeFileSync'),
-                writeJSONSync: jasmine.createSpy('writeJSONSync'),
-                ensureDirSync: ensureDirSyncSpy,
-                copySync: copySyncSpy,
-                removeSync: removeSyncSpy,
+                mkdirSync: mkdirSyncSpy,
+                cpSync: cpSyncSpy,
+                rmSync: rmSyncSpy,
                 existsSync: jasmine.createSpy('existsSync')
             });
         });
@@ -1022,9 +1021,9 @@ describe('prepare', () => {
 
             await api.prepare(cordovaProject, options).then(() => {
                 expect(replaceFileContents).toHaveBeenCalledWith(renamedJavaActivityPath, /package [\w.]*;/, 'package ' + packageName + ';');
-                expect(ensureDirSyncSpy).toHaveBeenCalledWith(renamedPath);
-                expect(copySyncSpy).toHaveBeenCalledWith(initialJavaActivityPath, renamedJavaActivityPath);
-                expect(removeSyncSpy).toHaveBeenCalledWith(initialJavaActivityPath);
+                expect(mkdirSyncSpy).toHaveBeenCalledWith(renamedPath, { recursive: true });
+                expect(cpSyncSpy).toHaveBeenCalledWith(initialJavaActivityPath, renamedJavaActivityPath);
+                expect(rmSyncSpy).toHaveBeenCalledWith(initialJavaActivityPath);
             });
         });
 
@@ -1033,9 +1032,9 @@ describe('prepare', () => {
 
             await api.prepare(cordovaProject, options).then(() => {
                 expect(replaceFileContents).toHaveBeenCalledTimes(0);
-                expect(ensureDirSyncSpy).toHaveBeenCalledTimes(0);
-                expect(copySyncSpy).toHaveBeenCalledTimes(0);
-                expect(removeSyncSpy).toHaveBeenCalledTimes(0);
+                expect(mkdirSyncSpy).toHaveBeenCalledTimes(0);
+                expect(cpSyncSpy).toHaveBeenCalledTimes(0);
+                expect(rmSyncSpy).toHaveBeenCalledTimes(0);
             });
         });
     });

templates/project/AndroidManifest.xml

@@ -39,7 +39,7 @@
                 android:launchMode="singleTop"
                 android:theme="@style/Theme.App.SplashScreen"
                 android:windowSoftInputMode="adjustResize"
-                android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
+                android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"
                 android:exported="true">
             <intent-filter android:label="@string/launcher_name">
                 <action android:name="android.intent.action.MAIN" />

templates/project/app/build.gradle

@@ -261,33 +261,13 @@ android {
     }
 
     if (cordovaConfig.IS_GRADLE_PLUGIN_KOTLIN_ENABLED) {
-        if (cordovaConfig.KOTLIN_JVM_TARGET == null) {
-            // If the value is null, fallback to JAVA_TARGET_COMPATIBILITY,
-            // as they generally should be equal
-            def javaTarget = JavaLanguageVersion.of(cordovaConfig.JAVA_TARGET_COMPATIBILITY)
-
-            // check if javaTarget is <= 8; if so, we need to prefix it with "1."
-            // Starting with 9 and later, the value can be used as is.
-            if (javaTarget.compareTo(JavaLanguageVersion.of(8)) <= 0) {
-                javaTarget = "1." + javaTarget
-            }
-
-            cordovaConfig.KOTLIN_JVM_TARGET = javaTarget
-        }
-
-        // Similar to above, check if kotlin target is <= 8, if so prefix it.
-        // This allows the user to use consistent set of values in config.xml
-        // Rather than having to be aware whether the "1."" prefix is needed.
-        // This check is only done if the value isn't already prefixed with 1.
-        if (
-            !cordovaConfig.KOTLIN_JVM_TARGET.startsWith("1.") &&
-            JavaLanguageVersion.of(cordovaConfig.KOTLIN_JVM_TARGET).compareTo(JavaLanguageVersion.of(8)) <= 0
-        ) {
-            cordovaConfig.KOTLIN_JVM_TARGET = "1." + cordovaConfig.KOTLIN_JVM_TARGET
-        }
+        // If KOTLIN_JVM_TARGET is null, fallback to JAVA_TARGET_COMPATIBILITY,
+        // as they generally should be equal
+        cordovaConfig.KOTLIN_JVM_TARGET = cordovaConfig.KOTLIN_JVM_TARGET ?:
+                cordovaConfig.JAVA_TARGET_COMPATIBILITY
 
         kotlinOptions {
-            jvmTarget = cordovaConfig.KOTLIN_JVM_TARGET
+            jvmTarget = JavaLanguageVersion.of(cordovaConfig.KOTLIN_JVM_TARGET)
         }
     }
 
@@ -331,7 +311,16 @@ dependencies {
     implementation "androidx.core:core-splashscreen:${cordovaConfig.ANDROIDX_CORE_SPLASHSCREEN_VERSION}"
 
     if (cordovaConfig.IS_GRADLE_PLUGIN_KOTLIN_ENABLED) {
-        implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${cordovaConfig.KOTLIN_VERSION}"
+        implementation "org.jetbrains.kotlin:kotlin-stdlib:${cordovaConfig.KOTLIN_VERSION}"
+    }
+
+    constraints {
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${cordovaConfig.KOTLIN_VERSION}") {
+            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
+        }
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${cordovaConfig.KOTLIN_VERSION}") {
+            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
+        }
     }
 
     // SUB-PROJECT DEPENDENCIES START

templates/project/res/values/themes.xml

@@ -17,7 +17,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <style name="Theme.App.SplashScreen" parent="Theme.SplashScreen.IconBackground">
       <!-- Optional: Set the splash screen background. (Default: #FFFFFF) -->
       <item name="windowSplashScreenBackground">@color/cdv_splashscreen_background</item>
@@ -30,5 +30,8 @@
 
       <!-- Required: Set the theme of the Activity that directly follows your splash screen. -->
       <item name="postSplashScreenTheme">@style/Theme.AppCompat.NoActionBar</item>
+
+      <!-- Disable Edge-to-Edge for SDK 35 -->
+      <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
     </style>
 </resources>

test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/StandardActivityTest.java

@@ -66,7 +66,7 @@ public class StandardActivityTest {
     @Test
     public void webViewCheck() {
         StandardActivity activity = (StandardActivity) mActivityRule.getActivity();
-        //Fish the webview out of the mostly locked down Activity using the Android SDK
+        // Fish the WebView out of the mostly locked down Activity using the Android SDK
         View view = activity.getWindow().getCurrentFocus();
         assertEquals(SystemWebView.class, view.getClass());
     }

test/androidx/app/src/main/java/org/apache/cordova/unittests/EmbeddedWebViewActivity.java

@@ -44,7 +44,7 @@ public class EmbeddedWebViewActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        //Set up the webview
+        // Set up the WebView
         ConfigXmlParser parser = new ConfigXmlParser();
         parser.parse(this);
 

test/run_java_unit_tests.js

@@ -19,9 +19,9 @@
        under the License.
 */
 
-const path = require('path');
+const path = require('node:path');
 const execa = require('execa');
-const fs = require('fs-extra');
+const fs = require('node:fs');
 const ProjectBuilder = require('../lib/builders/ProjectBuilder');
 
 class AndroidTestRunner {
@@ -62,7 +62,7 @@ class AndroidTestRunner {
             .then(_ => {
                 // TODO we should probably not only copy these files, but instead create a new project from scratch
                 fs.copyFileSync(path.resolve(this.projectDir, '../../framework/cdv-gradle-config-defaults.json'), path.resolve(this.projectDir, 'cdv-gradle-config.json'));
-                fs.copySync(path.resolve(this.projectDir, '../../templates/project/tools'), path.resolve(this.projectDir, 'tools'));
+                fs.cpSync(path.resolve(this.projectDir, '../../templates/project/tools'), path.resolve(this.projectDir, 'tools'), { recursive: true });
                 fs.copyFileSync(
                     path.join(__dirname, '../templates/project/assets/www/cordova.js'),
                     path.join(this.projectDir, 'app/src/main/assets/www/cordova.js')