chore(deps-dev): bump @babel/traverse from 7.22.10 to 7.23.2 (#1677)

Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.22.10 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.eslintignore

@@ -1,3 +1,3 @@
-bin/templates/project/assets/www/cordova.js
+templates/project/assets/www/cordova.js
 test/android/app
 test/androidx/app

.github/workflows/ci.yml

@@ -27,21 +27,22 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x]
+        node-version: [16.x, 18.x, 20.x]
         os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: set up JDK 11
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'temurin'
+          java-version: '11'
 
       - name: Environment Information
         run: |
@@ -56,6 +57,8 @@ jobs:
         env:
           CI: true
 
-      - uses: codecov/codecov-action@v1
+      - name: upload coverage
+        if: success()
+        uses: codecov/codecov-action@v3
         with:
-          fail_ci_if_error: true
+          name: ${{ runner.os }} node.js ${{ matrix.node-version }}

.gitignore

@@ -25,14 +25,15 @@ example
 /framework/libs
 /framework/javadoc-public
 /framework/javadoc-private
+
+**/assets/www/cordova.js
+
 /test/.externalNativeBuild
 
-/test/android/gradle
-/test/android/gradlew
-/test/android/gradlew.bat
 /test/androidx/gradle
 /test/androidx/gradlew
 /test/androidx/gradlew.bat
+/test/androidx/cdv-gradle-config.json
 
 /test/assets/www/.tmp*
 /test/assets/www/cordova.js

.npmignore

@@ -3,3 +3,4 @@ coverage
 test
 spec
 framework/build
+cordova-js-src

.npmrc

@@ -0,0 +1,2 @@
+registry=https://registry.npmjs.org
+

.ratignore

@@ -1,5 +1,5 @@
 *.properties
-bin
+templates
 gen
 proguard-project.txt
 spec

README.md

@@ -28,36 +28,44 @@
 
 Cordova Android is an Android application library that allows for Cordova-based projects to be built for the Android Platform. Cordova based applications are, at the core, applications written with web technology: HTML, CSS and JavaScript.
 
-[Apache Cordova](https://cordova.apache.org) is a project of The Apache Software Foundation (ASF).
+[Apache Cordova](https://cordova.apache.org/) is a project of [The Apache Software Foundation (ASF)](https://apache.org/).
 
-## Requires
+## Requirements
 
-- Java JDK 1.8
-- Android SDK [http://developer.android.com](https://developer.android.com/)
+* Java Development Kit (JDK) 11
+* [Android SDK](https://developer.android.com/)
+* [Node.js](https://nodejs.org)
 
-## Cordova Android Developer Tools
+## Create a Cordova project
 
-We recommend using the [Cordova command-line tool](https://www.npmjs.com/package/cordova) to create projects and be able to easily install plugins.
+Follow the instructions in the [**Create your first Cordova app**](https://cordova.apache.org/docs/en/latest/guide/cli/index.html) section of [Apache Cordova Docs](https://cordova.apache.org/docs/en/latest/)
 
-However, the following scripts can be used instead:
+To use a **shared framework**, for example in development, link the appropriate cordova-android platform folder path:
 
-    ./bin/create [path package activity] ... creates the ./example app or a cordova android project
-    ./bin/check_reqs ....................... checks that your environment is set up for cordova-android development
-    ./bin/update [path] .................... updates an existing cordova-android project to the version of the framework
+```bash
+cordova platform add --link /path/to/cordova-android
+```
 
-These commands live in a generated Cordova Android project. Any interactions with the emulator require you to have an AVD defined.
+## Updating a Cordova project
 
-    ./cordova/clean ........................ cleans the project
-    ./cordova/build ........................ calls `clean` then compiles the project
-    ./cordova/log   ........................ streams device or emulator logs to STDOUT
-    ./cordova/run   ........................ calls `build` then deploys to a connected Android device. If no Android device is detected, will launch an emulator and deploy to it.
-    ./cordova/version ...................... returns the cordova-android version of the current project
+When you install a new version of the [`Cordova CLI`](https://www.npmjs.com/package/cordova) that pins a new version of the [`Cordova-Android`](https://www.npmjs.com/package/cordova-android) platform, you can follow these simple upgrade steps within your project:
 
-## Using Android Studio
+```bash
+cordova platform rm android
+cordova platform add android
+```
 
-1. Create a project
-2. Import it via "Non-Android Studio Project"
+## Debugging in Android Studio
 
-## Running the Native Tests
+Import project in Android Studio through _File > Open_ and targeting `/path/to/your-cdv-project/platforms/android/`.
 
-The `test/` directory in this project contains an Android test project that can be used to run different kinds of native tests. Check out the [README contained therein](test/README.md) for more details!
+## How to Test Repo Development
+
+```bash
+npm install
+npm test
+```
+
+## Further reading
+
+* [Apache Cordova](https://cordova.apache.org/)

RELEASENOTES.md

@@ -20,6 +20,236 @@
 -->
 ## Release Notes for Cordova (Android)
 
+### 12.0.1 (Aug 23, 2023)
+
+* [GH-1632](https://github.com/apache/cordova-android/pull/1632) fix(android): `monochrome` checks
+* [GH-1649](https://github.com/apache/cordova-android/pull/1649) chore: rebuild `package-lock` w/ lint corrections
+
+### 12.0.0 (May 20, 2023)
+
+**Breaking:**
+
+* [GH-1605](https://github.com/apache/cordova-android/pull/1605) fix!: Make `CoreAndroid` plugin instantiate on load
+* [GH-1539](https://github.com/apache/cordova-android/pull/1539) feat!: bump Gradle 7.6 & AGP 7.4.2
+* [GH-1571](https://github.com/apache/cordova-android/pull/1571) feat!: bump min SDK to 24
+* [GH-1538](https://github.com/apache/cordova-android/pull/1538) feat!: bump target sdk & build tools for SDK 33 support
+* [GH-1540](https://github.com/apache/cordova-android/pull/1540) feat!: bump node engine requirement `>=16.13.0`
+* [GH-1597](https://github.com/apache/cordova-android/pull/1597) deprecate: `CoreAndroid.getBuildConfigValue`
+* [GH-1541](https://github.com/apache/cordova-android/pull/1541) dep(npm)!: bump acceptable modules w/ rebuilt `package-lock`
+* [GH-1566](https://github.com/apache/cordova-android/pull/1566) dep(npm)!: bump `cordova-common@5.0.0`
+
+**Features:**
+
+* [GH-1602](https://github.com/apache/cordova-android/pull/1602) feat: add `listTarget` api
+* [GH-1574](https://github.com/apache/cordova-android/pull/1574) feat: add plugin hooks for `WebViewClient.onRenderProcessGone`
+* [GH-1594](https://github.com/apache/cordova-android/pull/1594) feat: bump default `kotlin` to version 1.7.21
+* [GH-1550](https://github.com/apache/cordova-android/pull/1550) feat: add `monochrome` app icon support
+* [GH-1589](https://github.com/apache/cordova-android/pull/1589) feat: `InspectableWebview` preference
+* [GH-1568](https://github.com/apache/cordova-android/pull/1568) feat: bump `androidx.appcompat.appcompat` 1.6.1
+* [GH-1567](https://github.com/apache/cordova-android/pull/1567) feat: bump `androidx.webkit.webkit` 1.6.0
+* [GH-1545](https://github.com/apache/cordova-android/pull/1545) feat: bump `androidx.webkit.webkit` 1.5.0
+* [GH-1547](https://github.com/apache/cordova-android/pull/1547) feat: bump `com.google.gms.google-services` 4.3.15
+* [GH-1546](https://github.com/apache/cordova-android/pull/1546) feat: bump `androidx.core.core-splashscreen` 1.0.0
+* [GH-1544](https://github.com/apache/cordova-android/pull/1544) feat: bump `androidx.appcompat.appcompat` 1.5.1
+
+**Fixes:**
+
+* [GH-1606](https://github.com/apache/cordova-android/pull/1606) fix: Gradle Args parsing
+* [GH-1575](https://github.com/apache/cordova-android/pull/1575) fix(`BuildHelper`): get package name from `ApplicationInfo`
+* [GH-1595](https://github.com/apache/cordova-android/pull/1595) fix(test): Native test namespace refactor
+* [GH-1471](https://github.com/apache/cordova-android/pull/1471) fix: `ANDROID_HOME` is the new default, to check first and give advice
+* [GH-1573](https://github.com/apache/cordova-android/pull/1573) fix(GH-1432): Default `content` `src` when content tag is missing
+* [GH-1506](https://github.com/apache/cordova-android/pull/1506) fix: only do fadeout animation if `FadeSplashScreen` is true
+* [GH-1505](https://github.com/apache/cordova-android/pull/1505) fix: correctly flag API dependency on `AppCompat` for Maven
+* [GH-1487](https://github.com/apache/cordova-android/pull/1487) fix: Add **Android** prefix to `WindowSplashScreenBrandingImage`
+* [GH-1489](https://github.com/apache/cordova-android/pull/1489) fix: import type definitions from obsolete `cordova-plugin-splashscreen`
+
+**Chores, Refactor,  Dependencies & CI:**
+
+* [GH-1493](https://github.com/apache/cordova-android/pull/1493) chore: add `lint:fix` script for fixing lint errors
+* [GH-1491](https://github.com/apache/cordova-android/pull/1491) chore: Use gradle 7.4.2 distribution url
+* [GH-1588](https://github.com/apache/cordova-android/pull/1588) refactor: Removed obsolete version code checks
+* [GH-1492](https://github.com/apache/cordova-android/pull/1492) refactor: replace deprecated `Handler` constructor
+* [GH-1587](https://github.com/apache/cordova-android/pull/1587) dep: bump npm dependencies
+  * `fs-extra@11.1.1`
+  * `nopt@7.1.0`
+  * `@cordova/eslint-config@5.0.0`
+  * `jasmine@4.6.0`
+* [GH-1607](https://github.com/apache/cordova-android/pull/1607) ci: Added NodeJS 20.x to the workflow matrix
+* [GH-1542](https://github.com/apache/cordova-android/pull/1542) ci(workflow): update `codecov/codecov-action@v3`
+* [GH-1532](https://github.com/apache/cordova-android/pull/1532) ci: update `codecov/codecov-action` reporting format
+
+### 11.0.0 (Jul 04, 2022)
+
+**Breaking:**
+
+* [GH-1441](https://github.com/apache/cordova-android/pull/1441) feat!: **Android** 12 splash screen
+* [GH-1427](https://github.com/apache/cordova-android/pull/1427) feat!: API 32 support
+* [GH-1410](https://github.com/apache/cordova-android/pull/1410) feat!: API 31 support
+* [GH-1444](https://github.com/apache/cordova-android/pull/1444) fix!: set & use `ANDROID_HOME` as default
+* [GH-1411](https://github.com/apache/cordova-android/pull/1411) chore!: Drop Node 12 support
+
+**Features:**
+
+* [GH-1448](https://github.com/apache/cordova-android/pull/1448) feat: Update `androidx.appcompat` version
+* [GH-1446](https://github.com/apache/cordova-android/pull/1446) feat: Update gradle plugin version
+* [GH-1447](https://github.com/apache/cordova-android/pull/1447) feat: Update google services pluging
+* [GH-1431](https://github.com/apache/cordova-android/pull/1431) feat: support custom `compileSdk` setting
+* [GH-1311](https://github.com/apache/cordova-android/pull/1311) feat: added support for BoM imports
+
+**Fixes:**
+
+* [GH-1455](https://github.com/apache/cordova-android/pull/1455) fix(`prepare`): `destFile` path separator
+* [GH-1453](https://github.com/apache/cordova-android/pull/1453) fix: support installing platfrom from local git checkout
+* [GH-1449](https://github.com/apache/cordova-android/pull/1449) fix: accept file cookies only if `AndroidInsecureFileModeEnabled`
+* [GH-1443](https://github.com/apache/cordova-android/pull/1443) fix: force `hostname` to lowercase
+* [GH-1434](https://github.com/apache/cordova-android/pull/1434) fix: restore `checkReqs` in `prepare.js`
+* [GH-1154](https://github.com/apache/cordova-android/pull/1154) fix: move `MainActivity.java` to folder that tracks the app package name (widget id)
+
+**Chores, Dependencies & CI:**
+
+* [GH-1451](https://github.com/apache/cordova-android/pull/1451) chore: display warning on deprecated `<splash>` tag usage
+* [GH-1430](https://github.com/apache/cordova-android/pull/1430) chore: remove unneeded deprecated annotation
+* [GH-1421](https://github.com/apache/cordova-android/pull/1421) chore(npm): bump `@cordova/eslint-config@^4.0.0`
+* [GH-1420](https://github.com/apache/cordova-android/pull/1420) chore(npm): bump dependencies
+* [GH-1452](https://github.com/apache/cordova-android/pull/1452) dep: bump `jasmine@4.2.1` w/ `package-lock` rebuild
+* [GH-1439](https://github.com/apache/cordova-android/pull/1439) ci: update github action workflow
+* [GH-1424](https://github.com/apache/cordova-android/pull/1424) ci: Added Node 18 to test matrix
+
+### 10.1.2 (Apr 11, 2022)
+
+**Fixes:**
+
+* [GH-1372](https://github.com/apache/cordova-android/pull/1372) fix(`AndroidManifest`): explicitly define the `activity` attribute `android:exported`
+* [GH-1406](https://github.com/apache/cordova-android/pull/1406) fix: detect `JAVA_HOME` with Java 11
+* [GH-1401](https://github.com/apache/cordova-android/pull/1401) fix(GH-1391): Reword minimum build tools version to make it more clear what is actually required.
+* [GH-1384](https://github.com/apache/cordova-android/pull/1384) fix: escape `strings.xml` app name
+
+**Chores:**
+
+* [GH-1413](https://github.com/apache/cordova-android/pull/1413) chore: update `package-lock` to satisfy `npm audit`
+* [GH-1348](https://github.com/apache/cordova-android/pull/1348) chore: `npmrc`
+
+### 10.1.1 (Sep 13, 2021)
+
+**Fixes:**
+
+* [GH-1349](https://github.com/apache/cordova-android/pull/1349) fix(`PluginManager`): `AllowNavigation` default policy to handle scheme & hostname
+* [GH-1342](https://github.com/apache/cordova-android/pull/1342) fix(`AllowListPlugin`): Safely handle default allow navigation policy in allow request
+* [GH-1332](https://github.com/apache/cordova-android/pull/1332) fix(`PluginManager`): `AllowBridgeAccess` default policy to handle scheme & hostname
+
+### 10.1.0 (Aug 13, 2021)
+
+**Features:**
+
+* [GH-1213](https://github.com/apache/cordova-android/pull/1213) feat: unify `create` default values & stop project name transform
+* [GH-1306](https://github.com/apache/cordova-android/pull/1306) feat: bump `ANDROIDX_APP_COMPAT@1.3.1`
+* [GH-1303](https://github.com/apache/cordova-android/pull/1303) feat: bump `Google Services Gradle Plugin@4.3.8`
+* [GH-1302](https://github.com/apache/cordova-android/pull/1302) feat: bump `kotlin@1.5.21`
+* [GH-1298](https://github.com/apache/cordova-android/pull/1298) feat: support `http` w/ `content` `src` fix
+
+**Fixes:**
+
+* [GH-1214](https://github.com/apache/cordova-android/pull/1214) fix: display project name in Android Studio
+* [GH-1300](https://github.com/apache/cordova-android/pull/1300) fix: fall back to project root `repositories.gradle`
+
+**Docs:**
+
+* [GH-1308](https://github.com/apache/cordova-android/pull/1308) doc: update `README` about development & testing
+
+### 10.0.1 (Jul 27, 2021)
+
+**Fixes:**
+
+* [GH-1295](https://github.com/apache/cordova-android/pull/1295) fix: `maven-publish` setup
+* [GH-1293](https://github.com/apache/cordova-android/pull/1293) fix: `gradle` build tools config
+* [GH-1294](https://github.com/apache/cordova-android/pull/1294) fix: automatic latest build tools finding
+* [GH-1287](https://github.com/apache/cordova-android/pull/1287) fix: Google Services Gradle Plugin version check failure
+
+**Chores:**
+
+* [GH-1291](https://github.com/apache/cordova-android/pull/1291) chore: add missing release notes
+* [GH-1286](https://github.com/apache/cordova-android/pull/1286) chore: update `README` requirements
+
+### 10.0.0 (Jul 17, 2021)
+
+**Breaking:**
+
+* [GH-1052](https://github.com/apache/cordova-android/pull/1052) feat!: only support `AndroidX`
+* [GH-1137](https://github.com/apache/cordova-android/pull/1137) feat!: implement `WebViewAssetLoader`
+* [GH-1268](https://github.com/apache/cordova-android/pull/1268) feat!: release build defaults to `aab` package type
+* [GH-1182](https://github.com/apache/cordova-android/pull/1182) feat!: bump `target sdk@30` w/ `build-tool@30.0.3`
+* [GH-1257](https://github.com/apache/cordova-android/pull/1257) feat!: upgrade `gradle@7.1.1`
+* [GH-1197](https://github.com/apache/cordova-android/pull/1197) feat!: upgrade `gradle@6.8.3`
+* [GH-1256](https://github.com/apache/cordova-android/pull/1256) feat!: upgrade `kotlin@1.5.20`
+* [GH-1204](https://github.com/apache/cordova-android/pull/1204) feat!: upgrade `kotlin@1.4.32`
+* [GH-1200](https://github.com/apache/cordova-android/pull/1200) feat!: upgrade `kotlin@1.4.31`
+* [GH-1255](https://github.com/apache/cordova-android/pull/1255) feat!: upgrade `android-gradle-plugin@4.2.2`
+* [GH-1232](https://github.com/apache/cordova-android/pull/1232) feat!: upgrade `android-gradle-plugin@4.2.1`
+* [GH-1198](https://github.com/apache/cordova-android/pull/1198) feat!: upgrade `android-gradle-plugin@4.1.3`
+* [GH-1199](https://github.com/apache/cordova-android/pull/1199) feat!: upgrade `Google Services Gradle Plugin@4.3.5`
+* [GH-1262](https://github.com/apache/cordova-android/pull/1262) feat!: bump `appcompat@1.3.0`
+* [GH-1258](https://github.com/apache/cordova-android/pull/1258) feat!: bump `android.webkit@1.4.0`
+* [GH-1252](https://github.com/apache/cordova-android/pull/1252) feat!: drop abandoned `com.github.dcendents:android-maven-gradle-plugin`
+* [GH-1212](https://github.com/apache/cordova-android/pull/1212) feat!: unify & fix gradle library/tooling overrides
+* [GH-1138](https://github.com/apache/cordova-android/pull/1138) feat(allow-list)!: integrate and refactor core plugin
+* [GH-1201](https://github.com/apache/cordova-android/pull/1201) feat!: upgrade jfrog `gradle-bintray-plugin@1.8.5`
+* [GH-1279](https://github.com/apache/cordova-android/pull/1279) chore!: bump all dependencies
+* [GH-1278](https://github.com/apache/cordova-android/pull/1278) chore!: drop `node` 10 support
+* [GH-1205](https://github.com/apache/cordova-android/pull/1205) chore! (`npm`): update all dependencies
+* [GH-1274](https://github.com/apache/cordova-android/pull/1274) cleanup!: remove deprecated settings & add todo comments
+* [GH-1048](https://github.com/apache/cordova-android/pull/1048) cleanup!: remove `keystore` password prompt
+* [GH-1251](https://github.com/apache/cordova-android/pull/1251) cleanup!: drop `jcenter` & update dependencies
+* [GH-1269](https://github.com/apache/cordova-android/pull/1269) refactor!: do not copy JS lib to platform project
+* [GH-1270](https://github.com/apache/cordova-android/pull/1270) refactor(Api)!: use version from `package.json`
+* [GH-1266](https://github.com/apache/cordova-android/pull/1266) refactor(run)!: `run` method
+* [GH-1083](https://github.com/apache/cordova-android/pull/1083) refactor!: drop support for `android` SDK tool
+* [GH-1100](https://github.com/apache/cordova-android/pull/1100) refactor!: remove most platform binaries
+
+**Features:**
+
+* [GH-1241](https://github.com/apache/cordova-android/pull/1241) feat: remove `java` 1.8 version check
+* [GH-1254](https://github.com/apache/cordova-android/pull/1254) feat: support `webkit` version override
+* [GH-1229](https://github.com/apache/cordova-android/pull/1229) feat: `CORDOVA_JAVA_HOME` env variable
+* [GH-1222](https://github.com/apache/cordova-android/pull/1222) feat: add backwards compatibility mode for `WebViewAssetLoader`
+* [GH-1166](https://github.com/apache/cordova-android/pull/1166) feat: overload `PluginEntry` constructor to set onload property
+* [GH-1208](https://github.com/apache/cordova-android/pull/1208) feat: allow `appcompat` version to be configurable
+* [GH-1047](https://github.com/apache/cordova-android/pull/1047) feat: Deprecated `onRequestPermissionResult` in favour for `onRequestPermissionsResult` for consistency
+
+**Fixes:**
+
+* [GH-1283](https://github.com/apache/cordova-android/pull/1283) fix: add missing apache-license header to `getASPath.bat`
+* [GH-1275](https://github.com/apache/cordova-android/pull/1275) fix: add `WebViewAssetloader` to default allow list
+* [GH-1216](https://github.com/apache/cordova-android/pull/1216) fix: request focus after custom view hided
+* [GH-1264](https://github.com/apache/cordova-android/pull/1264) fix: missing `super.onRequestPermissionsResult` error (`MissingSuperCall`)
+* [GH-563](https://github.com/apache/cordova-android/pull/563) fix(build): support tilde expansion on Windows
+* [GH-1220](https://github.com/apache/cordova-android/pull/1220) fix(`requirements` check): use regex to get java version from javac output
+* [GH-1227](https://github.com/apache/cordova-android/pull/1227) fix(prepare): delete splash screens if none are used
+* [GH-1228](https://github.com/apache/cordova-android/pull/1228) fix: java checks
+* [GH-1276](https://github.com/apache/cordova-android/pull/1276) fix: remove forced default `gradle.daemon` setting
+
+**Refactors:**
+
+* [GH-1265](https://github.com/apache/cordova-android/pull/1265) refactor: do not infer project root from script location
+* [GH-1267](https://github.com/apache/cordova-android/pull/1267) refactor: use target SDK of built APK to determine best emulator
+* [GH-1253](https://github.com/apache/cordova-android/pull/1253) refactor: `gradle` cleanup
+* [GH-1260](https://github.com/apache/cordova-android/pull/1260) refactor(`check_reqs`): drop `originalError` param from `check_android_target`
+* [GH-1246](https://github.com/apache/cordova-android/pull/1246) refactor(`env/java`): improve tests and implementation
+
+**Chores & Cleanup:**
+
+* [GH-1273](https://github.com/apache/cordova-android/pull/1273) chore: remove old `VERSION` file
+* [GH-1272](https://github.com/apache/cordova-android/pull/1272) cleanup: delete old ANT & Eclipse files
+* [GH-1141](https://github.com/apache/cordova-android/pull/1141) cleanup: remove app cache settings
+
+**CI, Build & Testing:**
+
+* [GH-1218](https://github.com/apache/cordova-android/pull/1218) ci: Add `Node16` to CI matrix
+* [GH-1271](https://github.com/apache/cordova-android/pull/1271) build: build `cordova.js` during npm prepare
+* [GH-1207](https://github.com/apache/cordova-android/pull/1207) test(`AndroidManifest`): update theme to `Theme.AppCompat.NoActionBar`
+* [GH-1263](https://github.com/apache/cordova-android/pull/1263) test(`check_reqs`): do not hardcode `DEFAULT_TARGET_API`
+* [GH-1259](https://github.com/apache/cordova-android/pull/1259) test(`prepare`): factor out common vars
+
 ### 9.1.0 (Apr 09, 2021)
 
 **Features:**
@@ -233,6 +463,38 @@
 * [CB-13830](https://issues.apache.org/jira/browse/CB-13830) Add handlers for plugins that use non-Java source files, such as Camera
 * [CB-13923](https://issues.apache.org/jira/browse/CB-13923) Fix -1 length for compressed files
 
+### 7.1.4 (Nov 22, 2018)
+
+* Update android-versions to `1.4.0`, with added support for Android Pie ([#573](https://github.com/apache/cordova-android/pull/573))
+* Output current package name if package name can't be validated ([#567](https://github.com/apache/cordova-android/pull/567))
+* Resolve issue with plugin `target-dir="*app*"` subdirs ([#572](https://github.com/apache/cordova-android/pull/572))
+
+### 7.1.3 (Nov 19, 2018)
+
+* [GH-495](https://github.com/apache/cordova-android/pull/495) Incorrect default sdk version issue fix
+* [GH-496](https://github.com/apache/cordova-android/pull/496) update comments in `build.gradle`
+* [GH-539](https://github.com/apache/cordova-android/pull/539) Fix dest overwrite, in case of of plugin `source-file` element with `target-dir` that does not need remapping
+* [GH-540](https://github.com/apache/cordova-android/issues/540) support plugin `source-file` element with any app `target-dir` value
+* [GH-547](https://github.com/apache/cordova-android/issues/547) Compatibility of old plugins with non-Java `source-file` entries (individual files)
+* [GH-551](https://github.com/apache/cordova-android/pull/551) add missing cast for cdvMinSdkVersion to `build.gradle`
+* [GH-552](https://github.com/apache/cordova-android/issues/552) check for `build-extras.gradle` in the parent app directory
+
+### 7.1.2 (Nov 08, 2018)
+* [CB-14127](https://issues.apache.org/jira/browse/CB-14127): Always put the Google repo above jcenter
+* [CB-14165](https://issues.apache.org/jira/browse/CB-14165): Emulator: handle "device still connecting" error (#457)
+* [CB-14125](https://issues.apache.org/jira/browse/CB-14125): Increase old plugin compatibility
+* [CB-13830](https://issues.apache.org/jira/browse/CB-13830): Add handlers for plugins that use non-Java source files, such as Camera
+* [CB-14038](https://issues.apache.org/jira/browse/CB-14038): fix false positive detecting project type
+
+### 7.1.1 (Jul 11, 2018)
+* Fix unsafe property access in run.js (#445)
+* Emit log event instead of logging directly (#452)
+* [CB-14101](https://issues.apache.org/jira/browse/CB-14101) Fix Java version check for Java >= 9 (#446)
+* [CB-14127](https://issues.apache.org/jira/browse/CB-14127) (android) Move google maven repo ahead of jcenter
+* [CB-13923](https://issues.apache.org/jira/browse/CB-13923) (android) fix -1 length for compressed files
+* [CB-14145](https://issues.apache.org/jira/browse/CB-14145) use cordova-common@2.2.5 and update other dependencies to resolve `npm audit` warnings
+* [CB-9366](https://issues.apache.org/jira/browse/CB-9366) log error.stack in cordova.js
+
 ### 7.1.0 (Feb 20, 2018)
 * [CB-13879](https://issues.apache.org/jira/browse/CB-13879) updated gradle tools dependency to 3.0.1 for project template
 * [CB-13831](https://issues.apache.org/jira/browse/CB-13831) Update `android-versions` to 1.3.0 to support SDK 27.

VERSION

@@ -1 +0,0 @@
-9.1.1

bin/android_sdk_version.bat

@@ -1,26 +0,0 @@
-:: Licensed to the Apache Software Foundation (ASF) under one
-:: or more contributor license agreements.  See the NOTICE file
-:: distributed with this work for additional information
-:: regarding copyright ownership.  The ASF licenses this file
-:: to you under the Apache License, Version 2.0 (the
-:: "License"); you may not use this file except in compliance
-:: with the License.  You may obtain a copy of the License at
-::
-:: http://www.apache.org/licenses/LICENSE-2.0
-::
-:: Unless required by applicable law or agreed to in writing,
-:: software distributed under the License is distributed on an
-:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-:: KIND, either express or implied.  See the License for the
-:: specific language governing permissions and limitations
-:: under the License.
-
-@ECHO OFF
-SET script_path="%~dp0android_sdk_version"
-IF EXIST %script_path% (
-        node %script_path% %*
-) ELSE (
-    ECHO.
-    ECHO ERROR: Could not find 'android_sdk_version' script in 'bin' folder, aborting...>&2
-    EXIT /B 1
-)

bin/check_reqs.bat

@@ -1,26 +0,0 @@
-:: Licensed to the Apache Software Foundation (ASF) under one
-:: or more contributor license agreements.  See the NOTICE file
-:: distributed with this work for additional information
-:: regarding copyright ownership.  The ASF licenses this file
-:: to you under the Apache License, Version 2.0 (the
-:: "License"); you may not use this file except in compliance
-:: with the License.  You may obtain a copy of the License at
-::
-:: http://www.apache.org/licenses/LICENSE-2.0
-::
-:: Unless required by applicable law or agreed to in writing,
-:: software distributed under the License is distributed on an
-:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-:: KIND, either express or implied.  See the License for the
-:: specific language governing permissions and limitations
-:: under the License.
-
-@ECHO OFF
-SET script_path="%~dp0check_reqs"
-IF EXIST %script_path% (
-        node %script_path% %*
-) ELSE (
-    ECHO.
-    ECHO ERROR: Could not find 'check_reqs' script in 'bin' folder, aborting...>&2
-    EXIT /B 1
-)

bin/create

@@ -1,61 +0,0 @@
-#!/usr/bin/env node
-
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-var path = require('path');
-var ConfigParser = require('cordova-common').ConfigParser;
-var Api = require('./templates/cordova/Api');
-
-var argv = require('nopt')({
-    help: Boolean,
-    cli: Boolean,
-    shared: Boolean,
-    link: Boolean,
-    'activity-name': [String, undefined]
-}, { d: '--verbose' });
-
-if (argv.help || argv.argv.remain.length === 0) {
-    console.log('Usage: ' + path.relative(process.cwd(), path.join(__dirname, 'create')) + ' <path_to_new_project> <package_name> <project_name> [<template_path>] [--activity-name <activity_name>] [--link]');
-    console.log('    <path_to_new_project>: Path to your new Cordova Android project');
-    console.log('    <package_name>: Package name, following reverse-domain style convention');
-    console.log('    <project_name>: Project name');
-    console.log('    <template_path>: Path to a custom application template to use');
-    console.log('    --activity-name <activity_name>: Activity name');
-    console.log('    --link will use the CordovaLib project directly instead of making a copy.');
-    process.exit(1);
-}
-
-var config = new ConfigParser(path.resolve(__dirname, 'templates/project/res/xml/config.xml'));
-
-if (argv.argv.remain[1]) config.setPackageName(argv.argv.remain[1]);
-if (argv.argv.remain[2]) config.setName(argv.argv.remain[2]);
-if (argv['activity-name']) config.setName(argv['activity-name']);
-
-var options = {
-    link: argv.link || argv.shared,
-    customTemplate: argv.argv.remain[3],
-    activityName: argv['activity-name']
-};
-
-require('./templates/cordova/loggingHelper').adjustLoggerLevel(argv);
-
-Api.createPlatform(argv.argv.remain[0], config, options).catch(err => {
-    console.error(err);
-    process.exitCode = 1;
-});

bin/templates/cordova/build

@@ -1,51 +0,0 @@
-#!/usr/bin/env node
-
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-var args = process.argv;
-var Api = require('./Api');
-var nopt = require('nopt');
-var path = require('path');
-
-// Support basic help commands
-if (['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(args[2]) >= 0) {
-    require('./lib/build').help();
-}
-
-// Do some basic argument parsing
-var buildOpts = nopt({
-    verbose: Boolean,
-    silent: Boolean,
-    debug: Boolean,
-    release: Boolean,
-    nobuild: Boolean,
-    buildConfig: path
-}, { d: '--verbose' });
-
-// Make buildOptions compatible with PlatformApi build method spec
-buildOpts.argv = buildOpts.argv.original;
-
-require('./loggingHelper').adjustLoggerLevel(buildOpts);
-
-new Api().build(buildOpts)
-    .catch(function (err) {
-        console.error(err.stack);
-        process.exit(2);
-    });

bin/templates/cordova/build.bat

@@ -1,26 +0,0 @@
-:: Licensed to the Apache Software Foundation (ASF) under one
-:: or more contributor license agreements.  See the NOTICE file
-:: distributed with this work for additional information
-:: regarding copyright ownership.  The ASF licenses this file
-:: to you under the Apache License, Version 2.0 (the
-:: "License"); you may not use this file except in compliance
-:: with the License.  You may obtain a copy of the License at
-::
-:: http://www.apache.org/licenses/LICENSE-2.0
-::
-:: Unless required by applicable law or agreed to in writing,
-:: software distributed under the License is distributed on an
-:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-:: KIND, either express or implied.  See the License for the
-:: specific language governing permissions and limitations
-:: under the License.
-
-@ECHO OFF
-SET script_path="%~dp0build"
-IF EXIST %script_path% (
-        node %script_path% %*
-) ELSE (
-    ECHO.
-    ECHO ERROR: Could not find 'build' script in 'cordova' folder, aborting...>&2
-    EXIT /B 1
-)

bin/templates/cordova/clean

@@ -1,51 +0,0 @@
-#!/usr/bin/env node
-
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-var Api = require('./Api');
-var path = require('path');
-var nopt = require('nopt');
-
-// Support basic help commands
-if (['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(process.argv[2]) >= 0) {
-    console.log('Usage: ' + path.relative(process.cwd(), process.argv[1]));
-    console.log('Cleans the project directory.');
-    process.exit(0);
-}
-
-// Do some basic argument parsing
-var opts = nopt({
-    verbose: Boolean,
-    silent: Boolean
-}, { d: '--verbose' });
-
-// Make buildOptions compatible with PlatformApi clean method spec
-opts.argv = opts.argv.original;
-
-// Skip cleaning prepared files when not invoking via cordova CLI.
-opts.noPrepare = true;
-
-require('./loggingHelper').adjustLoggerLevel(opts);
-
-new Api().clean(opts)
-    .catch(function (err) {
-        console.error(err.stack);
-        process.exit(2);
-    });

bin/templates/cordova/clean.bat

@@ -1,26 +0,0 @@
-:: Licensed to the Apache Software Foundation (ASF) under one
-:: or more contributor license agreements.  See the NOTICE file
-:: distributed with this work for additional information
-:: regarding copyright ownership.  The ASF licenses this file
-:: to you under the Apache License, Version 2.0 (the
-:: "License"); you may not use this file except in compliance
-:: with the License.  You may obtain a copy of the License at
-::
-:: http://www.apache.org/licenses/LICENSE-2.0
-::
-:: Unless required by applicable law or agreed to in writing,
-:: software distributed under the License is distributed on an
-:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-:: KIND, either express or implied.  See the License for the
-:: specific language governing permissions and limitations
-:: under the License.
-
-@ECHO OFF
-SET script_path="%~dp0clean"
-IF EXIST %script_path% (
-        node %script_path% %*
-) ELSE (
-    ECHO.
-    ECHO ERROR: Could not find 'clean' script in 'cordova' folder, aborting...>&2
-    EXIT /B 1
-)

bin/templates/cordova/lib/getASPath.bat

@@ -1,3 +0,0 @@
-@ECHO OFF
-for /f "tokens=2*" %%a in ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Android Studio" /v Path') do set "ASPath=%%~b"
-ECHO %ASPath%

bin/templates/cordova/lib/install-device

@@ -1,39 +0,0 @@
-#!/usr/bin/env node
-
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-const { resolve, install } = require('./target');
-
-var args = process.argv;
-const targetSpec = { type: 'device' };
-
-if (args.length > 2) {
-    if (args[2].substring(0, 9) === '--target=') {
-        targetSpec.id = args[2].substring(9, args[2].length);
-    } else {
-        console.error('ERROR : argument \'' + args[2] + '\' not recognized.');
-        process.exit(2);
-    }
-}
-
-resolve(targetSpec).then(install).catch(err => {
-    console.error('ERROR: ' + err);
-    process.exit(2);
-});

bin/templates/cordova/lib/install-device.bat

@@ -1,26 +0,0 @@
-:: Licensed to the Apache Software Foundation (ASF) under one
-:: or more contributor license agreements.  See the NOTICE file
-:: distributed with this work for additional information
-:: regarding copyright ownership.  The ASF licenses this file
-:: to you under the Apache License, Version 2.0 (the
-:: "License"); you may not use this file except in compliance
-:: with the License.  You may obtain a copy of the License at
-::
-:: http://www.apache.org/licenses/LICENSE-2.0
-::
-:: Unless required by applicable law or agreed to in writing,
-:: software distributed under the License is distributed on an
-:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-:: KIND, either express or implied.  See the License for the
-:: specific language governing permissions and limitations
-:: under the License.
-
-@ECHO OFF
-SET script_path="%~dp0install-device"
-IF EXIST %script_path% (
-        node %script_path% %*
-) ELSE (
-    ECHO.
-    ECHO ERROR: Could not find 'install-device' script in 'cordova\lib' folder, aborting...>&2
-    EXIT /B 1
-)

bin/templates/cordova/lib/install-emulator

@@ -1,39 +0,0 @@
-#!/usr/bin/env node
-
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-const { resolve, install } = require('./target');
-
-var args = process.argv;
-const targetSpec = { type: 'emulator' };
-
-if (args.length > 2) {
-    if (args[2].substring(0, 9) === '--target=') {
-        targetSpec.id = args[2].substring(9, args[2].length);
-    } else {
-        console.error('ERROR : argument \'' + args[2] + '\' not recognized.');
-        process.exit(2);
-    }
-}
-
-resolve(targetSpec).then(install).catch(err => {
-    console.error('ERROR: ' + err);
-    process.exit(2);
-});

bin/templates/cordova/lib/install-emulator.bat

@@ -1,26 +0,0 @@
-:: Licensed to the Apache Software Foundation (ASF) under one
-:: or more contributor license agreements.  See the NOTICE file
-:: distributed with this work for additional information
-:: regarding copyright ownership.  The ASF licenses this file
-:: to you under the Apache License, Version 2.0 (the
-:: "License"); you may not use this file except in compliance
-:: with the License.  You may obtain a copy of the License at
-::
-:: http://www.apache.org/licenses/LICENSE-2.0
-::
-:: Unless required by applicable law or agreed to in writing,
-:: software distributed under the License is distributed on an
-:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-:: KIND, either express or implied.  See the License for the
-:: specific language governing permissions and limitations
-:: under the License.
-
-@ECHO OFF
-SET script_path="%~dp0install-emulator"
-IF EXIST %script_path% (
-        node %script_path% %*
-) ELSE (
-    ECHO.
-    ECHO ERROR: Could not find 'install-emulator' script in 'cordova\lib' folder, aborting...>&2
-    EXIT /B 1
-)

bin/templates/cordova/lib/list-devices.bat

@@ -1,26 +0,0 @@
-:: Licensed to the Apache Software Foundation (ASF) under one
-:: or more contributor license agreements.  See the NOTICE file
-:: distributed with this work for additional information
-:: regarding copyright ownership.  The ASF licenses this file
-:: to you under the Apache License, Version 2.0 (the
-:: "License"); you may not use this file except in compliance
-:: with the License.  You may obtain a copy of the License at
-::
-:: http://www.apache.org/licenses/LICENSE-2.0
-::
-:: Unless required by applicable law or agreed to in writing,
-:: software distributed under the License is distributed on an
-:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-:: KIND, either express or implied.  See the License for the
-:: specific language governing permissions and limitations
-:: under the License.
-
-@ECHO OFF
-SET script_path="%~dp0list-devices"
-IF EXIST %script_path% (
-        node %script_path% %*
-) ELSE (
-    ECHO.
-    ECHO ERROR: Could not find 'list-devices' script in 'cordova\lib' folder, aborting...>&2
-    EXIT /B 1
-)

bin/templates/cordova/lib/list-emulator-images.bat

@@ -1,26 +0,0 @@
-:: Licensed to the Apache Software Foundation (ASF) under one
-:: or more contributor license agreements.  See the NOTICE file
-:: distributed with this work for additional information
-:: regarding copyright ownership.  The ASF licenses this file
-:: to you under the Apache License, Version 2.0 (the
-:: "License"); you may not use this file except in compliance
-:: with the License.  You may obtain a copy of the License at
-::
-:: http://www.apache.org/licenses/LICENSE-2.0
-::
-:: Unless required by applicable law or agreed to in writing,
-:: software distributed under the License is distributed on an
-:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-:: KIND, either express or implied.  See the License for the
-:: specific language governing permissions and limitations
-:: under the License.
-
-@ECHO OFF
-SET script_path="%~dp0list-emulator-images"
-IF EXIST %script_path% (
-        node %script_path% %*
-) ELSE (
-    ECHO.
-    ECHO ERROR: Could not find 'list-emulator-images' script in 'cordova\lib' folder, aborting...>&2
-    EXIT /B 1
-)

bin/templates/cordova/lib/list-started-emulators

@@ -1,34 +0,0 @@
-#!/usr/bin/env node
-
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-var emulators = require('./emulator');
-
-// Usage support for when args are given
-require('./check_reqs').check_android().then(function () {
-    emulators.list_started().then(function (emulator_list) {
-        emulator_list && emulator_list.forEach(function (emu) {
-            console.log(emu);
-        });
-    }, function (err) {
-        console.error('ERROR: ' + err);
-        process.exit(2);
-    });
-});

bin/templates/cordova/lib/list-started-emulators.bat

@@ -1,26 +0,0 @@
-:: Licensed to the Apache Software Foundation (ASF) under one
-:: or more contributor license agreements.  See the NOTICE file
-:: distributed with this work for additional information
-:: regarding copyright ownership.  The ASF licenses this file
-:: to you under the Apache License, Version 2.0 (the
-:: "License"); you may not use this file except in compliance
-:: with the License.  You may obtain a copy of the License at
-::
-:: http://www.apache.org/licenses/LICENSE-2.0
-::
-:: Unless required by applicable law or agreed to in writing,
-:: software distributed under the License is distributed on an
-:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-:: KIND, either express or implied.  See the License for the
-:: specific language governing permissions and limitations
-:: under the License.
-
-@ECHO OFF
-SET script_path="%~dp0list-started-emulators"
-IF EXIST %script_path% (
-        node %script_path% %*
-) ELSE (
-    ECHO.
-    ECHO ERROR: Could not find 'list-started-emulators' script in 'cordova\lib' folder, aborting...>&2
-    EXIT /B 1
-)

bin/templates/cordova/lib/log.js

@@ -1,45 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-var path = require('path');
-var os = require('os');
-var execa = require('execa');
-var ROOT = path.join(__dirname, '..', '..');
-
-/*
- * Starts running logcat in the shell.
- * Returns a promise.
- */
-module.exports.run = function () {
-    var adb = execa('adb', ['logcat'], { cwd: os.tmpdir(), stderr: 'inherit' });
-
-    adb.stdout.on('data', function (data) {
-        var lines = data ? data.toString().split('\n') : [];
-        var out = lines.filter(function (x) { return x.indexOf('nativeGetEnabledTags') < 0; });
-        console.log(out.join('\n'));
-    });
-
-    return adb;
-};
-
-module.exports.help = function () {
-    console.log('Usage: ' + path.relative(process.cwd(), path.join(ROOT, 'cordova', 'log')));
-    console.log('Gives the logcat output on the command line.');
-    process.exit(0);
-};

bin/templates/cordova/lib/prepare.js

@@ -1,761 +0,0 @@
-/**
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-*/
-
-var fs = require('fs-extra');
-var path = require('path');
-const nopt = require('nopt');
-const glob = require('fast-glob');
-var events = require('cordova-common').events;
-var AndroidManifest = require('./AndroidManifest');
-var checkReqs = require('./check_reqs');
-var xmlHelpers = require('cordova-common').xmlHelpers;
-var CordovaError = require('cordova-common').CordovaError;
-var ConfigParser = require('cordova-common').ConfigParser;
-var FileUpdater = require('cordova-common').FileUpdater;
-var PlatformJson = require('cordova-common').PlatformJson;
-var PlatformMunger = require('cordova-common').ConfigChanges.PlatformMunger;
-var PluginInfoProvider = require('cordova-common').PluginInfoProvider;
-const utils = require('./utils');
-
-const GradlePropertiesParser = require('./config/GradlePropertiesParser');
-
-function parseArguments (argv) {
-    return nopt({
-        // `jvmargs` is a valid option however, we don't actually want to parse it because we want the entire string as is.
-        // jvmargs: String
-    }, {}, argv || [], 0);
-}
-
-module.exports.prepare = function (cordovaProject, options) {
-    var self = this;
-
-    let args = {};
-    if (options && options.options) {
-        args = parseArguments(options.options.argv);
-    }
-
-    var platformJson = PlatformJson.load(this.locations.root, this.platform);
-    var munger = new PlatformMunger(this.platform, this.locations.root, platformJson, new PluginInfoProvider());
-
-    this._config = updateConfigFilesFrom(cordovaProject.projectConfig, munger, this.locations);
-
-    // Get the min SDK version from config.xml
-    const minSdkVersion = this._config.getPreference('android-minSdkVersion', 'android');
-    const maxSdkVersion = this._config.getPreference('android-maxSdkVersion', 'android');
-    const targetSdkVersion = this._config.getPreference('android-targetSdkVersion', 'android');
-    const androidXEnabled = this._config.getPreference('AndroidXEnabled', 'android');
-    const isGradlePluginKotlinEnabled = this._config.getPreference('GradlePluginKotlinEnabled', 'android');
-    const gradlePluginKotlinCodeStyle = this._config.getPreference('GradlePluginKotlinCodeStyle', 'android');
-
-    const gradlePropertiesUserConfig = {};
-    if (minSdkVersion) gradlePropertiesUserConfig.cdvMinSdkVersion = minSdkVersion;
-    if (maxSdkVersion) gradlePropertiesUserConfig.cdvMaxSdkVersion = maxSdkVersion;
-    if (targetSdkVersion) gradlePropertiesUserConfig.cdvTargetSdkVersion = targetSdkVersion;
-    if (args.jvmargs) gradlePropertiesUserConfig['org.gradle.jvmargs'] = args.jvmargs;
-    if (isGradlePluginKotlinEnabled) {
-        gradlePropertiesUserConfig['kotlin.code.style'] = gradlePluginKotlinCodeStyle || 'official';
-    }
-
-    // Both 'useAndroidX' and 'enableJetifier' are linked together.
-    if (androidXEnabled) {
-        gradlePropertiesUserConfig['android.useAndroidX'] = androidXEnabled;
-        gradlePropertiesUserConfig['android.enableJetifier'] = androidXEnabled;
-    }
-
-    const gradlePropertiesParser = new GradlePropertiesParser(this.locations.root);
-    gradlePropertiesParser.configure(gradlePropertiesUserConfig);
-
-    // Update own www dir with project's www assets and plugins' assets and js-files
-    return Promise.resolve(updateWww(cordovaProject, this.locations)).then(function () {
-        // update project according to config.xml changes.
-        return updateProjectAccordingTo(self._config, self.locations);
-    }).then(function () {
-        updateIcons(cordovaProject, path.relative(cordovaProject.root, self.locations.res));
-        updateSplashes(cordovaProject, path.relative(cordovaProject.root, self.locations.res));
-        updateFileResources(cordovaProject, path.relative(cordovaProject.root, self.locations.root));
-    }).then(function () {
-        events.emit('verbose', 'Prepared android project successfully');
-    });
-};
-
-module.exports.clean = function (options) {
-    // A cordovaProject isn't passed into the clean() function, because it might have
-    // been called from the platform shell script rather than the CLI. Check for the
-    // noPrepare option passed in by the non-CLI clean script. If that's present, or if
-    // there's no config.xml found at the project root, then don't clean prepared files.
-    var projectRoot = path.resolve(this.root, '../..');
-    if ((options && options.noPrepare) || !fs.existsSync(this.locations.configXml) ||
-            !fs.existsSync(this.locations.configXml)) {
-        return Promise.resolve();
-    }
-
-    var projectConfig = new ConfigParser(this.locations.configXml);
-
-    var self = this;
-    return Promise.resolve().then(function () {
-        cleanWww(projectRoot, self.locations);
-        cleanIcons(projectRoot, projectConfig, path.relative(projectRoot, self.locations.res));
-        cleanSplashes(projectRoot, projectConfig, path.relative(projectRoot, self.locations.res));
-        cleanFileResources(projectRoot, projectConfig, path.relative(projectRoot, self.locations.root));
-    });
-};
-
-/**
- * Updates config files in project based on app's config.xml and config munge,
- *   generated by plugins.
- *
- * @param   {ConfigParser}   sourceConfig  A project's configuration that will
- *   be merged into platform's config.xml
- * @param   {ConfigChanges}  configMunger  An initialized ConfigChanges instance
- *   for this platform.
- * @param   {Object}         locations     A map of locations for this platform
- *
- * @return  {ConfigParser}                 An instance of ConfigParser, that
- *   represents current project's configuration. When returned, the
- *   configuration is already dumped to appropriate config.xml file.
- */
-function updateConfigFilesFrom (sourceConfig, configMunger, locations) {
-    events.emit('verbose', 'Generating platform-specific config.xml from defaults for android at ' + locations.configXml);
-
-    // First cleanup current config and merge project's one into own
-    // Overwrite platform config.xml with defaults.xml.
-    fs.copySync(locations.defaultConfigXml, locations.configXml);
-
-    // Then apply config changes from global munge to all config files
-    // in project (including project's config)
-    configMunger.reapply_global_munge().save_all();
-
-    events.emit('verbose', 'Merging project\'s config.xml into platform-specific android config.xml');
-    // Merge changes from app's config.xml into platform's one
-    var config = new ConfigParser(locations.configXml);
-    xmlHelpers.mergeXml(sourceConfig.doc.getroot(),
-        config.doc.getroot(), 'android', /* clobber= */true);
-
-    config.write();
-    return config;
-}
-
-/**
- * Logs all file operations via the verbose event stream, indented.
- */
-function logFileOp (message) {
-    events.emit('verbose', '  ' + message);
-}
-
-/**
- * Updates platform 'www' directory by replacing it with contents of
- *   'platform_www' and app www. Also copies project's overrides' folder into
- *   the platform 'www' folder
- *
- * @param   {Object}  cordovaProject    An object which describes cordova project.
- * @param   {Object}  destinations      An object that contains destination
- *   paths for www files.
- */
-function updateWww (cordovaProject, destinations) {
-    var sourceDirs = [
-        path.relative(cordovaProject.root, cordovaProject.locations.www),
-        path.relative(cordovaProject.root, destinations.platformWww)
-    ];
-
-    // If project contains 'merges' for our platform, use them as another overrides
-    var merges_path = path.join(cordovaProject.root, 'merges', 'android');
-    if (fs.existsSync(merges_path)) {
-        events.emit('verbose', 'Found "merges/android" folder. Copying its contents into the android project.');
-        sourceDirs.push(path.join('merges', 'android'));
-    }
-
-    var targetDir = path.relative(cordovaProject.root, destinations.www);
-    events.emit(
-        'verbose', 'Merging and updating files from [' + sourceDirs.join(', ') + '] to ' + targetDir);
-    FileUpdater.mergeAndUpdateDir(
-        sourceDirs, targetDir, { rootDir: cordovaProject.root }, logFileOp);
-}
-
-/**
- * Cleans all files from the platform 'www' directory.
- */
-function cleanWww (projectRoot, locations) {
-    var targetDir = path.relative(projectRoot, locations.www);
-    events.emit('verbose', 'Cleaning ' + targetDir);
-
-    // No source paths are specified, so mergeAndUpdateDir() will clear the target directory.
-    FileUpdater.mergeAndUpdateDir(
-        [], targetDir, { rootDir: projectRoot, all: true }, logFileOp);
-}
-
-/**
- * Updates project structure and AndroidManifest according to project's configuration.
- *
- * @param   {ConfigParser}  platformConfig  A project's configuration that will
- *   be used to update project
- * @param   {Object}  locations       A map of locations for this platform
- */
-function updateProjectAccordingTo (platformConfig, locations) {
-    // Update app name by editing res/values/strings.xml
-    var strings = xmlHelpers.parseElementtreeSync(locations.strings);
-
-    var name = platformConfig.name();
-    strings.find('string[@name="app_name"]').text = name.replace(/'/g, '\\\'');
-
-    var shortName = platformConfig.shortName && platformConfig.shortName();
-    if (shortName && shortName !== name) {
-        strings.find('string[@name="launcher_name"]').text = shortName.replace(/'/g, '\\\'');
-    }
-
-    fs.writeFileSync(locations.strings, strings.write({ indent: 4 }), 'utf-8');
-    events.emit('verbose', 'Wrote out android application name "' + name + '" to ' + locations.strings);
-
-    // Java packages cannot support dashes
-    var androidPkgName = (platformConfig.android_packageName() || platformConfig.packageName()).replace(/-/g, '_');
-
-    var manifest = new AndroidManifest(locations.manifest);
-    var manifestId = manifest.getPackageId();
-
-    manifest.getActivity()
-        .setOrientation(platformConfig.getPreference('orientation'))
-        .setLaunchMode(findAndroidLaunchModePreference(platformConfig));
-
-    manifest.setVersionName(platformConfig.version())
-        .setVersionCode(platformConfig.android_versionCode() || default_versionCode(platformConfig.version()))
-        .setPackageId(androidPkgName)
-        .write();
-
-    // Java file paths shouldn't be hard coded
-    const javaDirectory = path.join(locations.javaSrc, manifestId.replace(/\./g, '/'));
-    const java_files = glob.sync('**/*.java', { cwd: javaDirectory, absolute: true }).filter(f => {
-        const contents = fs.readFileSync(f, 'utf-8');
-        return /extends\s+CordovaActivity/.test(contents);
-    });
-
-    if (java_files.length === 0) {
-        throw new CordovaError('No Java files found that extend CordovaActivity.');
-    } else if (java_files.length > 1) {
-        events.emit('log', 'Multiple candidate Java files that extend CordovaActivity found. Guessing at the first one, ' + java_files[0]);
-    }
-
-    const destFile = java_files[0];
-
-    // var destFile = path.join(locations.root, 'app', 'src', 'main', 'java', androidPkgName.replace(/\./g, '/'), path.basename(java_files[0]));
-    // fs.ensureDirSync(path.dirname(destFile));
-    // events.emit('verbose', java_files[0]);
-    // events.emit('verbose', destFile);
-    // console.log(locations);
-    // fs.copySync(java_files[0], destFile);
-    utils.replaceFileContents(destFile, /package [\w.]*;/, 'package ' + androidPkgName + ';');
-    events.emit('verbose', 'Wrote out Android package name "' + androidPkgName + '" to ' + destFile);
-
-    var removeOrigPkg = checkReqs.isWindows() || checkReqs.isDarwin()
-        ? manifestId.toUpperCase() !== androidPkgName.toUpperCase()
-        : manifestId !== androidPkgName;
-
-    if (removeOrigPkg) {
-        // If package was name changed we need to remove old java with main activity
-        fs.removeSync(java_files[0]);
-        // remove any empty directories
-        var currentDir = path.dirname(java_files[0]);
-        var sourcesRoot = path.resolve(locations.root, 'src');
-        while (currentDir !== sourcesRoot) {
-            if (fs.existsSync(currentDir) && fs.readdirSync(currentDir).length === 0) {
-                fs.rmdirSync(currentDir);
-                currentDir = path.resolve(currentDir, '..');
-            } else {
-                break;
-            }
-        }
-    }
-}
-
-// Consturct the default value for versionCode as
-// PATCH + MINOR * 100 + MAJOR * 10000
-// see http://developer.android.com/tools/publishing/versioning.html
-function default_versionCode (version) {
-    var nums = version.split('-')[0].split('.');
-    var versionCode = 0;
-    if (+nums[0]) {
-        versionCode += +nums[0] * 10000;
-    }
-    if (+nums[1]) {
-        versionCode += +nums[1] * 100;
-    }
-    if (+nums[2]) {
-        versionCode += +nums[2];
-    }
-
-    events.emit('verbose', 'android-versionCode not found in config.xml. Generating a code based on version in config.xml (' + version + '): ' + versionCode);
-    return versionCode;
-}
-
-function getImageResourcePath (resourcesDir, type, density, name, sourceName) {
-    // Use same extension as source with special case for 9-Patch files
-    const ext = sourceName.endsWith('.9.png')
-        ? '.9.png' : path.extname(sourceName).toLowerCase();
-
-    const subDir = density ? `${type}-${density}` : type;
-    return path.join(resourcesDir, subDir, name + ext);
-}
-
-function getAdaptiveImageResourcePath (resourcesDir, type, density, name, sourceName) {
-    if (/\.9\.png$/.test(sourceName)) {
-        name = name.replace(/\.png$/, '.9.png');
-    }
-    var resourcePath = path.join(resourcesDir, (density ? type + '-' + density + '-v26' : type), name);
-    return resourcePath;
-}
-
-function makeSplashCleanupMap (projectRoot, resourcesDir) {
-    // Build an initial resource map that deletes all existing splash screens
-    const existingSplashPaths = glob.sync(
-        `${resourcesDir.replace(/\\/g, '/')}/drawable-*/screen.{png,9.png,webp,jpg,jpeg}`,
-        { cwd: projectRoot }
-    );
-    return makeCleanResourceMap(existingSplashPaths);
-}
-
-function updateSplashes (cordovaProject, platformResourcesDir) {
-    var resources = cordovaProject.projectConfig.getSplashScreens('android');
-
-    // if there are "splash" elements in config.xml
-    if (resources.length === 0) {
-        events.emit('verbose', 'This app does not have splash screens defined');
-        return;
-    }
-
-    // Build an initial resource map that deletes all existing splash screens
-    const resourceMap = makeSplashCleanupMap(cordovaProject.root, platformResourcesDir);
-
-    var hadMdpi = false;
-    resources.forEach(function (resource) {
-        if (!resource.density) {
-            return;
-        }
-        if (resource.density === 'mdpi') {
-            hadMdpi = true;
-        }
-        var targetPath = getImageResourcePath(
-            platformResourcesDir, 'drawable', resource.density, 'screen', path.basename(resource.src));
-        resourceMap[targetPath] = resource.src;
-    });
-
-    // There's no "default" drawable, so assume default == mdpi.
-    if (!hadMdpi && resources.defaultResource) {
-        var targetPath = getImageResourcePath(
-            platformResourcesDir, 'drawable', 'mdpi', 'screen', path.basename(resources.defaultResource.src));
-        resourceMap[targetPath] = resources.defaultResource.src;
-    }
-
-    events.emit('verbose', 'Updating splash screens at ' + platformResourcesDir);
-    FileUpdater.updatePaths(
-        resourceMap, { rootDir: cordovaProject.root }, logFileOp);
-}
-
-function cleanSplashes (projectRoot, projectConfig, platformResourcesDir) {
-    var resources = projectConfig.getSplashScreens('android');
-    if (resources.length > 0) {
-        const resourceMap = makeSplashCleanupMap(projectRoot, platformResourcesDir);
-
-        events.emit('verbose', 'Cleaning splash screens at ' + platformResourcesDir);
-
-        // No source paths are specified in the map, so updatePaths() will delete the target files.
-        FileUpdater.updatePaths(
-            resourceMap, { rootDir: projectRoot, all: true }, logFileOp);
-    }
-}
-
-function updateIcons (cordovaProject, platformResourcesDir) {
-    const icons = cordovaProject.projectConfig.getIcons('android');
-
-    // Skip if there are no app defined icons in config.xml
-    if (icons.length === 0) {
-        events.emit('verbose', 'This app does not have launcher icons defined');
-        return;
-    }
-
-    // 1. loop icons determin if there is an error in the setup.
-    // 2. during initial loop, also setup for legacy support.
-    const errorMissingAttributes = [];
-    const errorLegacyIconNeeded = [];
-    let hasAdaptive = false;
-    icons.forEach((icon, key) => {
-        if (
-            (icon.background && !icon.foreground) ||
-            (!icon.background && icon.foreground) ||
-            (!icon.background && !icon.foreground && !icon.src)
-        ) {
-            errorMissingAttributes.push(icon.density ? icon.density : 'size=' + (icon.height || icon.width));
-        }
-
-        if (icon.foreground) {
-            hasAdaptive = true;
-
-            if (
-                !icon.src &&
-                (
-                    icon.foreground.startsWith('@color') ||
-                    path.extname(path.basename(icon.foreground)) === '.xml'
-                )
-            ) {
-                errorLegacyIconNeeded.push(icon.density ? icon.density : 'size=' + (icon.height || icon.width));
-            } else if (!icon.src) {
-                icons[key].src = icon.foreground;
-            }
-        }
-    });
-
-    const errorMessage = [];
-    if (errorMissingAttributes.length > 0) {
-        errorMessage.push('One of the following attributes are set but missing the other for the density type: ' + errorMissingAttributes.join(', ') + '. Please ensure that all require attributes are defined.');
-    }
-
-    if (errorLegacyIconNeeded.length > 0) {
-        errorMessage.push('For the following icons with the density of: ' + errorLegacyIconNeeded.join(', ') + ', adaptive foreground with a defined color or vector can not be used as a standard fallback icon for older Android devices. To support older Android environments, please provide a value for the src attribute.');
-    }
-
-    if (errorMessage.length > 0) {
-        throw new CordovaError(errorMessage.join(' '));
-    }
-
-    let resourceMap = Object.assign(
-        {},
-        mapImageResources(cordovaProject.root, platformResourcesDir, 'mipmap', 'ic_launcher.png'),
-        mapImageResources(cordovaProject.root, platformResourcesDir, 'mipmap', 'ic_launcher_foreground.png'),
-        mapImageResources(cordovaProject.root, platformResourcesDir, 'mipmap', 'ic_launcher_background.png'),
-        mapImageResources(cordovaProject.root, platformResourcesDir, 'mipmap', 'ic_launcher_foreground.xml'),
-        mapImageResources(cordovaProject.root, platformResourcesDir, 'mipmap', 'ic_launcher_background.xml'),
-        mapImageResources(cordovaProject.root, platformResourcesDir, 'mipmap', 'ic_launcher.xml')
-    );
-
-    const preparedIcons = prepareIcons(icons);
-
-    if (hasAdaptive) {
-        resourceMap = updateIconResourceForAdaptive(preparedIcons, resourceMap, platformResourcesDir);
-    }
-
-    resourceMap = updateIconResourceForLegacy(preparedIcons, resourceMap, platformResourcesDir);
-
-    events.emit('verbose', 'Updating icons at ' + platformResourcesDir);
-    FileUpdater.updatePaths(resourceMap, { rootDir: cordovaProject.root }, logFileOp);
-}
-
-function updateIconResourceForAdaptive (preparedIcons, resourceMap, platformResourcesDir) {
-    const android_icons = preparedIcons.android_icons;
-    const default_icon = preparedIcons.default_icon;
-
-    // The source paths for icons and splashes are relative to
-    // project's config.xml location, so we use it as base path.
-    let background;
-    let foreground;
-    let targetPathBackground;
-    let targetPathForeground;
-
-    for (const density in android_icons) {
-        let backgroundVal = '@mipmap/ic_launcher_background';
-        let foregroundVal = '@mipmap/ic_launcher_foreground';
-
-        background = android_icons[density].background;
-        foreground = android_icons[density].foreground;
-
-        if (!background || !foreground) {
-            // This icon isn't an adaptive icon, so skip it
-            continue;
-        }
-
-        if (background.startsWith('@color')) {
-            // Colors Use Case
-            backgroundVal = background; // Example: @color/background_foobar_1
-        } else if (path.extname(path.basename(background)) === '.xml') {
-            // Vector Use Case
-            targetPathBackground = getAdaptiveImageResourcePath(platformResourcesDir, 'mipmap', density, 'ic_launcher_background.xml', path.basename(android_icons[density].background));
-            resourceMap[targetPathBackground] = android_icons[density].background;
-        } else if (path.extname(path.basename(background)) === '.png') {
-            // Images Use Case
-            targetPathBackground = getAdaptiveImageResourcePath(platformResourcesDir, 'mipmap', density, 'ic_launcher_background.png', path.basename(android_icons[density].background));
-            resourceMap[targetPathBackground] = android_icons[density].background;
-        }
-
-        if (foreground.startsWith('@color')) {
-            // Colors Use Case
-            foregroundVal = foreground;
-        } else if (path.extname(path.basename(foreground)) === '.xml') {
-            // Vector Use Case
-            targetPathForeground = getAdaptiveImageResourcePath(platformResourcesDir, 'mipmap', density, 'ic_launcher_foreground.xml', path.basename(android_icons[density].foreground));
-            resourceMap[targetPathForeground] = android_icons[density].foreground;
-        } else if (path.extname(path.basename(foreground)) === '.png') {
-            // Images Use Case
-            targetPathForeground = getAdaptiveImageResourcePath(platformResourcesDir, 'mipmap', density, 'ic_launcher_foreground.png', path.basename(android_icons[density].foreground));
-            resourceMap[targetPathForeground] = android_icons[density].foreground;
-        }
-
-        // create an XML for DPI and set color
-        const icLauncherTemplate = `<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="` + backgroundVal + `" />
-    <foreground android:drawable="` + foregroundVal + `" />
-</adaptive-icon>`;
-
-        const launcherXmlPath = path.join(platformResourcesDir, 'mipmap-' + density + '-v26', 'ic_launcher.xml');
-
-        // Remove the XML from the resourceMap so the file does not get removed.
-        delete resourceMap[launcherXmlPath];
-
-        fs.writeFileSync(path.resolve(launcherXmlPath), icLauncherTemplate);
-    }
-
-    // There's no "default" drawable, so assume default == mdpi.
-    if (default_icon && !android_icons.mdpi) {
-        let defaultTargetPathBackground;
-        let defaultTargetPathForeground;
-
-        if (background.startsWith('@color')) {
-            // Colors Use Case
-            targetPathBackground = default_icon.background;
-        } else if (path.extname(path.basename(background)) === '.xml') {
-            // Vector Use Case
-            defaultTargetPathBackground = getAdaptiveImageResourcePath(platformResourcesDir, 'mipmap', 'mdpi', 'ic_launcher_background.xml', path.basename(default_icon.background));
-            resourceMap[defaultTargetPathBackground] = default_icon.background;
-        } else if (path.extname(path.basename(background)) === '.png') {
-            // Images Use Case
-            defaultTargetPathBackground = getAdaptiveImageResourcePath(platformResourcesDir, 'mipmap', 'mdpi', 'ic_launcher_background.png', path.basename(default_icon.background));
-            resourceMap[defaultTargetPathBackground] = default_icon.background;
-        }
-
-        if (foreground.startsWith('@color')) {
-            // Colors Use Case
-            targetPathForeground = default_icon.foreground;
-        } else if (path.extname(path.basename(foreground)) === '.xml') {
-            // Vector Use Case
-            defaultTargetPathForeground = getAdaptiveImageResourcePath(platformResourcesDir, 'mipmap', 'mdpi', 'ic_launcher_foreground.xml', path.basename(default_icon.foreground));
-            resourceMap[defaultTargetPathForeground] = default_icon.foreground;
-        } else if (path.extname(path.basename(foreground)) === '.png') {
-            // Images Use Case
-            defaultTargetPathForeground = getAdaptiveImageResourcePath(platformResourcesDir, 'mipmap', 'mdpi', 'ic_launcher_foreground.png', path.basename(default_icon.foreground));
-            resourceMap[defaultTargetPathForeground] = default_icon.foreground;
-        }
-    }
-
-    return resourceMap;
-}
-
-function updateIconResourceForLegacy (preparedIcons, resourceMap, platformResourcesDir) {
-    const android_icons = preparedIcons.android_icons;
-    const default_icon = preparedIcons.default_icon;
-
-    // The source paths for icons and splashes are relative to
-    // project's config.xml location, so we use it as base path.
-    for (var density in android_icons) {
-        var targetPath = getImageResourcePath(platformResourcesDir, 'mipmap', density, 'ic_launcher', path.basename(android_icons[density].src));
-        resourceMap[targetPath] = android_icons[density].src;
-    }
-
-    // There's no "default" drawable, so assume default == mdpi.
-    if (default_icon && !android_icons.mdpi) {
-        var defaultTargetPath = getImageResourcePath(platformResourcesDir, 'mipmap', 'mdpi', 'ic_launcher', path.basename(default_icon.src));
-        resourceMap[defaultTargetPath] = default_icon.src;
-    }
-
-    return resourceMap;
-}
-
-function prepareIcons (icons) {
-    // http://developer.android.com/design/style/iconography.html
-    const SIZE_TO_DENSITY_MAP = {
-        36: 'ldpi',
-        48: 'mdpi',
-        72: 'hdpi',
-        96: 'xhdpi',
-        144: 'xxhdpi',
-        192: 'xxxhdpi'
-    };
-
-    const android_icons = {};
-    let default_icon;
-
-    // find the best matching icon for a given density or size
-    // @output android_icons
-    var parseIcon = function (icon, icon_size) {
-        // do I have a platform icon for that density already
-        var density = icon.density || SIZE_TO_DENSITY_MAP[icon_size];
-        if (!density) {
-            // invalid icon defition ( or unsupported size)
-            return;
-        }
-        var previous = android_icons[density];
-        if (previous && previous.platform) {
-            return;
-        }
-        android_icons[density] = icon;
-    };
-
-    // iterate over all icon elements to find the default icon and call parseIcon
-    for (var i = 0; i < icons.length; i++) {
-        var icon = icons[i];
-        var size = icon.width;
-
-        if (!size) {
-            size = icon.height;
-        }
-
-        if (!size && !icon.density) {
-            if (default_icon) {
-                const found = {};
-                const favor = {};
-
-                // populating found icon.
-                if (icon.background && icon.foreground) {
-                    found.background = icon.background;
-                    found.foreground = icon.foreground;
-                }
-                if (icon.src) {
-                    found.src = icon.src;
-                }
-
-                if (default_icon.background && default_icon.foreground) {
-                    favor.background = default_icon.background;
-                    favor.foreground = default_icon.foreground;
-                }
-                if (default_icon.src) {
-                    favor.src = default_icon.src;
-                }
-
-                events.emit('verbose', 'Found extra default icon: ' + JSON.stringify(found) + ' and ignoring in favor of ' + JSON.stringify(favor) + '.');
-            } else {
-                default_icon = icon;
-            }
-        } else {
-            parseIcon(icon, size);
-        }
-    }
-
-    return {
-        android_icons: android_icons,
-        default_icon: default_icon
-    };
-}
-
-function cleanIcons (projectRoot, projectConfig, platformResourcesDir) {
-    var icons = projectConfig.getIcons('android');
-
-    // Skip if there are no app defined icons in config.xml
-    if (icons.length === 0) {
-        events.emit('verbose', 'This app does not have launcher icons defined');
-        return;
-    }
-
-    const resourceMap = Object.assign(
-        {},
-        mapImageResources(projectRoot, platformResourcesDir, 'mipmap', 'ic_launcher.png'),
-        mapImageResources(projectRoot, platformResourcesDir, 'mipmap', 'ic_launcher_foreground.png'),
-        mapImageResources(projectRoot, platformResourcesDir, 'mipmap', 'ic_launcher_background.png'),
-        mapImageResources(projectRoot, platformResourcesDir, 'mipmap', 'ic_launcher_foreground.xml'),
-        mapImageResources(projectRoot, platformResourcesDir, 'mipmap', 'ic_launcher_background.xml'),
-        mapImageResources(projectRoot, platformResourcesDir, 'mipmap', 'ic_launcher.xml')
-    );
-
-    events.emit('verbose', 'Cleaning icons at ' + platformResourcesDir);
-
-    // No source paths are specified in the map, so updatePaths() will delete the target files.
-    FileUpdater.updatePaths(resourceMap, { rootDir: projectRoot, all: true }, logFileOp);
-}
-
-/**
- * Gets a map containing resources of a specified name from all drawable folders in a directory.
- */
-function mapImageResources (rootDir, subDir, type, resourceName) {
-    const pathMap = {};
-    const globOptions = { cwd: path.join(rootDir, subDir), onlyDirectories: true };
-    glob.sync(type + '-*', globOptions).forEach(drawableFolder => {
-        const imagePath = path.join(subDir, drawableFolder, resourceName);
-        pathMap[imagePath] = null;
-    });
-    return pathMap;
-}
-
-/** Returns resource map that deletes all given paths */
-function makeCleanResourceMap (resourcePaths) {
-    const pathMap = {};
-    resourcePaths.map(path.normalize)
-        .forEach(resourcePath => {
-            pathMap[resourcePath] = null;
-        });
-    return pathMap;
-}
-
-function updateFileResources (cordovaProject, platformDir) {
-    var files = cordovaProject.projectConfig.getFileResources('android');
-
-    // if there are resource-file elements in config.xml
-    if (files.length === 0) {
-        events.emit('verbose', 'This app does not have additional resource files defined');
-        return;
-    }
-
-    var resourceMap = {};
-    files.forEach(function (res) {
-        var targetPath = path.join(platformDir, res.target);
-        resourceMap[targetPath] = res.src;
-    });
-
-    events.emit('verbose', 'Updating resource files at ' + platformDir);
-    FileUpdater.updatePaths(
-        resourceMap, { rootDir: cordovaProject.root }, logFileOp);
-}
-
-function cleanFileResources (projectRoot, projectConfig, platformDir) {
-    var files = projectConfig.getFileResources('android', true);
-    if (files.length > 0) {
-        events.emit('verbose', 'Cleaning resource files at ' + platformDir);
-
-        var resourceMap = {};
-        files.forEach(function (res) {
-            var filePath = path.join(platformDir, res.target);
-            resourceMap[filePath] = null;
-        });
-
-        FileUpdater.updatePaths(
-            resourceMap, { rootDir: projectRoot, all: true }, logFileOp);
-    }
-}
-
-/**
- * Gets and validates 'AndroidLaunchMode' prepference from config.xml. Returns
- *   preference value and warns if it doesn't seems to be valid
- *
- * @param   {ConfigParser}  platformConfig  A configParser instance for
- *   platform.
- *
- * @return  {String}                  Preference's value from config.xml or
- *   default value, if there is no such preference. The default value is
- *   'singleTop'
- */
-function findAndroidLaunchModePreference (platformConfig) {
-    var launchMode = platformConfig.getPreference('AndroidLaunchMode');
-    if (!launchMode) {
-        // Return a default value
-        return 'singleTop';
-    }
-
-    var expectedValues = ['standard', 'singleTop', 'singleTask', 'singleInstance'];
-    var valid = expectedValues.indexOf(launchMode) >= 0;
-    if (!valid) {
-        // Note: warn, but leave the launch mode as developer wanted, in case the list of options changes in the future
-        events.emit('warn', 'Unrecognized value for AndroidLaunchMode preference: ' +
-            launchMode + '. Expected values are: ' + expectedValues.join(', '));
-    }
-
-    return launchMode;
-}

bin/templates/cordova/lib/run.js

@@ -1,99 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-var path = require('path');
-var emulator = require('./emulator');
-const target = require('./target');
-var PackageType = require('./PackageType');
-const { events } = require('cordova-common');
-
-/**
- * Builds a target spec from a runOptions object
- *
- * @param {{target?: string, device?: boolean, emulator?: boolean}} runOptions
- * @return {target.TargetSpec}
- */
-function buildTargetSpec (runOptions) {
-    const spec = {};
-    if (runOptions.target) {
-        spec.id = runOptions.target;
-    } else if (runOptions.device) {
-        spec.type = 'device';
-    } else if (runOptions.emulator) {
-        spec.type = 'emulator';
-    }
-    return spec;
-}
-
-function formatResolvedTarget ({ id, type }) {
-    return `${type} ${id}`;
-}
-
-/**
- * Runs the application on a device if available. If no device is found, it will
- *   use a started emulator. If no started emulators are found it will attempt
- *   to start an avd. If no avds are found it will error out.
- *
- * @param   {Object}  runOptions  various run/build options. See Api.js build/run
- *   methods for reference.
- *
- * @return  {Promise}
- */
-module.exports.run = function (runOptions) {
-    runOptions = runOptions || {};
-
-    var self = this;
-    const spec = buildTargetSpec(runOptions);
-
-    return target.resolve(spec).then(function (resolvedTarget) {
-        events.emit('log', `Deploying to ${formatResolvedTarget(resolvedTarget)}`);
-
-        return new Promise((resolve) => {
-            const buildOptions = require('./build').parseBuildOptions(runOptions, null, self.root);
-
-            // Android app bundles cannot be deployed directly to the device
-            if (buildOptions.packageType === PackageType.BUNDLE) {
-                const packageTypeErrorMessage = 'Package type "bundle" is not supported during cordova run.';
-                events.emit('error', packageTypeErrorMessage);
-                throw packageTypeErrorMessage;
-            }
-
-            resolve(self._builder.fetchBuildResults(buildOptions.buildType, buildOptions.arch));
-        }).then(async function (buildResults) {
-            if (resolvedTarget.type === 'emulator') {
-                await emulator.wait_for_boot(resolvedTarget.id);
-            }
-
-            return target.install(resolvedTarget, buildResults);
-        });
-    });
-};
-
-module.exports.help = function () {
-    console.log('Usage: ' + path.relative(process.cwd(), process.argv[1]) + ' [options]');
-    console.log('Build options :');
-    console.log('    --debug : Builds project in debug mode');
-    console.log('    --release : Builds project in release mode');
-    console.log('    --nobuild : Runs the currently built project without recompiling');
-    console.log('Deploy options :');
-    console.log('    --device : Will deploy the built project to a device');
-    console.log('    --emulator : Will deploy the built project to an emulator if one exists');
-    console.log('    --target=<target_id> : Installs to the target with the specified id.');
-    process.exit(0);
-};

bin/templates/cordova/lib/start-emulator

@@ -1,38 +0,0 @@
-#!/usr/bin/env node
-
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-var emulator = require('./emulator');
-var args = process.argv;
-
-var install_target;
-if (args.length > 2) {
-    if (args[2].substring(0, 9) === '--target=') {
-        install_target = args[2].substring(9, args[2].length);
-    } else {
-        console.error('ERROR : argument \'' + args[2] + '\' not recognized.');
-        process.exit(2);
-    }
-}
-
-emulator.start(install_target).catch(function (err) {
-    console.error('ERROR: ' + err);
-    process.exit(2);
-});

bin/templates/cordova/lib/start-emulator.bat

@@ -1,26 +0,0 @@
-:: Licensed to the Apache Software Foundation (ASF) under one
-:: or more contributor license agreements.  See the NOTICE file
-:: distributed with this work for additional information
-:: regarding copyright ownership.  The ASF licenses this file
-:: to you under the Apache License, Version 2.0 (the
-:: "License"); you may not use this file except in compliance
-:: with the License.  You may obtain a copy of the License at
-::
-:: http://www.apache.org/licenses/LICENSE-2.0
-::
-:: Unless required by applicable law or agreed to in writing,
-:: software distributed under the License is distributed on an
-:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-:: KIND, either express or implied.  See the License for the
-:: specific language governing permissions and limitations
-:: under the License.
-
-@ECHO OFF
-SET script_path="%~dp0start-emulator"
-IF EXIST %script_path% (
-        node %script_path% %*
-) ELSE (
-    ECHO.
-    ECHO ERROR: Could not find 'start-emulator' script in 'cordova\lib' folder, aborting...>&2
-    EXIT /B 1
-)

bin/templates/cordova/log

@@ -1,36 +0,0 @@
-#!/usr/bin/env node
-
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-var log = require('./lib/log');
-var reqs = require('./lib/check_reqs');
-var args = process.argv;
-
-// Usage support for when args are given
-if (args.length > 2) {
-    log.help();
-} else {
-    reqs.run().then(function () {
-        return log.run();
-    }, function (err) {
-        console.error('ERROR: ' + err);
-        process.exit(2);
-    });
-}

bin/templates/cordova/log.bat

@@ -1,26 +0,0 @@
-:: Licensed to the Apache Software Foundation (ASF) under one
-:: or more contributor license agreements.  See the NOTICE file
-:: distributed with this work for additional information
-:: regarding copyright ownership.  The ASF licenses this file
-:: to you under the Apache License, Version 2.0 (the
-:: "License"); you may not use this file except in compliance
-:: with the License.  You may obtain a copy of the License at
-::
-:: http://www.apache.org/licenses/LICENSE-2.0
-::
-:: Unless required by applicable law or agreed to in writing,
-:: software distributed under the License is distributed on an
-:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-:: KIND, either express or implied.  See the License for the
-:: specific language governing permissions and limitations
-:: under the License.
-
-@ECHO OFF
-SET script_path="%~dp0log"
-IF EXIST %script_path% (
-        node %script_path% %*
-) ELSE (
-    ECHO.
-    ECHO ERROR: Could not find 'log' script in 'cordova' folder, aborting...>&2
-    EXIT /B 1
-)

bin/templates/cordova/loggingHelper.js

@@ -1,18 +0,0 @@
-var CordovaLogger = require('cordova-common').CordovaLogger;
-
-module.exports = {
-    adjustLoggerLevel: function (opts) {
-        if (opts instanceof Array) {
-            opts.silent = opts.indexOf('--silent') !== -1;
-            opts.verbose = opts.indexOf('--verbose') !== -1;
-        }
-
-        if (opts.silent) {
-            CordovaLogger.get().setLevel('error');
-        }
-
-        if (opts.verbose) {
-            CordovaLogger.get().setLevel('verbose');
-        }
-    }
-};

bin/templates/cordova/run

@@ -1,54 +0,0 @@
-#!/usr/bin/env node
-
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-var Api = require('./Api');
-var nopt = require('nopt');
-var path = require('path');
-
-// Support basic help commands
-if (['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(process.argv[2]) >= 0) {
-    require('./lib/run').help();
-}
-
-// Do some basic argument parsing
-var runOpts = nopt({
-    verbose: Boolean,
-    silent: Boolean,
-    debug: Boolean,
-    release: Boolean,
-    nobuild: Boolean,
-    buildConfig: path,
-    archs: String,
-    device: Boolean,
-    emulator: Boolean,
-    target: String
-}, { d: '--verbose' });
-
-// Make runOptions compatible with PlatformApi run method spec
-runOpts.argv = runOpts.argv.remain;
-
-require('./loggingHelper').adjustLoggerLevel(runOpts);
-
-new Api().run(runOpts)
-    .catch(function (err) {
-        console.error(err, err.stack);
-        process.exit(2);
-    });

bin/templates/cordova/run.bat

@@ -1,26 +0,0 @@
-:: Licensed to the Apache Software Foundation (ASF) under one
-:: or more contributor license agreements.  See the NOTICE file
-:: distributed with this work for additional information
-:: regarding copyright ownership.  The ASF licenses this file
-:: to you under the Apache License, Version 2.0 (the
-:: "License"); you may not use this file except in compliance
-:: with the License.  You may obtain a copy of the License at
-::
-:: http://www.apache.org/licenses/LICENSE-2.0
-::
-:: Unless required by applicable law or agreed to in writing,
-:: software distributed under the License is distributed on an
-:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-:: KIND, either express or implied.  See the License for the
-:: specific language governing permissions and limitations
-:: under the License.
-
-@ECHO OFF
-SET script_path="%~dp0run"
-IF EXIST %script_path% (
-        node %script_path% %*
-) ELSE (
-    ECHO.
-    ECHO ERROR: Could not find 'run' script in 'cordova' folder, aborting...>&2
-    EXIT /B 1
-)

bin/templates/cordova/version.bat

@@ -1,26 +0,0 @@
-:: Licensed to the Apache Software Foundation (ASF) under one
-:: or more contributor license agreements.  See the NOTICE file
-:: distributed with this work for additional information
-:: regarding copyright ownership.  The ASF licenses this file
-:: to you under the Apache License, Version 2.0 (the
-:: "License"); you may not use this file except in compliance
-:: with the License.  You may obtain a copy of the License at
-::
-:: http://www.apache.org/licenses/LICENSE-2.0
-::
-:: Unless required by applicable law or agreed to in writing,
-:: software distributed under the License is distributed on an
-:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-:: KIND, either express or implied.  See the License for the
-:: specific language governing permissions and limitations
-:: under the License.
-
-@ECHO OFF
-SET script_path="%~dp0version"
-IF EXIST %script_path% (
-        node %script_path% %*
-) ELSE (
-    ECHO.
-    ECHO ERROR: Could not find 'version' script in 'cordova' folder, aborting...>&2
-    EXIT /B 1
-)

bin/templates/project/Activity.java

@@ -1,61 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
- */
-
-package __ID__;
-
-import android.os.Bundle;
-import org.apache.cordova.*;
-import android.view.KeyEvent;
-
-public class __ACTIVITY__ extends CordovaActivity
-{
-    private static final int[] SCAN_KEYCODE = {520, 521, 522, 523};
-
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-
-        // enable Cordova apps to be started in the background
-        Bundle extras = getIntent().getExtras();
-        if (extras != null && extras.getBoolean("cdvStartInBackground", false)) {
-            moveTaskToBack(true);
-        }
-
-        // Set by <content src="index.html" /> in config.xml
-        loadUrl(launchUrl);
-    }
-
-    @Override
-    public boolean onKeyUp(int keyCode, KeyEvent event) {
-        if (keyCode >= SCAN_KEYCODE[0] && keyCode <= SCAN_KEYCODE[SCAN_KEYCODE.length - 1]) {
-        }
-         loadUrl("javascript:cordova.fireWindowEvent('native.onKeyUp',{keycode:"+keyCode+"})");
-        return super.onKeyUp(keyCode, event);
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode >= SCAN_KEYCODE[0] && keyCode <= SCAN_KEYCODE[SCAN_KEYCODE.length - 1]) {
-        }
-         loadUrl("javascript:cordova.fireWindowEvent('native.onKeyDown',{keycode:"+keyCode+"})");
-        return super.onKeyDown(keyCode, event);
-    }
-    
-}

bin/templates/project/res/mipmap-xxhdpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
-</adaptive-icon>

bin/templates/project/res/mipmap-xxxhdpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
-</adaptive-icon>

bin/templates/project/res/values/strings.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- App label shown within list of installed apps, battery & network usage screens. -->
-    <string name="app_name">__NAME__</string>
-    <!-- App label shown on the launcher. -->
-    <string name="launcher_name">@string/app_name</string>
-    <!-- App label shown on the task switcher. -->
-    <string name="activity_name">@string/launcher_name</string>
-</resources>

bin/update

@@ -1,40 +0,0 @@
-#!/usr/bin/env node
-
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-var path = require('path');
-var Api = require('./templates/cordova/Api');
-var args = require('nopt')({
-    link: Boolean,
-    shared: Boolean,
-    help: Boolean
-}, { d: '--verbose' });
-
-if (args.help || args.argv.remain.length === 0) {
-    console.log('Usage: ' + path.relative(process.cwd(), path.join(__dirname, 'update')) + ' <path_to_project> [--link]');
-    console.log('    --link will use the CordovaLib project directly instead of making a copy.');
-    process.exit(1);
-}
-
-require('./templates/cordova/loggingHelper').adjustLoggerLevel(args);
-
-Api.updatePlatform(args.argv.remain[0], { link: (args.link || args.shared) }).catch(err => {
-    console.error(err);
-    process.exitCode = 1;
-});

bin/update.bat

@@ -1,26 +0,0 @@
-:: Licensed to the Apache Software Foundation (ASF) under one
-:: or more contributor license agreements.  See the NOTICE file
-:: distributed with this work for additional information
-:: regarding copyright ownership.  The ASF licenses this file
-:: to you under the Apache License, Version 2.0 (the
-:: "License"); you may not use this file except in compliance
-:: with the License.  You may obtain a copy of the License at
-::
-:: http://www.apache.org/licenses/LICENSE-2.0
-::
-:: Unless required by applicable law or agreed to in writing,
-:: software distributed under the License is distributed on an
-:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-:: KIND, either express or implied.  See the License for the
-:: specific language governing permissions and limitations
-:: under the License.
-
-@ECHO OFF
-SET script_path="%~dp0update"
-IF EXIST %script_path% (
-    node %script_path% %*
-) ELSE (
-    ECHO.
-    ECHO ERROR: Could not find 'update' script in 'bin' folder, aborting...>&2
-    EXIT /B 1
-)

cordova-js-src/platform.js

@@ -36,6 +36,9 @@ module.exports = {
         // TODO: Extract this as a proper plugin.
         modulemapper.clobbers('cordova/plugin/android/app', 'navigator.app');
 
+        // Core Splash Screen
+        modulemapper.clobbers('cordova/plugin/android/splashscreen', 'navigator.splashscreen');
+
         var APP_PLUGIN_NAME = Number(cordova.platformVersion.split('.')[0]) >= 4 ? 'CoreAndroid' : 'App';
 
         // Inject a listener for the backbutton on the document.

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

@@ -0,0 +1,33 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+
+var exec = require('cordova/exec');
+
+var splashscreen = {
+    show: function () {
+        console.log('"navigator.splashscreen.show()" is unsupported on Android.');
+    },
+    hide: function () {
+        exec(null, null, 'CordovaSplashScreenPlugin', 'hide', []);
+    }
+};
+
+module.exports = splashscreen;

framework/.classpath

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
-	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
-	<classpathentry kind="output" path="bin/default"/>
-</classpath>

framework/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.source=1.6

framework/AndroidManifest.xml

@@ -18,5 +18,6 @@
        under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.apache.cordova" android:versionName="1.0" android:versionCode="1">
+  android:versionName="1.0"
+  android:versionCode="1">
 </manifest>

framework/ant.properties

@@ -1,34 +0,0 @@
-#       Licensed to the Apache Software Foundation (ASF) under one
-#       or more contributor license agreements.  See the NOTICE file
-#       distributed with this work for additional information
-#       regarding copyright ownership.  The ASF licenses this file
-#       to you under the Apache License, Version 2.0 (the
-#       "License"); you may not use this file except in compliance
-#       with the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#       Unless required by applicable law or agreed to in writing,
-#       software distributed under the License is distributed on an
-#       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#       KIND, either express or implied.  See the License for the
-#       specific language governing permissions and limitations
-#       under the License.
-#
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked in Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-

framework/build.gradle

@@ -1,150 +1,102 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.
-*/
-
-ext {
-    apply from: 'cordova.gradle'
-    cdvCompileSdkVersion = privateHelpers.getProjectTarget()
-    cdvBuildToolsVersion = privateHelpers.findLatestInstalledBuildTools()
-    if (project.hasProperty('cdvMinSdkVersion') && cdvMinSdkVersion.isInteger()) {
-        cdvMinSdkVersion = cdvMinSdkVersion as int
-        println '[Cordova] cdvMinSdkVersion is overridden, try it at your own risk.'
-    } else {
-        cdvMinSdkVersion = 22; // current Cordova's default
-    }
-}
-
-buildscript {
-    apply from: 'repositories.gradle'
-    repositories repos
-
-    dependencies {
-        // The gradle plugin and the maven plugin have to be updated after each version of Android
-        // studio comes out
-        classpath 'com.android.tools.build:gradle:4.0.0'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-    }
-}
-
-allprojects {
-    apply from: 'repositories.gradle'
-    repositories repos
-}
-
-apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'com.jfrog.bintray'
-
-group = 'org.apache.cordova'
-version = '9.1.1'
-
-android {
-    compileSdkVersion cdvCompileSdkVersion
-    buildToolsVersion cdvBuildToolsVersion
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    // For the Android Cordova Lib, we allow changing the minSdkVersion, but it is at the users own risk
-    defaultConfig {
-        minSdkVersion cdvMinSdkVersion
-    }
-
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            resources.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
-        }
-    }
-
-    packagingOptions {
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/DEPENDENCIES'
-        exclude 'META-INF/NOTICE'
-    }
-}
-
-install {
-    repositories.mavenInstaller {
-        pom {
-            project {
-                packaging 'aar'
-                name 'Cordova'
-                url 'https://cordova.apache.org'
-                licenses {
-                    license {
-                        name 'The Apache Software License, Version 2.0'
-                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                    }
-                }
-                developers {
-                    developer {
-                        id 'stevengill'
-                        name 'Steve Gill'
-                    }
-                }
-                scm {
-                    connection 'scm:git:https://github.com/apache/cordova-android.git'
-                    developerConnection 'scm:git:git@github.com:apache/cordova-android.git'
-                    url 'https://github.com/apache/cordova-android'
-
-                }
-            }
-        }
-    }
-}
-
-task sourcesJar(type: Jar) {
-    from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
-}
-
-artifacts {
-    archives sourcesJar
-}
-
-bintray {
-    user = System.getenv('BINTRAY_USER')
-    key = System.getenv('BINTRAY_KEY')
-    configurations = ['archives']
-    pkg {
-        repo = 'maven'
-        name = 'cordova-android'
-        userOrg = 'cordova'
-        licenses = ['Apache-2.0']
-        vcsUrl = 'https://github.com/apache/cordova-android'
-        websiteUrl = 'https://cordova.apache.org'
-        issueTrackerUrl = 'https://github.com/apache/cordova-android/issues'
-        publicDownloadNumbers = true
-        licenses = ['Apache-2.0']
-        labels = ['android', 'cordova', 'phonegap']
-        version {
-            name = '9.1.0'
-            released = new Date()
-            vcsTag = '9.1.0'
-        }
-    }
-}
+/* Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+*/
+
+buildscript {
+    apply from: 'cordova.gradle'
+    apply from: 'repositories.gradle'
+
+    repositories repos
+
+    dependencies {
+        // Android Gradle Plugin (AGP) Build Tools
+        classpath "com.android.tools.build:gradle:${cordovaConfig.AGP_VERSION}"
+    }
+
+    cdvHelpers.verifyCordovaConfigForBuild()
+}
+
+allprojects {
+    def hasRepositoriesGradle = file('repositories.gradle').exists()
+    if (hasRepositoriesGradle) {
+        apply from: 'repositories.gradle'
+    } else {
+        apply from: "${project.rootDir}/repositories.gradle"
+    }
+
+    repositories repos
+}
+
+apply plugin: 'com.android.library'
+
+android {
+    namespace 'org.apache.cordova'
+
+    compileSdkVersion cordovaConfig.COMPILE_SDK_VERSION
+    buildToolsVersion cordovaConfig.BUILD_TOOLS_VERSION
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    // For the Android Cordova Lib, we allow changing the minSdkVersion, but it is at the users own risk
+    defaultConfig {
+        minSdkVersion cordovaConfig.MIN_SDK_VERSION
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            resources.srcDirs = ['src']
+            aidl.srcDirs = ['src']
+            renderscript.srcDirs = ['src']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+        }
+    }
+
+    packagingOptions {
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/DEPENDENCIES'
+        exclude 'META-INF/NOTICE'
+    }
+
+    publishing {
+        singleVariant('release') {
+            withSourcesJar()
+        }
+    }
+}
+
+dependencies {
+    api "androidx.appcompat:appcompat:${cordovaConfig.ANDROIDX_APP_COMPAT_VERSION}"
+    implementation "androidx.webkit:webkit:${cordovaConfig.ANDROIDX_WEBKIT_VERSION}"
+    implementation "androidx.core:core-splashscreen:${cordovaConfig.ANDROIDX_CORE_SPLASHSCREEN_VERSION}"
+}
+
+/**
+ * In a project created though CLI, the `cordova-publish.gradle` file is not copied to the `framework` dir.
+ * App development (CLI) projects can not and should not publish our framework.
+ * In this case, there is no need for the gradle build process to know about the publish process.
+ */
+def cordovaPublishGradle = './cordova-publish.gradle'
+if(file(cordovaPublishGradle).exists()) {
+    apply from: cordovaPublishGradle
+}

framework/build.xml

@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
--->
-<project name="Cordova" default="jar">
-
-    <!-- LOAD VERSION -->
-    <loadfile property="version" srcFile="../VERSION">
-        <filterchain>
-            <striplinebreaks/>
-        </filterchain>
-    </loadfile>
-
-    <!-- check that the version of ant is at least 1.8.0 -->
-    <antversion property="thisantversion" atleast="1.8.0" />
-    <fail message="The required minimum version of ant is 1.8.0, you have ${ant.version}"
-          unless="thisantversion" />
-
-    <!-- The local.properties file is created and updated by the 'android'
-         tool. (For example "sdkdir/tools/android update project -p ." inside
-         of this directory where the AndroidManifest.xml file exists. This
-         properties file that gets built contains the path to the SDK. It
-         should *NOT* be checked into Version Control Systems since it holds
-         data about the local machine. -->
-    <available file="local.properties" property="exists.local.properties" />
-    <fail message="You need to create the file 'local.properties' by running 'android update project -p .' here."
-          unless="exists.local.properties" />
-    <loadproperties srcFile="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
-            unless="sdk.dir"
-    />
-
-    <!-- version-tag: custom -->
-<!-- extension targets. Uncomment the ones where you want to do custom work
-     in between standard targets -->
-<!--
-    <target name="-pre-build">
-    </target>
-    <target name="-pre-compile">
-    </target>
-
-    /* This is typically used for code obfuscation.
-       Compiled code location: ${out.classes.absolute.dir}
-       If this is not done in place, override ${out.dex.input.absolute.dir} */
-    <target name="-post-compile">
-    </target>
--->
-    <target name="-pre-clean">
-        <!-- delete generated javadoc -->
-        <delete dir="javadoc-public" failonerror="false" />
-        <delete dir="javadoc-private" failonerror="false" />
-        <!-- delete generated jar -->
-        <delete file="cordova-${version}.jar" failonerror="false" />
-    </target>
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-    <!-- Build Cordova jar file that includes all native code, and Cordova JS file
-         that includes all JavaScript code.
-    -->
-    <target name="jar" depends="-compile">
-        <jar
-            basedir="bin/classes"
-            excludes="org/apache/cordova/R.class,org/apache/cordova/R$*.class"
-            jarfile="cordova-${version}.jar" />
-    </target>
-
-    <target name="javadoc">
-        <delete dir="javadoc-public" failonerror="false" />
-        <javadoc
-            access="public"
-            destdir="javadoc-public"
-            classpath="${sdk.dir}/platforms/${target}/android.jar">
-            <packageset dir="src">
-                <include name="org/apache/cordova/**" />
-            </packageset>
-        </javadoc>
-        <delete dir="javadoc-private" failonerror="false" />
-        <javadoc
-            access="private"
-            destdir="javadoc-private"
-            classpath="${sdk.dir}/platforms/${target}/android.jar">
-            <packageset dir="src">
-                <include name="org/apache/cordova/**" />
-            </packageset>
-        </javadoc>
-    </target>
-
-    <!-- tests for Java files -->
-    <property name="test.dir" location="test/org/apache/cordova" />
-
-    <path id="test.classpath">
-        <!-- requires both junit and cordova -->
-        <pathelement location="libs/junit-4.10.jar" />
-        <pathelement location="cordova-${version}.jar" />
-        <pathelement location="${test.dir}" />
-    </path>
-
-    <target name="compile-test">
-        <javac srcdir="${test.dir}" >
-            <classpath refid="test.classpath" />
-        </javac>
-    </target>
-
-    <target name="test" depends="jar, compile-test">
-        <junit showoutput="true">
-            <classpath refid="test.classpath" />
-            <formatter type="brief" usefile="false" />
-            <batchtest fork="yes">
-                <fileset dir="${test.dir}">
-                    <include name="*Test.java" />
-                    <include name="**/*Test.java" />
-                </fileset>
-            </batchtest>
-        </junit>
-    </target>
-
-    <target name="cordova_debug" depends="debug">
-    </target>
-
-    <target name="cordova_release" depends="release">
-    </target>
-
-</project>

framework/cdv-gradle-config-defaults.json

@@ -0,0 +1,16 @@
+{
+    "MIN_SDK_VERSION": 24,
+    "SDK_VERSION": 33,
+    "COMPILE_SDK_VERSION": null,
+    "GRADLE_VERSION": "7.6",
+    "MIN_BUILD_TOOLS_VERSION": "33.0.2",
+    "AGP_VERSION": "7.4.2",
+    "KOTLIN_VERSION": "1.7.21",
+    "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",
+    "IS_GRADLE_PLUGIN_GOOGLE_SERVICES_ENABLED": false,
+    "IS_GRADLE_PLUGIN_KOTLIN_ENABLED": false,
+    "PACKAGE_NAMESPACE": "io.cordova.helloCordova"
+}

framework/cordova-publish.gradle

@@ -0,0 +1,121 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+
+String getCordovaAndroidVersion() {
+   // Fetch Data from Cordova-Android package.json (Used only by framework build/publishing)
+    def cordovaAndroidRepoPackageJson = "$projectDir/../package.json"
+    if(file(cordovaAndroidRepoPackageJson).exists()) {
+        def packageJsonFile = new File(cordovaAndroidRepoPackageJson)
+        def packageJson = new groovy.json.JsonSlurper().parseText(packageJsonFile.text)
+        return packageJson.version
+    }
+}
+
+// Enable signing by default when keyId and secretKeyRingFile is defined.
+ext.cdvEnableSigning = project.hasProperty('signing.keyId') && project.hasProperty('signing.secretKeyRingFile')
+if (cdvEnableSigning) {
+    logger.debug('[Cordova] Signing has been enabled by default because the signing keyId & secretKeyRingFile has been defined.')
+}
+
+if (project.hasProperty('signEnabled')) {
+    if(!cdvEnableSigning && Boolean.valueOf(signEnabled)) {
+        logger.debug("[Cordova] The \"signEnabled\" override can not be set to \"true\" when the signing properties are missing.")
+    } else {
+        // Override the default setting with the "signEnabled" property. (In this case it should only accept false)
+        logger.debug("[Cordova] The \"signEnabled\" property has been detected and forcing enabled signing to \"$signEnabled\".")
+        cdvEnableSigning = signEnabled
+    }
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            mavenJava(MavenPublication) {
+                groupId = 'org.apache.cordova'
+                artifactId = 'framework'
+                version = getCordovaAndroidVersion()
+
+                from components.release
+
+                pom {
+                    name = 'Cordova'
+                    description = 'A library to build Cordova-based projects for the Android platform.'
+                    url = 'https://cordova.apache.org'
+
+                    licenses {
+                        license {
+                            name = 'Apache License, Version 2.0'
+                            url = 'https://www.apache.org/licenses/LICENSE-2.0.txt'
+                        }
+                    }
+
+                    developers {
+                        developer {
+                            id = 'stevengill'
+                            name = 'Steve Gill'
+                        }
+                        developer {
+                            id = 'erisu'
+                            name = 'Bryan Ellis'
+                            email = 'erisu@apache.org'
+                        }
+                    }
+
+                    scm {
+                        connection = 'scm:git:https://github.com/apache/cordova-android.git'
+                        developerConnection = 'scm:git:git@github.com:apache/cordova-android.git'
+                        url = 'https://github.com/apache/cordova-android'
+                    }
+                }
+            }
+        }
+
+        repositories {
+            maven {
+                def releasesRepoUrl = 'https://repository.apache.org/content/repositories/releases'
+                def snapshotsRepoUrl = 'https://repository.apache.org/content/repositories/snapshots'
+
+                url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+
+                credentials {
+                    if (project.hasProperty('apacheUsername') && project.hasProperty('apachePassword')) {
+                        username apacheUsername
+                        password apachePassword
+                    }
+                }
+            }
+        }
+
+        signing {
+            if (Boolean.valueOf(cdvEnableSigning)) {
+                sign publishing.publications.mavenJava
+            }
+        }
+    }
+}
+
+tasks.whenTaskAdded {task ->
+    if(task.name.contains('sign')) {
+        logger.debug("[Cordova] The task \"${task.name}\" is enabled? ${cdvEnableSigning}")
+        task.enabled = cdvEnableSigning
+    }
+}

framework/cordova.gradle

@@ -18,8 +18,7 @@
 */
 
 import java.util.regex.Pattern
-import groovy.swing.SwingBuilder
-import com.g00fy2.versioncompare.Version
+import io.github.g00fy2.versioncompare.Version
 
 String doEnsureValueExists(filePath, props, key) {
     if (props.get(key) == null) {
@@ -54,24 +53,27 @@ String doFindLatestInstalledBuildTools(String minBuildToolsVersionString) {
         throw e
     }
 
+    def minBuildToolsVersion = new Version(minBuildToolsVersionString)
+    def maxVersion = new Version((minBuildToolsVersion.getMajor() + 1) + ".0.0")
+
     def highestBuildToolsVersion = buildToolsDirContents
         .collect { new Version(it) }
         // Invalid inputs will be handled as 0.0.0
-        .findAll { it.isHigherThan('0.0.0') }
+        .findAll { it.isHigherThan('0.0.0') && it.isLowerThan(maxVersion) }
         .max()
 
     if (highestBuildToolsVersion == null) {
         throw new RuntimeException("""
-            No installed build tools found. Install the Android build tools
-            version ${minBuildToolsVersionString} or higher.
+            No installed build tools found. Please install the Android build tools
+            version ${minBuildToolsVersionString}.
         """.replaceAll(/\s+/, ' ').trim())
     }
 
     if (highestBuildToolsVersion.isLowerThan(minBuildToolsVersionString)) {
         throw new RuntimeException("""
-            No usable Android build tools found. Highest installed version is
-            ${highestBuildToolsVersion.getOriginalString()}; minimum version
-            required is ${minBuildToolsVersionString}.
+            No usable Android build tools found. Highest ${minBuildToolsVersion.getMajor()}.x installed version is
+            ${highestBuildToolsVersion.getOriginalString()}; Recommended version
+            is ${minBuildToolsVersionString}.
         """.replaceAll(/\s+/, ' ').trim())
     }
 
@@ -81,9 +83,9 @@ String doFindLatestInstalledBuildTools(String minBuildToolsVersionString) {
 String getAndroidSdkDir() {
     def rootDir = project.rootDir
     def androidSdkDir = null
-    String envVar = System.getenv("ANDROID_SDK_ROOT")
+    String envVar = System.getenv("ANDROID_HOME")
     if (envVar == null) {
-        envVar = System.getenv("ANDROID_HOME")
+        envVar = System.getenv("ANDROID_SDK_ROOT")
     }
 
     def localProperties = new File(rootDir, 'local.properties')
@@ -123,38 +125,6 @@ def doExtractIntFromManifest(name) {
     return new BigInteger(matcher.group(1))
 }
 
-def doExtractStringFromManifest(name) {
-    def manifestFile = file(android.sourceSets.main.manifest.srcFile)
-    def pattern = Pattern.compile(name + "=\"(\\S+)\"")
-    def matcher = pattern.matcher(manifestFile.getText())
-    matcher.find()
-    return matcher.group(1)
-}
-
-def doPromptForPassword(msg) {
-    if (System.console() == null) {
-        def ret = null
-        new SwingBuilder().edt {
-            dialog(modal: true, title: 'Enter password', alwaysOnTop: true, resizable: false, locationRelativeTo: null, pack: true, show: true) {
-                vbox {
-                    label(text: msg)
-                    def input = passwordField()
-                    button(defaultButton: true, text: 'OK', actionPerformed: {
-                        ret = input.password;
-                        dispose();
-                    })
-                }
-            }
-        }
-        if (!ret) {
-            throw new GradleException('User canceled build')
-        }
-        return new String(ret)
-    } else {
-        return System.console().readPassword('\n' + msg);
-    }
-}
-
 def doGetConfigXml() {
     def xml = file("src/main/res/xml/config.xml").getText()
     // Disable namespace awareness since Cordova doesn't use them properly
@@ -175,15 +145,84 @@ def doGetConfigPreference(name, defaultValue) {
     return ret
 }
 
+def doApplyCordovaConfigCustomization() {
+    // Apply user overide properties that comes from the "--gradleArg=-P" parameters
+    if (project.hasProperty('cdvMinSdkVersion')) {
+        cordovaConfig.MIN_SDK_VERSION = Integer.parseInt('' + cdvMinSdkVersion)
+    }
+    if (project.hasProperty('cdvSdkVersion')) {
+        cordovaConfig.SDK_VERSION = Integer.parseInt('' + cdvSdkVersion)
+    }
+    if (project.hasProperty('cdvCompileSdkVersion')) {
+        cordovaConfig.COMPILE_SDK_VERSION = Integer.parseInt('' + cdvCompileSdkVersion)
+    }
+    if (project.hasProperty('cdvMaxSdkVersion')) {
+        cordovaConfig.MAX_SDK_VERSION = Integer.parseInt('' + cdvMaxSdkVersion)
+    }
+    if (project.hasProperty('cdvBuildToolsVersion')) {
+        cordovaConfig.BUILD_TOOLS_VERSION = cdvBuildToolsVersion
+    }
+    if (project.hasProperty('cdvAndroidXAppCompatVersion')) {
+        cordovaConfig.ANDROIDX_APP_COMPAT_VERSION = cdvAndroidXAppCompatVersion
+    }
+    if (project.hasProperty('cdvAndroidXWebKitVersion')) {
+        cordovaConfig.ANDROIDX_WEBKIT_VERSION = cdvAndroidXWebKitVersion
+    }
+
+    if (!cordovaConfig.BUILD_TOOLS_VERSION) {
+        cordovaConfig.BUILD_TOOLS_VERSION = doFindLatestInstalledBuildTools(
+            cordovaConfig.MIN_BUILD_TOOLS_VERSION
+        )
+    }
+
+    // Ensure the configured build tools version is at least our declared minimum
+    def buildToolsVersion = new Version(cordovaConfig.BUILD_TOOLS_VERSION)
+    if (buildToolsVersion.isLowerThan(cordovaConfig.MIN_BUILD_TOOLS_VERSION)) {
+        throw new RuntimeException("""
+            Expected Android Build Tools version >= ${cordovaConfig.MIN_BUILD_TOOLS_VERSION},
+            but got Android Build Tools version ${cordovaConfig.BUILD_TOOLS_VERSION}. Please use version ${cordovaConfig.MIN_BUILD_TOOLS_VERSION} or later.
+        """.replaceAll(/\s+/, ' ').trim())
+    }
+}
+
+def doVerifyCordovaConfigForBuild() {
+    if (cordovaConfig.COMPILE_SDK_VERSION < cordovaConfig.SDK_VERSION) {
+        println "The \"compileSdkVersion\" (${cordovaConfig.COMPILE_SDK_VERSION}) should be greater than or equal to the the \"targetSdkVersion\" (${cordovaConfig.SDK_VERSION})."
+    }
+}
+
 // Properties exported here are visible to all plugins.
 ext {
+    def defaultsFilePath = './cdv-gradle-config-defaults.json'
+    def projectConfigFilePath = "$rootDir/cdv-gradle-config.json"
+    def targetConfigFilePath = null
+
+    /**
+     * Check if the project config file path exists. This file will exist if coming from CLI project.
+     * If this file does not exist, falls back onto the default file.
+     * This scenario can occur if building the framework's AAR package for publishing.
+     */
+    if(file(projectConfigFilePath).exists()) {
+        targetConfigFilePath = projectConfigFilePath
+    } else {
+        targetConfigFilePath = defaultsFilePath
+    }
+
+    def jsonFile = new File(targetConfigFilePath)
+    cordovaConfig = new groovy.json.JsonSlurper().parseText(jsonFile.text)
+
+    if (cordovaConfig.COMPILE_SDK_VERSION == null) {
+        cordovaConfig.COMPILE_SDK_VERSION = cordovaConfig.SDK_VERSION
+    }
+
+    // Apply Gradle Properties
+    doApplyCordovaConfigCustomization()
+
     // These helpers are shared, but are not guaranteed to be stable / unchanged.
     privateHelpers = {}
     privateHelpers.getProjectTarget = { doGetProjectTarget() }
-    privateHelpers.findLatestInstalledBuildTools = { doFindLatestInstalledBuildTools('19.1.0') }
+    privateHelpers.applyCordovaConfigCustomization = { doApplyCordovaConfigCustomization() }
     privateHelpers.extractIntFromManifest = { name -> doExtractIntFromManifest(name) }
-    privateHelpers.extractStringFromManifest = { name -> doExtractStringFromManifest(name) }
-    privateHelpers.promptForPassword = { msg -> doPromptForPassword(msg) }
     privateHelpers.ensureValueExists = { filePath, props, key -> doEnsureValueExists(filePath, props, key) }
 
     // These helpers can be used by plugins / projects and will not change.
@@ -192,14 +231,17 @@ ext {
     cdvHelpers.getConfigXml = { doGetConfigXml() }
     // Returns the value for the desired <preference>. Added in 4.1.0.
     cdvHelpers.getConfigPreference = { name, defaultValue -> doGetConfigPreference(name, defaultValue) }
+    // Display warnings if any cordova config is not proper for build.
+    cdvHelpers.verifyCordovaConfigForBuild = { doVerifyCordovaConfigForBuild() }
 }
 
 buildscript {
     repositories {
-        jcenter()
+        google()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.g00fy2:versioncompare:1.3.4@jar'
+        classpath 'io.github.g00fy2:versioncompare:1.4.1@jar'
     }
 }

framework/default.properties

@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Indicates whether an apk should be generated for each density.
-split.density=false
-# Project target.
-target=android-14
-apk-configurations=

framework/gradle.properties

@@ -10,6 +10,8 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
+android.useAndroidX=true
+android.enableJetifier=true
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

framework/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,3 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

framework/project.properties

@@ -1,3 +1,5 @@
+# GENERATED FILE! DO NOT EDIT!
+
 # This file was originally created by the Android Tools, but is now
 # used by cordova-android to manage the project configuration.
 
@@ -5,7 +7,6 @@
 split.density=false
 
 # Project target.
-target=android-29
 apk-configurations=
 renderscript.opt.level=O0
 android.library=true

framework/repositories.gradle

@@ -18,5 +18,5 @@
 
 ext.repos = {
     google()
-    jcenter()
+    mavenCentral()
 }

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

@@ -28,7 +28,7 @@ import org.apache.cordova.LOG;
 
 import android.net.Uri;
 
-public class Whitelist {
+public class AllowList {
     private static class URLPattern {
         public Pattern scheme;
         public Pattern host;
@@ -92,12 +92,12 @@ public class Whitelist {
         }
     }
 
-    private ArrayList<URLPattern> whiteList;
+    private ArrayList<URLPattern> allowList;
 
-    public static final String TAG = "Whitelist";
+    public static final String TAG = "CordovaAllowList";
 
-    public Whitelist() {
-        this.whiteList = new ArrayList<URLPattern>();
+    public AllowList() {
+        this.allowList = new ArrayList<URLPattern>();
     }
 
     /* Match patterns (from http://developer.chrome.com/extensions/match_patterns.html)
@@ -111,13 +111,13 @@ public class Whitelist {
      * the scheme to be omitted for backwards compatibility. (Also host is not required
      * to begin with a "*" or "*.".)
      */
-    public void addWhiteListEntry(String origin, boolean subdomains) {
-        if (whiteList != null) {
+    public void addAllowListEntry(String origin, boolean subdomains) {
+        if (allowList != null) {
             try {
                 // Unlimited access to network resources
                 if (origin.compareTo("*") == 0) {
                     LOG.d(TAG, "Unlimited access to network resources");
-                    whiteList = null;
+                    allowList = null;
                 }
                 else { // specific access
                     Pattern parts = Pattern.compile("^((\\*|[A-Za-z-]+):(//)?)?(\\*|((\\*\\.)?[^*/:]+))?(:(\\d+))?(/.*)?");
@@ -131,10 +131,10 @@ public class Whitelist {
                         String path = m.group(9);
                         if (scheme == null) {
                             // XXX making it stupid friendly for people who forget to include protocol/SSL
-                            whiteList.add(new URLPattern("http", host, port, path));
-                            whiteList.add(new URLPattern("https", host, port, path));
+                            allowList.add(new URLPattern("http", host, port, path));
+                            allowList.add(new URLPattern("https", host, port, path));
                         } else {
-                            whiteList.add(new URLPattern(scheme, host, port, path));
+                            allowList.add(new URLPattern(scheme, host, port, path));
                         }
                     }
                 }
@@ -149,15 +149,15 @@ public class Whitelist {
      * Determine if URL is in approved list of URLs to load.
      *
      * @param uri
-     * @return true if wide open or whitelisted
+     * @return true if wide open or allow listed
      */
-    public boolean isUrlWhiteListed(String uri) {
-        // If there is no whitelist, then it's wide open
-        if (whiteList == null) return true;
+    public boolean isUrlAllowListed(String uri) {
+        // If there is no allowList, then it's wide open
+        if (allowList == null) return true;
 
         Uri parsedUri = Uri.parse(uri);
-        // Look for match in white list
-        Iterator<URLPattern> pit = whiteList.iterator();
+        // Look for match in allow list
+        Iterator<URLPattern> pit = allowList.iterator();
         while (pit.hasNext()) {
             URLPattern p = pit.next();
             if (p.matches(parsedUri)) {

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

@@ -0,0 +1,160 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+
+package org.apache.cordova;
+
+import org.apache.cordova.CordovaPlugin;
+import org.apache.cordova.ConfigXmlParser;
+import org.apache.cordova.LOG;
+import org.apache.cordova.AllowList;
+import org.apache.cordova.CordovaPreferences;
+import org.xmlpull.v1.XmlPullParser;
+
+import android.content.Context;
+
+public class AllowListPlugin extends CordovaPlugin {
+    public static final String PLUGIN_NAME = "CordovaAllowListPlugin";
+    protected static final String LOG_TAG = "CordovaAllowListPlugin";
+
+    private AllowList allowedNavigations;
+    private AllowList allowedIntents;
+    private AllowList allowedRequests;
+
+    // Used when instantiated via reflection by PluginManager
+    public AllowListPlugin() { }
+
+    // These can be used by embedders to allow Java-configuration of an allow list.
+    public AllowListPlugin(Context context) {
+        this(new AllowList(), new AllowList(), null);
+        new CustomConfigXmlParser().parse(context);
+    }
+
+    public AllowListPlugin(XmlPullParser xmlParser) {
+        this(new AllowList(), new AllowList(), null);
+        new CustomConfigXmlParser().parse(xmlParser);
+    }
+
+    public AllowListPlugin(AllowList allowedNavigations, AllowList allowedIntents, AllowList allowedRequests) {
+        if (allowedRequests == null) {
+            allowedRequests = new AllowList();
+            allowedRequests.addAllowListEntry("file:///*", false);
+            allowedRequests.addAllowListEntry("data:*", false);
+        }
+
+        this.allowedNavigations = allowedNavigations;
+        this.allowedIntents = allowedIntents;
+        this.allowedRequests = allowedRequests;
+    }
+
+    @Override
+    public void pluginInitialize() {
+        if (this.allowedNavigations == null) {
+            this.allowedNavigations = new AllowList();
+            this.allowedIntents = new AllowList();
+            this.allowedRequests = new AllowList();
+
+            new CustomConfigXmlParser().parse(webView.getContext());
+        }
+    }
+
+    private class CustomConfigXmlParser extends ConfigXmlParser {
+        private CordovaPreferences prefs = new CordovaPreferences();
+
+        @Override
+        public void handleStartTag(XmlPullParser xml) {
+            String strNode = xml.getName();
+            if (strNode.equals("content")) {
+                String startPage = xml.getAttributeValue(null, "src");
+                allowedNavigations.addAllowListEntry(startPage, false);
+            } else if (strNode.equals("allow-navigation")) {
+                String origin = xml.getAttributeValue(null, "href");
+                if ("*".equals(origin)) {
+                    allowedNavigations.addAllowListEntry("http://*/*", false);
+                    allowedNavigations.addAllowListEntry("https://*/*", false);
+                    allowedNavigations.addAllowListEntry("data:*", false);
+                } else {
+                    allowedNavigations.addAllowListEntry(origin, false);
+                }
+            } else if (strNode.equals("allow-intent")) {
+                String origin = xml.getAttributeValue(null, "href");
+                allowedIntents.addAllowListEntry(origin, false);
+            } else if (strNode.equals("access")) {
+                String origin = xml.getAttributeValue(null, "origin");
+
+                if (origin != null) {
+                    if ("*".equals(origin)) {
+                        allowedRequests.addAllowListEntry("http://*/*", false);
+                        allowedRequests.addAllowListEntry("https://*/*", false);
+                    } else {
+                        String subdomains = xml.getAttributeValue(null, "subdomains");
+                        allowedRequests.addAllowListEntry(origin, (subdomains != null) && (subdomains.compareToIgnoreCase("true") == 0));
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void handleEndTag(XmlPullParser xml) { }
+    }
+
+    @Override
+    public Boolean shouldAllowNavigation(String url) {
+        return this.allowedNavigations.isUrlAllowListed(url)
+            ? true
+            : null; // default policy
+    }
+
+    @Override
+    public Boolean shouldAllowRequest(String url) {
+        return (Boolean.TRUE.equals(this.shouldAllowNavigation(url)) || this.allowedRequests.isUrlAllowListed(url))
+            ? true
+            : null; // default policy
+    }
+
+    @Override
+    public Boolean shouldOpenExternalUrl(String url) {
+        return (this.allowedIntents.isUrlAllowListed(url))
+            ? true
+            : null; // default policy
+    }
+
+    public AllowList getAllowedNavigations() {
+        return this.allowedNavigations;
+    }
+
+    public void setAllowedNavigations(AllowList allowedNavigations) {
+        this.allowedNavigations = allowedNavigations;
+    }
+
+    public AllowList getAllowedIntents() {
+        return this.allowedIntents;
+    }
+
+    public void setAllowedIntents(AllowList allowedIntents) {
+        this.allowedIntents = allowedIntents;
+    }
+
+    public AllowList getAllowedRequests() {
+        return this.allowedRequests;
+    }
+
+    public void setAllowedRequests(AllowList allowedRequests) {
+        this.allowedRequests = allowedRequests;
+    }
+}

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

@@ -51,7 +51,8 @@ public class BuildHelper {
     {
         try
         {
-            Class<?> clazz = Class.forName(ctx.getClass().getPackage().getName() + ".BuildConfig");
+            String packageName = ctx.getApplicationInfo().packageName;
+            Class<?> clazz = Class.forName(packageName + ".BuildConfig");
             Field field = clazz.getField(key);
             return field.get(null);
         } catch (ClassNotFoundException e) {

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

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

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

@@ -24,16 +24,20 @@ import java.util.ArrayList;
 import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
-
 import android.content.Context;
 
 public class ConfigXmlParser {
     private static String TAG = "ConfigXmlParser";
 
-    private String launchUrl = "file:///android_asset/www/index.html";
+    private static String SCHEME_HTTP = "http";
+    private static String SCHEME_HTTPS = "https";
+    private static String DEFAULT_HOSTNAME = "localhost";
+    private static final String DEFAULT_CONTENT_SRC = "index.html";
+
+    private String launchUrl;
+    private String contentSrc;
     private CordovaPreferences prefs = new CordovaPreferences();
     private ArrayList<PluginEntry> pluginEntries = new ArrayList<PluginEntry>(20);
 
@@ -46,6 +50,10 @@ public class ConfigXmlParser {
     }
 
     public String getLaunchUrl() {
+        if (launchUrl == null) {
+            setStartUrl(contentSrc);
+        }
+
         return launchUrl;
     }
 
@@ -60,6 +68,23 @@ public class ConfigXmlParser {
                 return;
             }
         }
+
+        pluginEntries.add(
+            new PluginEntry(
+                AllowListPlugin.PLUGIN_NAME,
+                "org.apache.cordova.AllowListPlugin",
+                true
+            )
+        );
+
+        pluginEntries.add(
+            new PluginEntry(
+                SplashScreenPlugin.PLUGIN_NAME,
+                "org.apache.cordova.SplashScreenPlugin",
+                true
+            )
+        );
+
         parse(action.getResources().getXml(id));
     }
 
@@ -86,6 +111,18 @@ public class ConfigXmlParser {
                 e.printStackTrace();
             }
         }
+
+        onPostParse();
+    }
+
+    private void onPostParse() {
+        // After parsing, if contentSrc is still null, it signals
+        // that <content> tag was completely missing. In this case,
+        // default it.
+        // https://github.com/apache/cordova-android/issues/1432
+        if (contentSrc == null) {
+            contentSrc = DEFAULT_CONTENT_SRC;
+        }
     }
 
     public void handleStartTag(XmlPullParser xml) {
@@ -113,7 +150,10 @@ public class ConfigXmlParser {
         else if (strNode.equals("content")) {
             String src = xml.getAttributeValue(null, "src");
             if (src != null) {
-                setStartUrl(src);
+                contentSrc = src;
+            } else {
+                // Default
+                contentSrc = DEFAULT_CONTENT_SRC;
             }
         }
     }
@@ -130,16 +170,40 @@ public class ConfigXmlParser {
         }
     }
 
+    private String getLaunchUrlPrefix() {
+        if (prefs.getBoolean("AndroidInsecureFileModeEnabled", false)) {
+            return "file:///android_asset/www/";
+        } else {
+            String scheme = prefs.getString("scheme", SCHEME_HTTPS).toLowerCase();
+            String hostname = prefs.getString("hostname", DEFAULT_HOSTNAME).toLowerCase();
+
+            if (!scheme.contentEquals(SCHEME_HTTP) && !scheme.contentEquals(SCHEME_HTTPS)) {
+                LOG.d(TAG, "The provided scheme \"" + scheme + "\" is not valid. " +
+                    "Defaulting to \"" + SCHEME_HTTPS + "\". " +
+                    "(Valid Options=" + SCHEME_HTTP + "," + SCHEME_HTTPS + ")");
+
+                scheme = SCHEME_HTTPS;
+            }
+
+            return scheme + "://" + hostname + '/';
+        }
+    }
+
     private void setStartUrl(String src) {
         Pattern schemeRegex = Pattern.compile("^[a-z-]+://");
         Matcher matcher = schemeRegex.matcher(src);
+
         if (matcher.find()) {
             launchUrl = src;
         } else {
+            String launchUrlPrefix = getLaunchUrlPrefix();
+
+            // remove leading slash, "/", from content src if existing,
             if (src.charAt(0) == '/') {
                 src = src.substring(1);
             }
-            launchUrl = "file:///android_asset/www/" + src;
+
+            launchUrl = launchUrlPrefix + src;
         }
     }
 }

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

@@ -24,7 +24,6 @@ import java.util.Locale;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.annotation.SuppressLint;
 import android.content.DialogInterface;
@@ -32,7 +31,6 @@ import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Color;
 import android.media.AudioManager;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -43,6 +41,9 @@ import android.view.WindowManager;
 import android.webkit.WebViewClient;
 import android.widget.FrameLayout;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.splashscreen.SplashScreen;
+
 /**
  * This class is the main Android activity that represents the Cordova
  * application. It should be extended by the user to load the specific
@@ -74,7 +75,7 @@ import android.widget.FrameLayout;
  * deprecated in favor of the config.xml file.
  *
  */
-public class CordovaActivity extends Activity {
+public class CordovaActivity extends AppCompatActivity {
     public static String TAG = "CordovaActivity";
 
     // The webview for our app
@@ -98,11 +99,16 @@ public class CordovaActivity extends Activity {
     protected ArrayList<PluginEntry> pluginEntries;
     protected CordovaInterfaceImpl cordovaInterface;
 
+    private SplashScreen splashScreen;
+
     /**
      * Called when the activity is first created.
      */
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        // Handle the splash screen transition.
+        splashScreen = SplashScreen.installSplashScreen(this);
+
         // need to activate preferences before super.onCreate to avoid "requestFeature() must be called before adding content" exception
         loadConfig();
 
@@ -125,8 +131,6 @@ public class CordovaActivity extends Activity {
             // (as was the case in previous cordova versions)
             if (!preferences.getBoolean("FullscreenNotImmersive", false)) {
                 immersiveMode = true;
-                // The splashscreen plugin needs the flags set before we're focused to prevent
-                // the nav and title bars from flashing in.
                 setImmersiveUiVisibility();
             } else {
                 getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
@@ -153,6 +157,9 @@ public class CordovaActivity extends Activity {
         }
         cordovaInterface.onCordovaInit(appView.getPluginManager());
 
+        // Setup the splash screen based on preference settings
+        cordovaInterface.pluginManager.postMessage("setupSplashScreen", splashScreen);
+
         // Wire the hardware volume controls to control media if desired.
         String volumePref = preferences.getString("DefaultVolumeStream", "");
         if ("media".equals(volumePref.toLowerCase(Locale.ENGLISH))) {
@@ -513,6 +520,8 @@ public class CordovaActivity extends Activity {
     @Override
     public void onRequestPermissionsResult(int requestCode, String permissions[],
                                            int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
         try
         {
             cordovaInterface.onRequestPermissionResult(requestCode, permissions, grantResults);
@@ -524,5 +533,4 @@ public class CordovaActivity extends Activity {
         }
 
     }
-
 }

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

@@ -18,11 +18,10 @@
 */
 package org.apache.cordova;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 
-import org.apache.cordova.CordovaPlugin;
+import androidx.appcompat.app.AppCompatActivity;
 
 import java.util.concurrent.ExecutorService;
 
@@ -56,7 +55,7 @@ public interface CordovaInterface {
      *
      * @return the Activity
      */
-    public abstract Activity getActivity();
+    public abstract AppCompatActivity getActivity();
 
     /**
      * Get the Android context.

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

@@ -20,7 +20,6 @@
 package org.apache.cordova;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -28,6 +27,8 @@ import android.os.Build;
 import android.os.Bundle;
 import android.util.Pair;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -39,7 +40,7 @@ import java.util.concurrent.Executors;
  */
 public class CordovaInterfaceImpl implements CordovaInterface {
     private static final String TAG = "CordovaInterfaceImpl";
-    protected Activity activity;
+    protected AppCompatActivity activity;
     protected ExecutorService threadPool;
     protected PluginManager pluginManager;
 
@@ -51,11 +52,11 @@ public class CordovaInterfaceImpl implements CordovaInterface {
     protected boolean activityWasDestroyed = false;
     protected Bundle savedPluginState;
 
-    public CordovaInterfaceImpl(Activity activity) {
+    public CordovaInterfaceImpl(AppCompatActivity activity) {
         this(activity, Executors.newCachedThreadPool());
     }
 
-    public CordovaInterfaceImpl(Activity activity, ExecutorService threadPool) {
+    public CordovaInterfaceImpl(AppCompatActivity activity, ExecutorService threadPool) {
         this.activity = activity;
         this.threadPool = threadPool;
         this.permissionResultCallbacks = new CallbackMap();
@@ -76,13 +77,13 @@ public class CordovaInterfaceImpl implements CordovaInterface {
     public void setActivityResultCallback(CordovaPlugin plugin) {
         // Cancel any previously pending activity.
         if (activityResultCallback != null) {
-            activityResultCallback.onActivityResult(activityResultRequestCode, Activity.RESULT_CANCELED, null);
+            activityResultCallback.onActivityResult(activityResultRequestCode, AppCompatActivity.RESULT_CANCELED, null);
         }
         activityResultCallback = plugin;
     }
 
     @Override
-    public Activity getActivity() {
+    public AppCompatActivity getActivity() {
         return activity;
     }
 
@@ -236,14 +237,6 @@ public class CordovaInterfaceImpl implements CordovaInterface {
 
     public boolean hasPermission(String permission)
     {
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
-        {
-            int result = activity.checkSelfPermission(permission);
-            return PackageManager.PERMISSION_GRANTED == result;
-        }
-        else
-        {
-            return true;
-        }
+        return PackageManager.PERMISSION_GRANTED == activity.checkSelfPermission(permission);
     }
 }

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

@@ -31,6 +31,8 @@ import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.webkit.RenderProcessGoneDetail;
+import android.webkit.WebView;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -414,9 +416,47 @@ public class CordovaPlugin {
      * @param requestCode
      * @param permissions
      * @param grantResults
+     * 
+     * @deprecated Use {@link #onRequestPermissionsResult} instead.
      */
+    @Deprecated
     public void onRequestPermissionResult(int requestCode, String[] permissions,
                                           int[] grantResults) throws JSONException {
 
     }
+
+    /**
+     * Called by the system when the user grants permissions
+     *
+     * @param requestCode
+     * @param permissions
+     * @param grantResults
+     */
+    public void onRequestPermissionsResult(int requestCode, String[] permissions,
+                                          int[] grantResults) throws JSONException {
+
+    }
+
+    /**
+     * Allow plugins to supply a PathHandler for the WebViewAssetHandler
+     * @return a CordovaPluginPathHandler which listen for paths and returns a response
+     */
+    public CordovaPluginPathHandler getPathHandler() {
+        return null;
+    }
+
+    /**
+     * 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>
+     *
+     * Note: A plugin must not attempt to recover a webview that it does not own/manage.
+     *
+     * @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.
+     */
+    public boolean onRenderProcessGone(final WebView view, RenderProcessGoneDetail detail) {
+        return false;
+    }
 }

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

@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
 /*
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
@@ -19,14 +17,22 @@
        under the License.
 */
 
-var check_reqs = require('./templates/cordova/lib/check_reqs');
+package org.apache.cordova;
 
-check_reqs.run().then(
-    function success () {
-        console.log('Looks like your environment fully supports cordova-android development!');
-    },
-    function fail (err) {
-        console.log(err);
-        process.exit(2);
+import androidx.webkit.WebViewAssetLoader;
+
+/**
+ * Wrapper class for path and handler
+ */
+public class CordovaPluginPathHandler {
+
+    private final WebViewAssetLoader.PathHandler handler;
+
+    public  CordovaPluginPathHandler(WebViewAssetLoader.PathHandler handler) {
+        this.handler = handler;
     }
-);
+
+    public WebViewAssetLoader.PathHandler getPathHandler() {
+        return handler;
+    }
+}

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

@@ -1,142 +1,142 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-         http://www.apache.org/licenses/LICENSE-2.0
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-package org.apache.cordova;
-
-import java.util.List;
-import java.util.Map;
-
-import android.content.Context;
-import android.content.Intent;
-import android.view.View;
-import android.webkit.WebChromeClient.CustomViewCallback;
-
-/**
- * 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
- * are not expected to implement it.
- */
-public interface CordovaWebView {
-    public static final String CORDOVA_VERSION = "9.1.1";
-
-    void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);
-
-    boolean isInitialized();
-
-    View getView();
-
-    void loadUrlIntoView(String url, boolean recreatePlugins);
-
-    void stopLoading();
-
-    boolean canGoBack();
-
-    void clearCache();
-
-    /** Use parameter-less overload */
-    @Deprecated
-    void clearCache(boolean b);
-
-    void clearHistory();
-
-    boolean backHistory();
-
-    void handlePause(boolean keepRunning);
-
-    void onNewIntent(Intent intent);
-
-    void handleResume(boolean keepRunning);
-
-    void handleStart();
-
-    void handleStop();
-
-    void handleDestroy();
-
-    /**
-     * Send JavaScript statement back to JavaScript.
-     *
-     * Deprecated (https://issues.apache.org/jira/browse/CB-6851)
-     * 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):
-     *    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:
-     *    PluginResult dataResult = new PluginResult(PluginResult.Status.OK, CODE);
-     *    dataResult.setKeepCallback(true);
-     *    savedCallbackContext.sendPluginResult(dataResult);
-     */
-    @Deprecated
-    void sendJavascript(String statememt);
-
-    /**
-     * Load the specified URL in the Cordova webview or a new browser instance.
-     *
-     * NOTE: If openExternal is false, only whitelisted URLs can be loaded.
-     *
-     * @param url           The url to load.
-     * @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
-     */
-    void showWebPage(String url, boolean openExternal, boolean clearHistory, Map<String, Object> params);
-
-    /**
-     * Deprecated in 4.0.0. Use your own View-toggling logic.
-     */
-    @Deprecated
-    boolean isCustomViewShowing();
-
-    /**
-     * Deprecated in 4.0.0. Use your own View-toggling logic.
-     */
-    @Deprecated
-    void showCustomView(View view, CustomViewCallback callback);
-
-    /**
-     * Deprecated in 4.0.0. Use your own View-toggling logic.
-     */
-    @Deprecated
-    void hideCustomView();
-
-    CordovaResourceApi getResourceApi();
-
-    void setButtonPlumbedToJs(int keyCode, boolean override);
-    boolean isButtonPlumbedToJs(int keyCode);
-
-    void sendPluginResult(PluginResult cr, String callbackId);
-
-    PluginManager getPluginManager();
-    CordovaWebViewEngine getEngine();
-    CordovaPreferences getPreferences();
-    ICordovaCookieManager getCookieManager();
-
-    String getUrl();
-
-    // TODO: Work on deleting these by removing refs from plugins.
-    Context getContext();
-    void loadUrl(String url);
-    Object postMessage(String id, Object data);
-}
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+         http://www.apache.org/licenses/LICENSE-2.0
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+package org.apache.cordova;
+
+import java.util.List;
+import java.util.Map;
+
+import android.content.Context;
+import android.content.Intent;
+import android.view.View;
+import android.webkit.WebChromeClient.CustomViewCallback;
+
+/**
+ * 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
+ * are not expected to implement it.
+ */
+public interface CordovaWebView {
+    public static final String CORDOVA_VERSION = "12.0.2-dev";
+
+    void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);
+
+    boolean isInitialized();
+
+    View getView();
+
+    void loadUrlIntoView(String url, boolean recreatePlugins);
+
+    void stopLoading();
+
+    boolean canGoBack();
+
+    void clearCache();
+
+    /** Use parameter-less overload */
+    @Deprecated
+    void clearCache(boolean b);
+
+    void clearHistory();
+
+    boolean backHistory();
+
+    void handlePause(boolean keepRunning);
+
+    void onNewIntent(Intent intent);
+
+    void handleResume(boolean keepRunning);
+
+    void handleStart();
+
+    void handleStop();
+
+    void handleDestroy();
+
+    /**
+     * Send JavaScript statement back to JavaScript.
+     *
+     * Deprecated (https://issues.apache.org/jira/browse/CB-6851)
+     * 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):
+     *    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:
+     *    PluginResult dataResult = new PluginResult(PluginResult.Status.OK, CODE);
+     *    dataResult.setKeepCallback(true);
+     *    savedCallbackContext.sendPluginResult(dataResult);
+     */
+    @Deprecated
+    void sendJavascript(String statememt);
+
+    /**
+     * 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.
+     *
+     * @param url           The url to load.
+     * @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
+     */
+    void showWebPage(String url, boolean openExternal, boolean clearHistory, Map<String, Object> params);
+
+    /**
+     * Deprecated in 4.0.0. Use your own View-toggling logic.
+     */
+    @Deprecated
+    boolean isCustomViewShowing();
+
+    /**
+     * Deprecated in 4.0.0. Use your own View-toggling logic.
+     */
+    @Deprecated
+    void showCustomView(View view, CustomViewCallback callback);
+
+    /**
+     * Deprecated in 4.0.0. Use your own View-toggling logic.
+     */
+    @Deprecated
+    void hideCustomView();
+
+    CordovaResourceApi getResourceApi();
+
+    void setButtonPlumbedToJs(int keyCode, boolean override);
+    boolean isButtonPlumbedToJs(int keyCode);
+
+    void sendPluginResult(PluginResult cr, String callbackId);
+
+    PluginManager getPluginManager();
+    CordovaWebViewEngine getEngine();
+    CordovaPreferences getPreferences();
+    ICordovaCookieManager getCookieManager();
+
+    String getUrl();
+
+    // TODO: Work on deleting these by removing refs from plugins.
+    Context getContext();
+    void loadUrl(String url);
+    Object postMessage(String id, Object data);
+}

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

@@ -115,9 +115,8 @@ public class CordovaWebViewImpl implements CordovaWebView {
         // This isn't enforced by the compiler, so assert here.
         assert engine.getView() instanceof CordovaWebViewEngine.EngineView;
 
-        pluginManager.addService(CoreAndroid.PLUGIN_NAME, "org.apache.cordova.CoreAndroid");
+        pluginManager.addService(CoreAndroid.PLUGIN_NAME, "org.apache.cordova.CoreAndroid", true);
         pluginManager.init();
-
     }
 
     @Override
@@ -219,19 +218,19 @@ public class CordovaWebViewImpl implements CordovaWebView {
 
         // If loading into our webview
         if (!openExternal) {
-            // Make sure url is in whitelist
+            // Make sure url is in allow list
             if (pluginManager.shouldAllowNavigation(url)) {
                 // TODO: What about params?
                 // Load new URL
                 loadUrlIntoView(url, true);
                 return;
             } else {
-                LOG.w(TAG, "showWebPage: Refusing to load URL into webview since it is not in the <allow-navigation> whitelist. URL=" + url);
+                LOG.w(TAG, "showWebPage: Refusing to load URL into webview since it is not in the <allow-navigation> allow list. URL=" + url);
                 return;
             }
         }
         if (!pluginManager.shouldOpenExternalUrl(url)) {
-            LOG.w(TAG, "showWebPage: Refusing to send intent for URL since it is not in the <allow-intent> whitelist. URL=" + url);
+            LOG.w(TAG, "showWebPage: Refusing to send intent for URL since it is not in the <allow-intent> allow list. URL=" + url);
             return;
         }
 
@@ -339,6 +338,7 @@ public class CordovaWebViewImpl implements CordovaWebView {
 
         // Show the content view.
         engine.getView().setVisibility(View.VISIBLE);
+        engine.getView().requestFocus();
     }
 
     @Override

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

@@ -19,6 +19,8 @@
 
 package org.apache.cordova;
 
+import org.apache.cordova.BuildHelper;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -30,7 +32,6 @@ import android.content.IntentFilter;
 import android.telephony.TelephonyManager;
 import android.view.KeyEvent;
 
-import java.lang.reflect.Field;
 import java.util.HashMap;
 
 /**
@@ -376,35 +377,19 @@ public class CoreAndroid extends CordovaPlugin {
         }
     }
 
-      /*
+    /*
      * This needs to be implemented if you wish to use the Camera Plugin or other plugins
      * that read the Build Configuration.
      *
      * Thanks to Phil@Medtronic and Graham Borland for finding the answer and posting it to
      * StackOverflow.  This is annoying as hell!
      *
+     * @deprecated Use {@link BuildHelper#getBuildConfigValue} instead.
      */
-
+    @Deprecated
     public static Object getBuildConfigValue(Context ctx, String key)
     {
-        try
-        {
-            Class<?> clazz = Class.forName(ctx.getClass().getPackage().getName() + ".BuildConfig");
-            Field field = clazz.getField(key);
-            return field.get(null);
-        } catch (ClassNotFoundException e) {
-            LOG.d(TAG, "Unable to get the BuildConfig, is this built with ANT?");
-            e.printStackTrace();
-        } catch (NoSuchFieldException e) {
-            LOG.d(TAG, key + " is not a valid field. Check your build.gradle");
-        } catch (IllegalAccessException e) {
-            LOG.d(TAG, "Illegal Access Exception: Let's print a stack trace.");
-            e.printStackTrace();
-        } catch (NullPointerException e) {
-            LOG.d(TAG, "Null Pointer Exception: Let's print a stack trace.");
-            e.printStackTrace();
-        }
-
-        return null;
+        LOG.w(TAG, "CoreAndroid.getBuildConfigValue is deprecated and will be removed in a future release. Use BuildHelper.getBuildConfigValue instead.");
+        return BuildHelper.getBuildConfigValue(ctx, key);
     }
 }

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

@@ -79,7 +79,9 @@ public class PermissionHelper {
         Arrays.fill(requestResults, PackageManager.PERMISSION_GRANTED);
 
         try {
+            // This one is deprecated - see https://github.com/apache/cordova-android/issues/592
             plugin.onRequestPermissionResult(requestCode, permissions, requestResults);
+            plugin.onRequestPermissionsResult(requestCode, permissions, requestResults);
         } catch (JSONException e) {
             LOG.e(LOG_TAG, "JSONException when delivering permissions results", e);
         }

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

@@ -47,11 +47,23 @@ public final class PluginEntry {
 
     /**
      * Constructs with a CordovaPlugin already instantiated.
+     *
+     * @param service               The name of the service
+     * @param pluginClass           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
+     */
+    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
@@ -61,6 +73,12 @@ public final class PluginEntry {
         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
+     */
     private PluginEntry(String service, String pluginClass, boolean onload, CordovaPlugin plugin) {
         this.service = service;
         this.pluginClass = pluginClass;

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

@@ -18,6 +18,7 @@
  */
 package org.apache.cordova;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -31,6 +32,8 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Debug;
 import android.os.Build;
+import android.webkit.RenderProcessGoneDetail;
+import android.webkit.WebView;
 
 /**
  * PluginManager is exposed to JavaScript in the Cordova WebView.
@@ -40,6 +43,12 @@ import android.os.Build;
  */
 public class PluginManager {
     private static String TAG = "PluginManager";
+
+    // @todo same as ConfigXmlParser. Research centralizing ideas, maybe create CordovaConstants
+    private static String SCHEME_HTTPS = "https";
+    // @todo same as ConfigXmlParser. Research centralizing ideas, maybe create CordovaConstants
+    private static String DEFAULT_HOSTNAME = "localhost";
+
     private static final int SLOW_EXEC_WARNING_THRESHOLD = Debug.isDebuggerConnected() ? 60 : 16;
 
     // List of service entries
@@ -190,7 +199,18 @@ public class PluginManager {
      * @param className         The plugin class name
      */
     public void addService(String service, String className) {
-        PluginEntry entry = new PluginEntry(service, className, false);
+        addService(service, className, false);
+    }
+
+    /**
+     * Add a plugin class that implements a service to the service entry table.
+     * 
+     * @param service           The service name
+     * @param className         The plugin class name
+     * @param onload            If true, the plugin will be instantiated immediately
+     */
+    public void addService(String service, String className, boolean onload) {
+        PluginEntry entry = new PluginEntry(service, className, onload);
         this.addService(entry);
     }
 
@@ -332,22 +352,11 @@ public class PluginManager {
     public Object postMessage(String id, Object data) {
         LOG.d(TAG, "postMessage: " + id);
         synchronized (this.pluginMap) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                this.pluginMap.forEach((s, plugin) -> {
-                    if (plugin != null) {
-                        plugin.onMessage(id, data);
-                    }
-                });
-            } else {
-                for (CordovaPlugin plugin : this.pluginMap.values()) {
-                    if (plugin != null) {
-                        Object obj = plugin.onMessage(id, data);
-                        if (obj != null) {
-                            return obj;
-                        }
-                    }
+            this.pluginMap.forEach((s, plugin) -> {
+                if (plugin != null) {
+                    plugin.onMessage(id, data);
                 }
-            }
+            });
         }
         return ctx.onMessage(id, data);
     }
@@ -365,6 +374,24 @@ 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 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.
+     */
+    private String getLaunchUrlPrefix() {
+        if (!app.getPreferences().getBoolean("AndroidInsecureFileModeEnabled", false)) {
+            String scheme = app.getPreferences().getString("scheme", SCHEME_HTTPS).toLowerCase();
+            String hostname = app.getPreferences().getString("hostname", DEFAULT_HOSTNAME).toLowerCase();
+            return scheme + "://" + hostname + '/';
+        }
+
+        return "file://";
+    }
+
     /**
      * Called when the webview is going to request an external resource.
      *
@@ -430,7 +457,7 @@ public class PluginManager {
         }
 
         // Default policy:
-        return url.startsWith("file://") || url.startsWith("about:blank");
+        return url.startsWith(getLaunchUrlPrefix()) || url.startsWith("about:blank");
     }
 
 
@@ -451,7 +478,7 @@ public class PluginManager {
         }
 
         // Default policy:
-        return url.startsWith("file://");
+        return url.startsWith(getLaunchUrlPrefix());
     }
 
     /**
@@ -577,4 +604,44 @@ public class PluginManager {
         }
         return state;
     }
+
+    /**
+     * Collect all plugins PathHandlers
+     *
+     * @return list of PathHandlers in no particular order
+     */
+    public ArrayList<CordovaPluginPathHandler> getPluginPathHandlers() {
+        ArrayList<CordovaPluginPathHandler> handlers = new ArrayList<CordovaPluginPathHandler>();
+        for (CordovaPlugin plugin : this.pluginMap.values()) {
+            if (plugin != null && plugin.getPathHandler() != null) {
+                handlers.add(plugin.getPathHandler());
+            }
+        }
+        return handlers;
+    }
+
+    /**
+     * 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)
+     *
+     * @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.
+     */
+    public boolean onRenderProcessGone(final WebView view, RenderProcessGoneDetail detail) {
+        boolean result = false;
+        synchronized (this.entryMap) {
+            for (PluginEntry entry : this.entryMap.values()) {
+                CordovaPlugin plugin = pluginMap.get(entry.service);
+                if (plugin != null) {
+                    if (plugin.onRenderProcessGone(view, detail)) {
+                        result = true;
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
 }

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

@@ -0,0 +1,170 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+
+package org.apache.cordova;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.annotation.SuppressLint;
+import android.os.Handler;
+import android.view.View;
+import android.view.animation.AccelerateInterpolator;
+
+import androidx.annotation.NonNull;
+import androidx.core.splashscreen.SplashScreen;
+import androidx.core.splashscreen.SplashScreenViewProvider;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+
+@SuppressLint("LongLogTag")
+public class SplashScreenPlugin extends CordovaPlugin {
+    static final String PLUGIN_NAME = "CordovaSplashScreenPlugin";
+
+    // Default config preference values
+    private static final boolean DEFAULT_AUTO_HIDE = true;
+    private static final int DEFAULT_DELAY_TIME = -1;
+    private static final boolean DEFAULT_FADE = true;
+    private static final int DEFAULT_FADE_TIME = 500;
+
+    // Config preference values
+    /**
+     * @param boolean autoHide to auto splash screen (default=true)
+     */
+    private boolean autoHide;
+    /**
+     * @param int delayTime in milliseconds (default=-1)
+     */
+    private int delayTime;
+    /**
+     * @param int fade to fade out splash screen (default=true)
+     */
+    private boolean isFadeEnabled;
+    /**
+     * @param int fadeDuration fade out duration in milliseconds (default=500)
+     */
+    private int fadeDuration;
+
+    // Internal variables
+    /**
+     * @param boolean keepOnScreen flag to determine if the splash screen remains visible.
+     */
+    private boolean keepOnScreen = true;
+
+    @Override
+    protected void pluginInitialize() {
+        // Auto Hide & Delay Settings
+        autoHide = preferences.getBoolean("AutoHideSplashScreen", DEFAULT_AUTO_HIDE);
+        delayTime = preferences.getInteger("SplashScreenDelay", DEFAULT_DELAY_TIME);
+        LOG.d(PLUGIN_NAME, "Auto Hide: " + autoHide);
+        if (delayTime != DEFAULT_DELAY_TIME) {
+            LOG.d(PLUGIN_NAME, "Delay: " + delayTime + "ms");
+        }
+
+        // Fade & Fade Duration
+        isFadeEnabled = preferences.getBoolean("FadeSplashScreen", DEFAULT_FADE);
+        fadeDuration = preferences.getInteger("FadeSplashScreenDuration", DEFAULT_FADE_TIME);
+        LOG.d(PLUGIN_NAME, "Fade: " + isFadeEnabled);
+        if (isFadeEnabled) {
+            LOG.d(PLUGIN_NAME, "Fade Duration: " + fadeDuration + "ms");
+        }
+    }
+
+    @Override
+    public boolean execute(
+        String action,
+        JSONArray args,
+        CallbackContext callbackContext
+    ) throws JSONException {
+        if (action.equals("hide") && autoHide == false) {
+            /*
+             * The `.hide()` method can only be triggered if the `splashScreenAutoHide`
+             * is set to `false`.
+             */
+            keepOnScreen = false;
+        } else {
+            return false;
+        }
+
+        callbackContext.success();
+        return true;
+    }
+
+    @Override
+    public Object onMessage(String id, Object data) {
+        switch (id) {
+            case "setupSplashScreen":
+                setupSplashScreen((SplashScreen) data);
+                break;
+
+            case "onPageFinished":
+                attemptCloseOnPageFinished();
+                break;
+        }
+
+        return null;
+    }
+
+    private void setupSplashScreen(SplashScreen splashScreen) {
+        // Setup Splash Screen Delay
+        splashScreen.setKeepOnScreenCondition(() -> keepOnScreen);
+
+        // auto hide splash screen when custom delay is defined.
+        if (autoHide && delayTime != DEFAULT_DELAY_TIME) {
+            Handler splashScreenDelayHandler = new Handler(cordova.getContext().getMainLooper());
+            splashScreenDelayHandler.postDelayed(() -> keepOnScreen = false, delayTime);
+        }
+
+        // auto hide splash screen with default delay (-1) delay is controlled by the
+        // `onPageFinished` message.
+
+        // If auto hide is disabled (false), the hiding of the splash screen must be determined &
+        // triggered by the front-end code with the `navigator.splashscreen.hide()` method.
+
+        if (isFadeEnabled) {
+            // Setup the fade
+            splashScreen.setOnExitAnimationListener(new SplashScreen.OnExitAnimationListener() {
+                @Override
+                public void onSplashScreenExit(@NonNull SplashScreenViewProvider splashScreenViewProvider) {
+                    View splashScreenView = splashScreenViewProvider.getView();
+
+                    splashScreenView
+                            .animate()
+                            .alpha(0.0f)
+                            .setDuration(fadeDuration)
+                            .setStartDelay(0)
+                            .setInterpolator(new AccelerateInterpolator())
+                            .setListener(new AnimatorListenerAdapter() {
+                                @Override
+                                public void onAnimationEnd(Animator animation) {
+                                    super.onAnimationEnd(animation);
+                                    splashScreenViewProvider.remove();
+                                }
+                            }).start();
+                }
+            });
+        }
+    }
+
+    private void attemptCloseOnPageFinished() {
+        if (autoHide && delayTime == DEFAULT_DELAY_TIME) {
+            keepOnScreen = false;
+        }
+    }
+}

framework/src/org/apache/cordova/allowlist/index.html

@@ -27,7 +27,7 @@
       <script type="text/javascript" charset="utf-8" src="../main.js"></script>
   </head>
   <body onload="init();" id="stage" class="theme">
-    <h1>Whitelist Page 1</h1>
+    <h1>Allow List Page 1</h1>
     <div id="info">
         <h4>Cordova: <span id="cordova"> &nbsp;</span></h4>
         <h4>Deviceready: <span id="deviceready"> &nbsp;</span></h4>

framework/src/org/apache/cordova/allowlist/index2.html

@@ -27,7 +27,7 @@
       <script type="text/javascript" charset="utf-8" src="../main.js"></script>
   </head>
   <body onload="init();" id="stage" class="theme">
-    <h1>Whitelist Page 2</h1>
+    <h1>Allow List Page 2</h1>
     <div id="info">
         <h4>Cordova: <span id="cordova"> &nbsp;</span></h4>
         <h4>Deviceready: <span id="deviceready"> &nbsp;</span></h4>

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

@@ -19,8 +19,6 @@
 
 package org.apache.cordova.engine;
 
-import android.annotation.TargetApi;
-import android.os.Build;
 import android.webkit.CookieManager;
 import android.webkit.WebView;
 
@@ -35,10 +33,14 @@ class SystemCookieManager implements ICordovaCookieManager {
         webView = webview;
         cookieManager = CookieManager.getInstance();
 
-        cookieManager.setAcceptFileSchemeCookies(true);
         cookieManager.setAcceptThirdPartyCookies(webView, true);
     }
 
+    @SuppressWarnings("deprecation")
+    public void setAcceptFileSchemeCookies() {
+        cookieManager.setAcceptFileSchemeCookies(true);
+    }
+
     public void setCookiesEnabled(boolean accept) {
         cookieManager.setAcceptCookie(accept);
     }
@@ -51,7 +53,6 @@ class SystemCookieManager implements ICordovaCookieManager {
         return cookieManager.getCookie(url);
     }
 
-    @SuppressWarnings("deprecation")
     public void clearCookies() {
         cookieManager.removeAllCookies(null);
     }

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

@@ -79,13 +79,6 @@ public class SystemWebView extends WebView implements CordovaWebViewEngine.Engin
 
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
-        if(event.getKeyCode()>=520 && event.getKeyCode() <=523){
-            if (event.getAction() == KeyEvent.ACTION_UP) {
-              loadUrl("javascript:cordova.fireWindowEvent('native.onKeyUp',{keycode:"+event.getKeyCode()+"})");
-            } else if(event.getAction() == KeyEvent.ACTION_DOWN){
-              loadUrl("javascript:cordova.fireWindowEvent('native.onKeyDown',{keycode:"+event.getKeyCode()+"})");
-            }
-          }
         Boolean ret = parentEngine.client.onDispatchKeyEvent(event);
         if (ret != null) {
             return ret.booleanValue();

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

@@ -18,17 +18,19 @@
 */
 package org.apache.cordova.engine;
 
-import android.annotation.TargetApi;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.AssetManager;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.net.http.SslError;
-import android.os.Build;
 import android.webkit.ClientCertRequest;
 import android.webkit.HttpAuthHandler;
+import android.webkit.MimeTypeMap;
+import android.webkit.RenderProcessGoneDetail;
 import android.webkit.SslErrorHandler;
+import android.webkit.WebResourceRequest;
 import android.webkit.WebResourceResponse;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
@@ -36,14 +38,17 @@ import android.webkit.WebViewClient;
 import org.apache.cordova.AuthenticationToken;
 import org.apache.cordova.CordovaClientCertRequest;
 import org.apache.cordova.CordovaHttpAuthHandler;
+import org.apache.cordova.CordovaPluginPathHandler;
 import org.apache.cordova.CordovaResourceApi;
 import org.apache.cordova.LOG;
 import org.apache.cordova.PluginManager;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Hashtable;
 
+import androidx.webkit.WebViewAssetLoader;
 
 /**
  * This class is the WebViewClient that implements callbacks for our web view.
@@ -56,6 +61,7 @@ public class SystemWebViewClient extends WebViewClient {
 
     private static final String TAG = "SystemWebViewClient";
     protected final SystemWebViewEngine parentEngine;
+    private final WebViewAssetLoader assetLoader;
     private boolean doClearHistory = false;
     boolean isCurrentlyLoading;
 
@@ -64,6 +70,52 @@ public class SystemWebViewClient extends WebViewClient {
 
     public SystemWebViewClient(SystemWebViewEngine parentEngine) {
         this.parentEngine = parentEngine;
+
+        WebViewAssetLoader.Builder assetLoaderBuilder = new WebViewAssetLoader.Builder()
+                .setDomain(parentEngine.preferences.getString("hostname", "localhost").toLowerCase())
+                .setHttpAllowed(true);
+
+        assetLoaderBuilder.addPathHandler("/", path -> {
+            try {
+                // Check if there a plugins with pathHandlers
+                PluginManager pluginManager = this.parentEngine.pluginManager;
+                if (pluginManager != null) {
+                    for (CordovaPluginPathHandler handler : pluginManager.getPluginPathHandlers()) {
+                        if (handler.getPathHandler() != null) {
+                            WebResourceResponse response = handler.getPathHandler().handle(path);
+                            if (response != null) {
+                                return response;
+                            }
+                        };
+                    }
+                }
+
+                if (path.isEmpty()) {
+                    path = "index.html";
+                }
+                InputStream is = parentEngine.webView.getContext().getAssets().open("www/" + path, AssetManager.ACCESS_STREAMING);
+                String mimeType = "text/html";
+                String extension = MimeTypeMap.getFileExtensionFromUrl(path);
+                if (extension != null) {
+                    if (path.endsWith(".js") || path.endsWith(".mjs")) {
+                        // Make sure JS files get the proper mimetype to support ES modules
+                        mimeType = "application/javascript";
+                    } else if (path.endsWith(".wasm")) {
+                        mimeType = "application/wasm";
+                    } else {
+                        mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
+                    }
+                }
+
+                return new WebResourceResponse(mimeType, null, is);
+            } catch (Exception e) {
+                e.printStackTrace();
+                LOG.e(TAG, e.getMessage());
+            }
+            return null;
+        });
+
+        this.assetLoader = assetLoaderBuilder.build();
     }
 
     /**
@@ -320,10 +372,10 @@ public class SystemWebViewClient extends WebViewClient {
     @SuppressWarnings("deprecation")
     public WebResourceResponse shouldInterceptRequest(WebView view, String url) {
         try {
-            // Check the against the whitelist and lock out access to the WebView directory
+            // Check the against the allow list and lock out access to the WebView directory
             // Changing this will cause problems for your application
             if (!parentEngine.pluginManager.shouldAllowRequest(url)) {
-                LOG.w(TAG, "URL blocked by whitelist: " + url);
+                LOG.w(TAG, "URL blocked by allow list: " + url);
                 // Results in a 404.
                 return new WebResourceResponse("text/plain", "UTF-8", null);
             }
@@ -366,4 +418,20 @@ public class SystemWebViewClient extends WebViewClient {
 
         return false;
     }
+
+    @Override
+    public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
+        return this.assetLoader.shouldInterceptRequest(request.getUrl());
+    }
+
+    @Override
+    public boolean onRenderProcessGone(final WebView view, RenderProcessGoneDetail detail) {
+        // Check if there is some plugin which can handle this event
+        PluginManager pluginManager = this.parentEngine.pluginManager;
+        if (pluginManager != null && pluginManager.onRenderProcessGone(view, detail)) {
+            return true;
+        }
+
+        return super.onRenderProcessGone(view, detail);
+    }
 }

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

@@ -152,40 +152,47 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {
         settings.setJavaScriptCanOpenWindowsAutomatically(true);
         settings.setLayoutAlgorithm(LayoutAlgorithm.NORMAL);
 
-        /**
-         * https://developer.android.com/reference/android/webkit/WebSettings#setAllowFileAccess(boolean)
-         * 
-         * SDK >= 30 has recently set this value to false by default.
-         * It is recommended to turn off this settings To prevent possible security issues targeting Build.VERSION_CODES.Q and earlier.
-         * For existing functionality, this setting is set to true. In a future release, this should be defaulted to false.
-         */
-        settings.setAllowFileAccess(true);
-
         String manufacturer = android.os.Build.MANUFACTURER;
         LOG.d(TAG, "CordovaWebView is running on device made by: " + manufacturer);
 
-        //We don't save any form data in the application
+        // We don't save any form data in the application
+        // @todo remove when Cordova drop API level 26 support
         settings.setSaveFormData(false);
-        settings.setSavePassword(false);
 
-        // Jellybean rightfully tried to lock this down. Too bad they didn't give us a whitelist
-        // while we do this
-        settings.setAllowUniversalAccessFromFileURLs(true);
+        if (preferences.getBoolean("AndroidInsecureFileModeEnabled", false)) {
+            //These settings are deprecated and loading content via file:// URLs is generally discouraged,
+            //but we allow this for compatibility reasons
+            LOG.d(TAG, "Enabled insecure file access");
+            settings.setAllowFileAccess(true);
+            settings.setAllowUniversalAccessFromFileURLs(true);
+            cookieManager.setAcceptFileSchemeCookies();
+        }
+
         settings.setMediaPlaybackRequiresUserGesture(false);
 
         // Enable database
         // We keep this disabled because we use or shim to get around DOM_EXCEPTION_ERROR_16
         String databasePath = webView.getContext().getApplicationContext().getDir("database", Context.MODE_PRIVATE).getPath();
         settings.setDatabaseEnabled(true);
-        settings.setDatabasePath(databasePath);
 
+        // 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.
+        String inspectableWebview = preferences.getString("InspectableWebview", null);
+        boolean shouldEnableInspector = false;
+        if (inspectableWebview == null) {
+            ApplicationInfo appInfo = webView.getContext().getApplicationContext().getApplicationInfo();
+            shouldEnableInspector = (appInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;
+        }
+        else if ("true".equals(inspectableWebview)) {
+            shouldEnableInspector = true;
+        }
 
-        //Determine whether we're in debug or release mode, and turn on Debugging!
-        ApplicationInfo appInfo = webView.getContext().getApplicationContext().getApplicationInfo();
-        if ((appInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) {
+        if (shouldEnableInspector) {
             enableRemoteDebugging();
         }
 
+        // @todo remove when Cordova drop API level 24 support
         settings.setGeolocationDatabasePath(databasePath);
 
         // Enable DOM storage
@@ -194,12 +201,6 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {
         // Enable built-in geolocation
         settings.setGeolocationEnabled(true);
 
-        // Enable AppCache
-        // Fix for CB-2282
-        settings.setAppCacheMaxSize(5 * 1048576);
-        settings.setAppCachePath(databasePath);
-        settings.setAppCacheEnabled(true);
-
         // Fix for CB-1405
         // Google issue 4641
         String defaultUserAgent = settings.getUserAgentString();

lib/Adb.js

@@ -17,12 +17,12 @@
     under the License.
 */
 
-var os = require('os');
-var execa = require('execa');
-var events = require('cordova-common').events;
-var CordovaError = require('cordova-common').CordovaError;
+const os = require('os');
+const execa = require('execa');
+const events = require('cordova-common').events;
+const CordovaError = require('cordova-common').CordovaError;
 
-var Adb = {};
+const Adb = {};
 
 /**
  * Lists available/connected devices and emulators
@@ -50,7 +50,7 @@ Adb.devices = async function () {
 Adb.install = function (target, packagePath, { replace = false, execOptions = {} } = {}) {
     events.emit('verbose', 'Installing apk ' + packagePath + ' on target ' + target + '...');
 
-    var args = ['-s', target, 'install'];
+    const args = ['-s', target, 'install'];
     if (replace) args.push('-r');
 
     const opts = { cwd: os.tmpdir(), ...execOptions };
@@ -79,7 +79,7 @@ Adb.uninstall = function (target, packageId) {
 
 Adb.shell = function (target, shellCommand) {
     events.emit('verbose', 'Running adb shell command "' + shellCommand + '" on target ' + target + '...');
-    var args = ['-s', target, 'shell'];
+    const args = ['-s', target, 'shell'];
     shellCommand = shellCommand.split(/\s+/);
     return execa('adb', args.concat(shellCommand), { cwd: os.tmpdir() })
         .then(({ stdout }) => stdout)

lib/AndroidManifest.js

@@ -17,10 +17,10 @@
     under the License.
 */
 
-var fs = require('fs');
-var xml = require('cordova-common').xmlHelpers;
+const fs = require('fs');
+const xml = require('cordova-common').xmlHelpers;
 
-var DEFAULT_ORIENTATION = 'default';
+const DEFAULT_ORIENTATION = 'default';
 
 /** Wraps an AndroidManifest file */
 class AndroidManifest {
@@ -50,17 +50,8 @@ class AndroidManifest {
         return this;
     }
 
-    getPackageId () {
-        return this.doc.getroot().attrib.package;
-    }
-
-    setPackageId (pkgId) {
-        this.doc.getroot().attrib.package = pkgId;
-        return this;
-    }
-
     getActivity () {
-        var activity = this.doc.getroot().find('./application/activity');
+        const activity = this.doc.getroot().find('./application/activity');
         return {
             getName: function () {
                 return activity.attrib['android:name'];
@@ -103,7 +94,7 @@ class AndroidManifest {
     }
 
     setDebuggable (value) {
-        var application = this.doc.getroot().find('./application');
+        const application = this.doc.getroot().find('./application');
         if (value) {
             application.attrib['android:debuggable'] = 'true';
         } else {

lib/AndroidProject.js

@@ -17,16 +17,16 @@
     under the License.
 */
 
-var fs = require('fs');
-var path = require('path');
-var properties_parser = require('properties-parser');
-var AndroidManifest = require('./AndroidManifest');
-var pluginHandlers = require('./pluginHandlers');
+const fs = require('fs');
+const path = require('path');
+const properties_parser = require('properties-parser');
+const pluginHandlers = require('./pluginHandlers');
+const CordovaGradleConfigParserFactory = require('./config/CordovaGradleConfigParserFactory');
 
-var projectFileCache = {};
+let projectFileCache = {};
 
 function addToPropertyList (projectProperties, key, value) {
-    var i = 1;
+    let i = 1;
     while (projectProperties.get(key + '.' + i)) { i++; }
 
     projectProperties.set(key + '.' + i, value);
@@ -34,8 +34,8 @@ function addToPropertyList (projectProperties, key, value) {
 }
 
 function removeFromPropertyList (projectProperties, key, value) {
-    var i = 1;
-    var currentValue;
+    let i = 1;
+    let currentValue;
     while ((currentValue = projectProperties.get(key + '.' + i))) {
         if (currentValue === value) {
             while ((currentValue = projectProperties.get(key + '.' + (i + 1)))) {
@@ -51,7 +51,7 @@ function removeFromPropertyList (projectProperties, key, value) {
 }
 
 function getRelativeLibraryPath (parentDir, subDir) {
-    var libraryPath = path.relative(parentDir, subDir);
+    const libraryPath = path.relative(parentDir, subDir);
     return (path.sep === '\\') ? libraryPath.replace(/\\/g, '/') : libraryPath;
 }
 
@@ -63,36 +63,36 @@ class AndroidProject {
         this.projectDir = projectDir;
         this.platformWww = path.join(this.projectDir, 'platform_www');
         this.www = path.join(this.projectDir, 'app/src/main/assets/www');
+        this.cordovaGradleConfigParser = CordovaGradleConfigParserFactory.create(this.projectDir);
     }
 
     /**
-     * Reads the package name out of the Android Manifest file
+     * Reads the package name out of the Cordova's Gradle Config file
      *
      * @param   {String}  projectDir  The absolute path to the directory containing the project
      * @return  {String}              The name of the package
      */
     getPackageName () {
-        var manifestPath = path.join(this.projectDir, 'app/src/main/AndroidManifest.xml');
-        return new AndroidManifest(manifestPath).getPackageId();
+        return this.cordovaGradleConfigParser.getPackageName();
     }
 
     getCustomSubprojectRelativeDir (plugin_id, src) {
         // All custom subprojects are prefixed with the last portion of the package id.
         // This is to avoid collisions when opening multiple projects in Eclipse that have subprojects with the same name.
-        var packageName = this.getPackageName();
-        var lastDotIndex = packageName.lastIndexOf('.');
-        var prefix = packageName.substring(lastDotIndex + 1);
-        var subRelativeDir = path.join(plugin_id, prefix + '-' + path.basename(src));
+        const packageName = this.getPackageName();
+        const lastDotIndex = packageName.lastIndexOf('.');
+        const prefix = packageName.substring(lastDotIndex + 1);
+        const subRelativeDir = path.join(plugin_id, prefix + '-' + path.basename(src));
         return subRelativeDir;
     }
 
     addSubProject (parentDir, subDir) {
-        var parentProjectFile = path.resolve(parentDir, 'project.properties');
-        var subProjectFile = path.resolve(subDir, 'project.properties');
-        var parentProperties = this._getPropertiesFile(parentProjectFile);
+        const parentProjectFile = path.resolve(parentDir, 'project.properties');
+        const subProjectFile = path.resolve(subDir, 'project.properties');
+        const parentProperties = this._getPropertiesFile(parentProjectFile);
         // TODO: Setting the target needs to happen only for pre-3.7.0 projects
         if (fs.existsSync(subProjectFile)) {
-            var subProperties = this._getPropertiesFile(subProjectFile);
+            const subProperties = this._getPropertiesFile(subProjectFile);
             subProperties.set('target', parentProperties.get('target'));
             subProperties.dirty = true;
             this._subProjectDirs[subDir] = true;
@@ -103,37 +103,37 @@ class AndroidProject {
     }
 
     removeSubProject (parentDir, subDir) {
-        var parentProjectFile = path.resolve(parentDir, 'project.properties');
-        var parentProperties = this._getPropertiesFile(parentProjectFile);
+        const parentProjectFile = path.resolve(parentDir, 'project.properties');
+        const parentProperties = this._getPropertiesFile(parentProjectFile);
         removeFromPropertyList(parentProperties, 'android.library.reference', getRelativeLibraryPath(parentDir, subDir));
         delete this._subProjectDirs[subDir];
         this._dirty = true;
     }
 
     addGradleReference (parentDir, subDir) {
-        var parentProjectFile = path.resolve(parentDir, 'project.properties');
-        var parentProperties = this._getPropertiesFile(parentProjectFile);
+        const parentProjectFile = path.resolve(parentDir, 'project.properties');
+        const parentProperties = this._getPropertiesFile(parentProjectFile);
         addToPropertyList(parentProperties, 'cordova.gradle.include', getRelativeLibraryPath(parentDir, subDir));
         this._dirty = true;
     }
 
     removeGradleReference (parentDir, subDir) {
-        var parentProjectFile = path.resolve(parentDir, 'project.properties');
-        var parentProperties = this._getPropertiesFile(parentProjectFile);
+        const parentProjectFile = path.resolve(parentDir, 'project.properties');
+        const parentProperties = this._getPropertiesFile(parentProjectFile);
         removeFromPropertyList(parentProperties, 'cordova.gradle.include', getRelativeLibraryPath(parentDir, subDir));
         this._dirty = true;
     }
 
     addSystemLibrary (parentDir, value) {
-        var parentProjectFile = path.resolve(parentDir, 'project.properties');
-        var parentProperties = this._getPropertiesFile(parentProjectFile);
+        const parentProjectFile = path.resolve(parentDir, 'project.properties');
+        const parentProperties = this._getPropertiesFile(parentProjectFile);
         addToPropertyList(parentProperties, 'cordova.system.library', value);
         this._dirty = true;
     }
 
     removeSystemLibrary (parentDir, value) {
-        var parentProjectFile = path.resolve(parentDir, 'project.properties');
-        var parentProperties = this._getPropertiesFile(parentProjectFile);
+        const parentProjectFile = path.resolve(parentDir, 'project.properties');
+        const parentProperties = this._getPropertiesFile(parentProjectFile);
         removeFromPropertyList(parentProperties, 'cordova.system.library', value);
         this._dirty = true;
     }
@@ -144,8 +144,8 @@ class AndroidProject {
         }
         this._dirty = false;
 
-        for (var filename in this._propertiesEditors) {
-            var editor = this._propertiesEditors[filename];
+        for (const filename in this._propertiesEditors) {
+            const editor = this._propertiesEditors[filename];
             if (editor.dirty) {
                 fs.writeFileSync(filename, editor.toString());
                 editor.dirty = false;
@@ -165,7 +165,7 @@ class AndroidProject {
      * This checks if an Android project is clean or has old build artifacts
      */
     isClean () {
-        var build_path = path.join(this.projectDir, 'build');
+        const build_path = path.join(this.projectDir, 'build');
         // If the build directory doesn't exist, it's clean
         return !(fs.existsSync(build_path));
     }

lib/Api.js

@@ -1,386 +1,386 @@
-/**
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-*/
-
-/**
- * @todo update coho to update this line.
- * @todo use `package.json` instead but first
- *  figure out how this fit in with the platform-centered workflow structure.
- *  This workflow would not have the `package.json` file.
- */
-// Coho updates this line
-const VERSION = '9.1.1';
-
-var path = require('path');
-
-var AndroidProject = require('./lib/AndroidProject');
-var PluginManager = require('cordova-common').PluginManager;
-
-var CordovaLogger = require('cordova-common').CordovaLogger;
-var selfEvents = require('cordova-common').events;
-var ConfigParser = require('cordova-common').ConfigParser;
-const prepare = require('./lib/prepare').prepare;
-
-var PLATFORM = 'android';
-
-function setupEvents (externalEventEmitter) {
-    if (externalEventEmitter) {
-        // This will make the platform internal events visible outside
-        selfEvents.forwardEventsTo(externalEventEmitter);
-        return externalEventEmitter;
-    }
-
-    // There is no logger if external emitter is not present,
-    // so attach a console logger
-    CordovaLogger.get().subscribe(selfEvents);
-    return selfEvents;
-}
-
-/**
- * Class, that acts as abstraction over particular platform. Encapsulates the
- *   platform's properties and methods.
- *
- * Platform that implements own PlatformApi instance _should implement all
- *   prototype methods_ of this class to be fully compatible with cordova-lib.
- *
- * The PlatformApi instance also should define the following field:
- *
- * * platform: String that defines a platform name.
- * @class Api
- */
-class Api {
-    constructor (platform, platformRootDir, events) {
-        this.platform = PLATFORM;
-        this.root = path.resolve(__dirname, '..');
-
-        setupEvents(events);
-
-        const appMain = path.join(this.root, 'app', 'src', 'main');
-        const appRes = path.join(appMain, 'res');
-
-        this.locations = {
-            root: this.root,
-            www: path.join(appMain, 'assets', 'www'),
-            res: appRes,
-            platformWww: path.join(this.root, 'platform_www'),
-            configXml: path.join(appRes, 'xml', 'config.xml'),
-            defaultConfigXml: path.join(this.root, 'cordova', 'defaults.xml'),
-            strings: path.join(appRes, 'values', 'strings.xml'),
-            manifest: path.join(appMain, 'AndroidManifest.xml'),
-            build: path.join(this.root, 'build'),
-            javaSrc: path.join(appMain, 'java')
-        };
-
-        this._builder = require('./lib/builders/builders').getBuilder(this.root);
-    }
-
-    /**
-     * Gets a CordovaPlatform object, that represents the platform structure.
-     *
-     * @return  {CordovaPlatform}  A structure that contains the description of
-     *   platform's file structure and other properties of platform.
-     */
-    getPlatformInfo () {
-        var result = {};
-        result.locations = this.locations;
-        result.root = this.root;
-        result.name = this.platform;
-        result.version = Api.version();
-        result.projectConfig = this._config;
-
-        return result;
-    }
-
-    /**
-     * Updates installed platform with provided www assets and new app
-     *   configuration. This method is required for CLI workflow and will be called
-     *   each time before build, so the changes, made to app configuration and www
-     *   code, will be applied to platform.
-     *
-     * @param {CordovaProject} cordovaProject A CordovaProject instance, that defines a
-     *   project structure and configuration, that should be applied to platform
-     *   (contains project's www location and ConfigParser instance for project's
-     *   config).
-     *
-     * @return  {Promise}  Return a promise either fulfilled, or rejected with
-     *   CordovaError instance.
-     */
-    prepare (cordovaProject, prepareOptions) {
-        cordovaProject.projectConfig = new ConfigParser(cordovaProject.locations.rootConfigXml || cordovaProject.projectConfig.path);
-
-        return prepare.call(this, cordovaProject, prepareOptions);
-    }
-
-    /**
-     * Installs a new plugin into platform. This method only copies non-www files
-     *   (sources, libs, etc.) to platform. It also doesn't resolves the
-     *   dependencies of plugin. Both of handling of www files, such as assets and
-     *   js-files and resolving dependencies are the responsibility of caller.
-     *
-     * @param  {PluginInfo}  plugin  A PluginInfo instance that represents plugin
-     *   that will be installed.
-     * @param  {Object}  installOptions  An options object. Possible options below:
-     * @param  {Boolean}  installOptions.link: Flag that specifies that plugin
-     *   sources will be symlinked to app's directory instead of copying (if
-     *   possible).
-     * @param  {Object}  installOptions.variables  An object that represents
-     *   variables that will be used to install plugin. See more details on plugin
-     *   variables in documentation:
-     *   https://cordova.apache.org/docs/en/4.0.0/plugin_ref_spec.md.html
-     *
-     * @return  {Promise}  Return a promise either fulfilled, or rejected with
-     *   CordovaError instance.
-     */
-    addPlugin (plugin, installOptions) {
-        var project = AndroidProject.getProjectFile(this.root);
-        var self = this;
-
-        installOptions = installOptions || {};
-        installOptions.variables = installOptions.variables || {};
-        // Add PACKAGE_NAME variable into vars
-        if (!installOptions.variables.PACKAGE_NAME) {
-            installOptions.variables.PACKAGE_NAME = project.getPackageName();
-        }
-
-        return Promise.resolve().then(function () {
-            return PluginManager.get(self.platform, self.locations, project).addPlugin(plugin, installOptions);
-        }).then(function () {
-            if (plugin.getFrameworks(this.platform).length === 0) return;
-            selfEvents.emit('verbose', 'Updating build files since android plugin contained <framework>');
-            // This should pick the correct builder, not just get gradle
-            this._builder.prepBuildFiles();
-        }.bind(this))
-            // CB-11022 Return truthy value to prevent running prepare after
-            .then(() => true);
-    }
-
-    /**
-     * Removes an installed plugin from platform.
-     *
-     * Since method accepts PluginInfo instance as input parameter instead of plugin
-     *   id, caller shoud take care of managing/storing PluginInfo instances for
-     *   future uninstalls.
-     *
-     * @param  {PluginInfo}  plugin  A PluginInfo instance that represents plugin
-     *   that will be installed.
-     *
-     * @return  {Promise}  Return a promise either fulfilled, or rejected with
-     *   CordovaError instance.
-     */
-    removePlugin (plugin, uninstallOptions) {
-        var project = AndroidProject.getProjectFile(this.root);
-
-        if (uninstallOptions && uninstallOptions.usePlatformWww === true) {
-            uninstallOptions.usePlatformWww = false;
-        }
-
-        return PluginManager.get(this.platform, this.locations, project)
-            .removePlugin(plugin, uninstallOptions)
-            .then(function () {
-                if (plugin.getFrameworks(this.platform).length === 0) return;
-
-                selfEvents.emit('verbose', 'Updating build files since android plugin contained <framework>');
-                this._builder.prepBuildFiles();
-            }.bind(this))
-            // CB-11022 Return truthy value to prevent running prepare after
-            .then(() => true);
-    }
-
-    /**
-     * Builds an application package for current platform.
-     *
-     * @param  {Object}  buildOptions  A build options. This object's structure is
-     *   highly depends on platform's specific. The most common options are:
-     * @param  {Boolean}  buildOptions.debug  Indicates that packages should be
-     *   built with debug configuration. This is set to true by default unless the
-     *   'release' option is not specified.
-     * @param  {Boolean}  buildOptions.release  Indicates that packages should be
-     *   built with release configuration. If not set to true, debug configuration
-     *   will be used.
-     * @param   {Boolean}  buildOptions.device  Specifies that built app is intended
-     *   to run on device
-     * @param   {Boolean}  buildOptions.emulator: Specifies that built app is
-     *   intended to run on emulator
-     * @param   {String}  buildOptions.target  Specifies the device id that will be
-     *   used to run built application.
-     * @param   {Boolean}  buildOptions.nobuild  Indicates that this should be a
-     *   dry-run call, so no build artifacts will be produced.
-     * @param   {String[]}  buildOptions.archs  Specifies chip architectures which
-     *   app packages should be built for. List of valid architectures is depends on
-     *   platform.
-     * @param   {String}  buildOptions.buildConfig  The path to build configuration
-     *   file. The format of this file is depends on platform.
-     * @param   {String[]} buildOptions.argv Raw array of command-line arguments,
-     *   passed to `build` command. The purpose of this property is to pass a
-     *   platform-specific arguments, and eventually let platform define own
-     *   arguments processing logic.
-     *
-     * @return {Promise<Object[]>} A promise either fulfilled with an array of build
-     *   artifacts (application packages) if package was built successfully,
-     *   or rejected with CordovaError. The resultant build artifact objects is not
-     *   strictly typed and may conatin arbitrary set of fields as in sample below.
-     *
-     *     {
-     *         architecture: 'x86',
-     *         buildType: 'debug',
-     *         path: '/path/to/build',
-     *         type: 'app'
-     *     }
-     *
-     * The return value in most cases will contain only one item but in some cases
-     *   there could be multiple items in output array, e.g. when multiple
-     *   arhcitectures is specified.
-     */
-    build (buildOptions) {
-        var self = this;
-
-        return require('./lib/check_reqs').run().then(function () {
-            return require('./lib/build').run.call(self, buildOptions);
-        }).then(function (buildResults) {
-            // Cast build result to array of build artifacts
-            return buildResults.paths.map(function (apkPath) {
-                return {
-                    buildType: buildResults.buildType,
-                    buildMethod: buildResults.buildMethod,
-                    path: apkPath,
-                    type: path.extname(apkPath).replace(/\./g, '')
-                };
-            });
-        });
-    }
-
-    /**
-     * Builds an application package for current platform and runs it on
-     *   specified/default device. If no 'device'/'emulator'/'target' options are
-     *   specified, then tries to run app on default device if connected, otherwise
-     *   runs the app on emulator.
-     *
-     * @param   {Object}  runOptions  An options object. The structure is the same
-     *   as for build options.
-     *
-     * @return {Promise} A promise either fulfilled if package was built and ran
-     *   successfully, or rejected with CordovaError.
-     */
-    run (runOptions) {
-        var self = this;
-        return require('./lib/check_reqs').run().then(function () {
-            return require('./lib/run').run.call(self, runOptions);
-        });
-    }
-
-    /**
-     * Cleans out the build artifacts from platform's directory, and also
-     * cleans out the platform www directory if called without options specified.
-     *
-     * @return  {Promise}  Return a promise either fulfilled, or rejected with
-     *   CordovaError.
-     */
-    clean (cleanOptions) {
-        var self = this;
-        // This will lint, checking for null won't
-        if (typeof cleanOptions === 'undefined') {
-            cleanOptions = {};
-        }
-
-        return require('./lib/check_reqs').run().then(function () {
-            return require('./lib/build').runClean.call(self, cleanOptions);
-        }).then(function () {
-            return require('./lib/prepare').clean.call(self, cleanOptions);
-        });
-    }
-
-    /**
-     * Performs a requirements check for current platform. Each platform defines its
-     *   own set of requirements, which should be resolved before platform can be
-     *   built successfully.
-     *
-     * @return  {Promise<Requirement[]>}  Promise, resolved with set of Requirement
-     *   objects for current platform.
-     */
-    requirements () {
-        return require('./lib/check_reqs').check_all();
-    }
-
-    /**
-     * Installs platform to specified directory and creates a platform project.
-     *
-     * @param  {String}  destination Destination directory, where insatll platform to
-     * @param  {ConfigParser}  [config] ConfgiParser instance, used to retrieve
-     *   project creation options, such as package id and project name.
-     * @param  {Object}  [options]  An options object. The most common options are:
-     * @param  {String}  [options.customTemplate]  A path to custom template, that
-     *   should override the default one from platform.
-     * @param  {Boolean}  [options.link]  Flag that indicates that platform's
-     *   sources will be linked to installed platform instead of copying.
-     * @param {EventEmitter} [events] An EventEmitter instance that will be used for
-     *   logging purposes. If no EventEmitter provided, all events will be logged to
-     *   console
-     *
-     * @return {Promise<PlatformApi>} Promise either fulfilled with PlatformApi
-     *   instance or rejected with CordovaError.
-     */
-    static createPlatform (destination, config, options, events) {
-        events = setupEvents(events);
-        var result;
-        try {
-            result = require('../../lib/create').create(destination, config, options, events).then(function (destination) {
-                return new Api(PLATFORM, destination, events);
-            });
-        } catch (e) {
-            events.emit('error', 'createPlatform is not callable from the android project API.');
-            throw (e);
-        }
-        return result;
-    }
-
-    /**
-     * Updates already installed platform.
-     *
-     * @param  {String}  destination Destination directory, where platform installed
-     * @param  {Object}  [options]  An options object. The most common options are:
-     * @param  {String}  [options.customTemplate]  A path to custom template, that
-     *   should override the default one from platform.
-     * @param  {Boolean}  [options.link]  Flag that indicates that platform's
-     *   sources will be linked to installed platform instead of copying.
-     * @param {EventEmitter} [events] An EventEmitter instance that will be used for
-     *   logging purposes. If no EventEmitter provided, all events will be logged to
-     *   console
-     *
-     * @return {Promise<PlatformApi>} Promise either fulfilled with PlatformApi
-     *   instance or rejected with CordovaError.
-     */
-    static updatePlatform (destination, options, events) {
-        events = setupEvents(events);
-        var result;
-        try {
-            result = require('../../lib/create').update(destination, options, events).then(function (destination) {
-                return new Api(PLATFORM, destination, events);
-            });
-        } catch (e) {
-            events.emit('error', 'updatePlatform is not callable from the android project API, you will need to do this manually.');
-            throw (e);
-        }
-        return result;
-    }
-
-    static version () {
-        return VERSION;
-    }
-}
-
-module.exports = Api;
+/**
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+*/
+
+const path = require('path');
+
+const AndroidProject = require('./AndroidProject');
+const PluginManager = require('cordova-common').PluginManager;
+
+const CordovaLogger = require('cordova-common').CordovaLogger;
+const selfEvents = require('cordova-common').events;
+const ConfigParser = require('cordova-common').ConfigParser;
+const prepare = require('./prepare').prepare;
+
+const PLATFORM = 'android';
+const VERSION = require('../package').version;
+
+function setupEvents (externalEventEmitter) {
+    if (externalEventEmitter) {
+        // This will make the platform internal events visible outside
+        selfEvents.forwardEventsTo(externalEventEmitter);
+        return externalEventEmitter;
+    }
+
+    // There is no logger if external emitter is not present,
+    // so attach a console logger
+    CordovaLogger.get().subscribe(selfEvents);
+    return selfEvents;
+}
+
+/**
+ * Class, that acts as abstraction over particular platform. Encapsulates the
+ *   platform's properties and methods.
+ *
+ * Platform that implements own PlatformApi instance _should implement all
+ *   prototype methods_ of this class to be fully compatible with cordova-lib.
+ *
+ * The PlatformApi instance also should define the following field:
+ *
+ * * platform: String that defines a platform name.
+ * @class Api
+ */
+class Api {
+    constructor (platform, platformRootDir, events) {
+        this.platform = PLATFORM;
+        this.root = platformRootDir;
+
+        setupEvents(events);
+
+        const appMain = path.join(this.root, 'app', 'src', 'main');
+        const appRes = path.join(appMain, 'res');
+
+        this.locations = {
+            root: this.root,
+            www: path.join(appMain, 'assets', 'www'),
+            res: appRes,
+            platformWww: path.join(this.root, 'platform_www'),
+            configXml: path.join(appRes, 'xml', 'config.xml'),
+            defaultConfigXml: path.join(this.root, 'cordova', 'defaults.xml'),
+            strings: path.join(appRes, 'values', 'strings.xml'),
+            themes: path.join(appRes, 'values', 'themes.xml'),
+            colors: path.join(appRes, 'values', 'colors.xml'),
+            manifest: path.join(appMain, 'AndroidManifest.xml'),
+            build: path.join(this.root, 'build'),
+            javaSrc: path.join(appMain, 'java')
+        };
+
+        this._builder = require('./builders/builders').getBuilder(this.root);
+    }
+
+    /**
+     * Gets a CordovaPlatform object, that represents the platform structure.
+     *
+     * @return  {CordovaPlatform}  A structure that contains the description of
+     *   platform's file structure and other properties of platform.
+     */
+    getPlatformInfo () {
+        const result = {};
+        result.locations = this.locations;
+        result.root = this.root;
+        result.name = this.platform;
+        result.version = Api.version();
+        result.projectConfig = this._config;
+
+        return result;
+    }
+
+    /**
+     * Updates installed platform with provided www assets and new app
+     *   configuration. This method is required for CLI workflow and will be called
+     *   each time before build, so the changes, made to app configuration and www
+     *   code, will be applied to platform.
+     *
+     * @param {CordovaProject} cordovaProject A CordovaProject instance, that defines a
+     *   project structure and configuration, that should be applied to platform
+     *   (contains project's www location and ConfigParser instance for project's
+     *   config).
+     *
+     * @return  {Promise}  Return a promise either fulfilled, or rejected with
+     *   CordovaError instance.
+     */
+    prepare (cordovaProject, prepareOptions) {
+        cordovaProject.projectConfig = new ConfigParser(cordovaProject.locations.rootConfigXml || cordovaProject.projectConfig.path);
+
+        return prepare.call(this, cordovaProject, prepareOptions);
+    }
+
+    /**
+     * Installs a new plugin into platform. This method only copies non-www files
+     *   (sources, libs, etc.) to platform. It also doesn't resolves the
+     *   dependencies of plugin. Both of handling of www files, such as assets and
+     *   js-files and resolving dependencies are the responsibility of caller.
+     *
+     * @param  {PluginInfo}  plugin  A PluginInfo instance that represents plugin
+     *   that will be installed.
+     * @param  {Object}  installOptions  An options object. Possible options below:
+     * @param  {Boolean}  installOptions.link: Flag that specifies that plugin
+     *   sources will be symlinked to app's directory instead of copying (if
+     *   possible).
+     * @param  {Object}  installOptions.variables  An object that represents
+     *   variables that will be used to install plugin. See more details on plugin
+     *   variables in documentation:
+     *   https://cordova.apache.org/docs/en/4.0.0/plugin_ref_spec.md.html
+     *
+     * @return  {Promise}  Return a promise either fulfilled, or rejected with
+     *   CordovaError instance.
+     */
+    addPlugin (plugin, installOptions) {
+        const project = AndroidProject.getProjectFile(this.root);
+        const self = this;
+
+        installOptions = installOptions || {};
+        installOptions.variables = installOptions.variables || {};
+        // Add PACKAGE_NAME variable into vars
+        if (!installOptions.variables.PACKAGE_NAME) {
+            installOptions.variables.PACKAGE_NAME = project.getPackageName();
+        }
+
+        return Promise.resolve().then(function () {
+            return PluginManager.get(self.platform, self.locations, project).addPlugin(plugin, installOptions);
+        }).then(function () {
+            if (plugin.getFrameworks(this.platform).length === 0) return;
+            selfEvents.emit('verbose', 'Updating build files since android plugin contained <framework>');
+            // This should pick the correct builder, not just get gradle
+            this._builder.prepBuildFiles();
+        }.bind(this))
+            // CB-11022 Return truthy value to prevent running prepare after
+            .then(() => true);
+    }
+
+    /**
+     * Removes an installed plugin from platform.
+     *
+     * Since method accepts PluginInfo instance as input parameter instead of plugin
+     *   id, caller shoud take care of managing/storing PluginInfo instances for
+     *   future uninstalls.
+     *
+     * @param  {PluginInfo}  plugin  A PluginInfo instance that represents plugin
+     *   that will be installed.
+     *
+     * @return  {Promise}  Return a promise either fulfilled, or rejected with
+     *   CordovaError instance.
+     */
+    removePlugin (plugin, uninstallOptions) {
+        const project = AndroidProject.getProjectFile(this.root);
+
+        if (uninstallOptions && uninstallOptions.usePlatformWww === true) {
+            uninstallOptions.usePlatformWww = false;
+        }
+
+        return PluginManager.get(this.platform, this.locations, project)
+            .removePlugin(plugin, uninstallOptions)
+            .then(function () {
+                if (plugin.getFrameworks(this.platform).length === 0) return;
+
+                selfEvents.emit('verbose', 'Updating build files since android plugin contained <framework>');
+                this._builder.prepBuildFiles();
+            }.bind(this))
+            // CB-11022 Return truthy value to prevent running prepare after
+            .then(() => true);
+    }
+
+    /**
+     * Builds an application package for current platform.
+     *
+     * @param  {Object}  buildOptions  A build options. This object's structure is
+     *   highly depends on platform's specific. The most common options are:
+     * @param  {Boolean}  buildOptions.debug  Indicates that packages should be
+     *   built with debug configuration. This is set to true by default unless the
+     *   'release' option is not specified.
+     * @param  {Boolean}  buildOptions.release  Indicates that packages should be
+     *   built with release configuration. If not set to true, debug configuration
+     *   will be used.
+     * @param   {Boolean}  buildOptions.device  Specifies that built app is intended
+     *   to run on device
+     * @param   {Boolean}  buildOptions.emulator: Specifies that built app is
+     *   intended to run on emulator
+     * @param   {String}  buildOptions.target  Specifies the device id that will be
+     *   used to run built application.
+     * @param   {Boolean}  buildOptions.nobuild  Indicates that this should be a
+     *   dry-run call, so no build artifacts will be produced.
+     * @param   {String[]}  buildOptions.archs  Specifies chip architectures which
+     *   app packages should be built for. List of valid architectures is depends on
+     *   platform.
+     * @param   {String}  buildOptions.buildConfig  The path to build configuration
+     *   file. The format of this file is depends on platform.
+     * @param   {String[]} buildOptions.argv Raw array of command-line arguments,
+     *   passed to `build` command. The purpose of this property is to pass a
+     *   platform-specific arguments, and eventually let platform define own
+     *   arguments processing logic.
+     *
+     * @return {Promise<Object[]>} A promise either fulfilled with an array of build
+     *   artifacts (application packages) if package was built successfully,
+     *   or rejected with CordovaError. The resultant build artifact objects is not
+     *   strictly typed and may conatin arbitrary set of fields as in sample below.
+     *
+     *     {
+     *         architecture: 'x86',
+     *         buildType: 'debug',
+     *         path: '/path/to/build',
+     *         type: 'app'
+     *     }
+     *
+     * The return value in most cases will contain only one item but in some cases
+     *   there could be multiple items in output array, e.g. when multiple
+     *   arhcitectures is specified.
+     */
+    build (buildOptions) {
+        const self = this;
+
+        return require('./check_reqs').run().then(function () {
+            return require('./build').run.call(self, buildOptions);
+        }).then(function (buildResults) {
+            // Cast build result to array of build artifacts
+            return buildResults.paths.map(function (apkPath) {
+                return {
+                    buildType: buildResults.buildType,
+                    buildMethod: buildResults.buildMethod,
+                    path: apkPath,
+                    type: path.extname(apkPath).replace(/\./g, '')
+                };
+            });
+        });
+    }
+
+    /**
+     * Builds an application package for current platform and runs it on
+     *   specified/default device. If no 'device'/'emulator'/'target' options are
+     *   specified, then tries to run app on default device if connected, otherwise
+     *   runs the app on emulator.
+     *
+     * @param   {Object}  runOptions  An options object. The structure is the same
+     *   as for build options.
+     *
+     * @return {Promise} A promise either fulfilled if package was built and ran
+     *   successfully, or rejected with CordovaError.
+     */
+    run (runOptions) {
+        const self = this;
+        return require('./check_reqs').run().then(function () {
+            return require('./run').run.call(self, runOptions);
+        });
+    }
+
+    listTargets (options) {
+        return require('./check_reqs').check_android().then(() => {
+            return require('./run').runListDevices.call(this, options);
+        });
+    }
+
+    /**
+     * Cleans out the build artifacts from platform's directory, and also
+     * cleans out the platform www directory if called without options specified.
+     *
+     * @return  {Promise}  Return a promise either fulfilled, or rejected with
+     *   CordovaError.
+     */
+    clean (cleanOptions) {
+        const self = this;
+        // This will lint, checking for null won't
+        if (typeof cleanOptions === 'undefined') {
+            cleanOptions = {};
+        }
+
+        return require('./check_reqs').run().then(function () {
+            return require('./build').runClean.call(self, cleanOptions);
+        }).then(function () {
+            return require('./prepare').clean.call(self, cleanOptions);
+        });
+    }
+
+    /**
+     * Performs a requirements check for current platform. Each platform defines its
+     *   own set of requirements, which should be resolved before platform can be
+     *   built successfully.
+     *
+     * @return  {Promise<Requirement[]>}  Promise, resolved with set of Requirement
+     *   objects for current platform.
+     */
+    requirements () {
+        return require('./check_reqs').check_all(this.root);
+    }
+
+    /**
+     * Installs platform to specified directory and creates a platform project.
+     *
+     * @param  {String}  destination Destination directory, where insatll platform to
+     * @param  {ConfigParser}  [config] ConfgiParser instance, used to retrieve
+     *   project creation options, such as package id and project name.
+     * @param  {Object}  [options]  An options object. The most common options are:
+     * @param  {String}  [options.customTemplate]  A path to custom template, that
+     *   should override the default one from platform.
+     * @param  {Boolean}  [options.link]  Flag that indicates that platform's
+     *   sources will be linked to installed platform instead of copying.
+     * @param {EventEmitter} [events] An EventEmitter instance that will be used for
+     *   logging purposes. If no EventEmitter provided, all events will be logged to
+     *   console
+     *
+     * @return {Promise<PlatformApi>} Promise either fulfilled with PlatformApi
+     *   instance or rejected with CordovaError.
+     */
+    static createPlatform (destination, config, options, events) {
+        events = setupEvents(events);
+        let result;
+        try {
+            result = require('./create').create(destination, config, options, events).then(function (destination) {
+                return new Api(PLATFORM, destination, events);
+            });
+        } catch (e) {
+            events.emit('error', 'createPlatform is not callable from the android project API.');
+            throw (e);
+        }
+        return result;
+    }
+
+    /**
+     * Updates already installed platform.
+     *
+     * @param  {String}  destination Destination directory, where platform installed
+     * @param  {Object}  [options]  An options object. The most common options are:
+     * @param  {String}  [options.customTemplate]  A path to custom template, that
+     *   should override the default one from platform.
+     * @param  {Boolean}  [options.link]  Flag that indicates that platform's
+     *   sources will be linked to installed platform instead of copying.
+     * @param {EventEmitter} [events] An EventEmitter instance that will be used for
+     *   logging purposes. If no EventEmitter provided, all events will be logged to
+     *   console
+     *
+     * @return {Promise<PlatformApi>} Promise either fulfilled with PlatformApi
+     *   instance or rejected with CordovaError.
+     */
+    static updatePlatform (destination, options, events) {
+        events = setupEvents(events);
+        let result;
+        try {
+            result = require('../../lib/create').update(destination, options, events).then(function (destination) {
+                return new Api(PLATFORM, destination, events);
+            });
+        } catch (e) {
+            events.emit('error', 'updatePlatform is not callable from the android project API, you will need to do this manually.');
+            throw (e);
+        }
+        return result;
+    }
+
+    static version () {
+        return VERSION;
+    }
+}
+
+module.exports = Api;

lib/android_sdk.js

@@ -19,7 +19,7 @@
 
 const execa = require('execa');
 
-var suffix_number_regex = /(\d+)$/;
+const suffix_number_regex = /(\d+)$/;
 // Used for sorting Android targets, example strings to sort:
 //   android-19
 //   android-L
@@ -66,9 +66,9 @@ module.exports.version_string_to_api_level = {
 /* eslint-enable quote-props */
 
 function parse_targets (output) {
-    var target_out = output.split('\n');
-    var targets = [];
-    for (var i = target_out.length - 1; i >= 0; i--) {
+    const target_out = output.split('\n');
+    const targets = [];
+    for (let i = target_out.length - 1; i >= 0; i--) {
         if (target_out[i].match(/id:/)) { // if "id:" is in the line...
             targets.push(target_out[i].match(/"(.+)"/)[1]); // .. match whatever is in quotes.
         }
@@ -76,23 +76,12 @@ function parse_targets (output) {
     return targets;
 }
 
-module.exports.list_targets_with_android = function () {
-    return execa('android', ['list', 'target']).then(result => parse_targets(result.stdout));
-};
-
 module.exports.list_targets_with_avdmanager = function () {
     return execa('avdmanager', ['list', 'target']).then(result => parse_targets(result.stdout));
 };
 
 module.exports.list_targets = function () {
-    return module.exports.list_targets_with_avdmanager().catch(function (err) {
-        // If there's an error, like avdmanager could not be found, we can try
-        // as a last resort, to run `android`, in case this is a super old
-        // SDK installation.
-        if (err && (err.code === 'ENOENT' || (err.stderr && err.stderr.match(/not recognized/)))) {
-            return module.exports.list_targets_with_android();
-        } else throw err;
-    }).then(function (targets) {
+    return module.exports.list_targets_with_avdmanager().then(function (targets) {
         if (targets.length === 0) {
             return Promise.reject(new Error('No android targets (SDKs) installed!'));
         }