Browse Source
Update to new android cordova build
Signed-off-by: Chris Cromer <chris@cromer.cl>tags/1.1.1
100 changed files with 741 additions and 3397 deletions
+ 0
- 2
config.xml
View File
| @@ -36,6 +36,4 @@ | |||
| <allow-intent href="itms-apps:*" /> | |||
| </platform> | |||
| <plugin name="cordova-plugin-splashscreen" spec="^5.0.2" /> | |||
| <engine name="browser" spec="^5.0.4" /> | |||
| <engine name="android" spec="^7.1.4" /> | |||
| </widget> | |||
+ 2
- 1
node_modules/cordova-android/.eslintignore
View File
| @@ -1 +1,2 @@ | |||
| bin/templates/project/assets/www/cordova.js | |||
| bin/templates/project/assets/www/cordova.js | |||
| test/app | |||
+ 20
- 7
node_modules/cordova-android/.github/PULL_REQUEST_TEMPLATE.md
View File
| @@ -1,6 +1,5 @@ | |||
| <!-- | |||
| Please make sure the checklist boxes are all checked before submitting the PR. The checklist | |||
| is intended as a quick reference, for complete details please see our Contributor Guidelines: | |||
| Please make sure the checklist boxes are all checked before submitting the PR. The checklist is intended as a quick reference, for complete details please see our Contributor Guidelines: | |||
| http://cordova.apache.org/contribute/contribute_guidelines.html | |||
| @@ -10,13 +9,27 @@ Thanks! | |||
| ### Platforms affected | |||
| ### What does this PR do? | |||
| ### Motivation and Context | |||
| <!-- Why is this change required? What problem does it solve? --> | |||
| <!-- If it fixes an open issue, please link to the issue here. --> | |||
| ### Description | |||
| <!-- Describe your changes in detail --> | |||
| ### Testing | |||
| <!-- Please describe in detail how you tested your changes. --> | |||
| ### What testing has been done on this change? | |||
| ### Checklist | |||
| - [ ] [Reported an issue](http://cordova.apache.org/contribute/issues.html) in the JIRA database | |||
| - [ ] Commit message follows the format: "CB-3232: (android) Fix bug with resolving file paths", where CB-xxxx is the JIRA ID & "android" is the platform affected. | |||
| - [ ] Added automated test coverage as appropriate for this change. | |||
| - [ ] I've run the tests to see all new and existing tests pass | |||
| - [ ] I added automated test coverage as appropriate for this change | |||
| - [ ] Commit is prefixed with `(platform)` if this change only applies to one platform (e.g. `(android)`) | |||
| - [ ] If this Pull Request resolves an issue, I linked to the issue in the text above (and used the correct [keyword to close issues using keywords](https://help.github.com/articles/closing-issues-using-keywords/)) | |||
| - [ ] I've updated the documentation if necessary | |||
+ 23
- 14
node_modules/cordova-android/.travis.yml
View File
| @@ -2,27 +2,36 @@ language: android | |||
| sudo: false | |||
| jdk: | |||
| - oraclejdk8 | |||
| env: | |||
| global: | |||
| - ANDROID_TOOLS=${ANDROID_HOME}/tools | |||
| before_install: | |||
| - nvm install 6 | |||
| # ensure at least gradle 3.3 is in place. | |||
| - wget http://services.gradle.org/distributions/gradle-3.3-bin.zip | |||
| - unzip gradle-3.3-bin.zip | |||
| - export GRADLE_HOME=$PWD/gradle-3.3 | |||
| - export PATH=${GRADLE_HOME}/bin:${ANDROID_HOME}:${ANDROID_HOME}/emulator:${ANDROID_TOOLS}:${ANDROID_TOOLS}/bin:${ANDROID_HOME}/platform-tools:$PATH | |||
| - node --version | |||
| - gradle --version | |||
| - echo y | android --silent update sdk --no-ui --all --filter platform-tools,tools,build-tools-26.0.2,android-26,android-25,extra-google-m2repository,extra-android-m2repository | |||
| android: | |||
| components: | |||
| - tools | |||
| - build-tools-28.0.3 | |||
| env: | |||
| global: | |||
| # Keep gradle from crapping all over the log | |||
| - TERM=dumb | |||
| matrix: | |||
| - nodejs_version=6 | |||
| - nodejs_version=8 | |||
| - nodejs_version=10 | |||
| install: | |||
| # Install a sdkmanager version that supports the --licenses switch and | |||
| # accept any Android SDK licenses. The output redirection prevents us from | |||
| # hitting the travis log size limit of 4MB which would fail the build. | |||
| - yes | sdkmanager tools > /dev/null | |||
| - yes | sdkmanager --licenses > /dev/null | |||
| - nvm install $nodejs_version | |||
| - npm install | |||
| - npm install -g codecov | |||
| script: | |||
| - gradle --version | |||
| - node --version | |||
| - npm --version | |||
| - npm test | |||
| - npm run cover | |||
| after_script: | |||
| - codecov | |||
+ 0
- 1
node_modules/cordova-android/CONTRIBUTING.md
View File
| @@ -30,7 +30,6 @@ For instructions on this, start with the | |||
| [contribution overview](http://cordova.apache.org/contribute/). | |||
| The details are explained there, but the important items are: | |||
| - Sign and submit an Apache ICLA (Contributor License Agreement). | |||
| - Have a Jira issue open that corresponds to your contribution. | |||
| - Run the tests so your patch doesn't break existing functionality. | |||
+ 0
- 3
node_modules/cordova-android/README.md
View File
| @@ -31,9 +31,6 @@ 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). | |||
| :warning: Report issues on the [Apache Cordova issue tracker](https://issues.apache.org/jira/issues/?jql=project%20%3D%20CB%20AND%20status%20in%20%28Open%2C%20%22In%20Progress%22%2C%20Reopened%29%20AND%20resolution%20%3D%20Unresolved%20AND%20component%20%3D%20%22Android%22%20ORDER%20BY%20priority%20DESC%2C%20summary%20ASC%2C%20updatedDate%20DESC) | |||
| ## Requires | |||
| - Java JDK 1.8 or greater | |||
+ 51
- 30
node_modules/cordova-android/RELEASENOTES.md
View File
| @@ -20,37 +20,58 @@ | |||
| --> | |||
| ## Release Notes for Cordova (Android) ## | |||
| ### 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) | |||
| ### 8.0.0 (Feb 13, 2019) | |||
| * [GH-669](https://github.com/apache/cordova-android/pull/669) Added Missing License Headers | |||
| * [GH-655](https://github.com/apache/cordova-android/pull/655) Use custom Gradle properties to read minSdkVersion value from `config.xml` | |||
| * [GH-656](https://github.com/apache/cordova-android/pull/656) Quick fix to support **Android**_SDK_ROOT | |||
| * [GH-632](https://github.com/apache/cordova-android/pull/632) Ignore more Gradle build artifacts in **Android** project | |||
| * [GH-642](https://github.com/apache/cordova-android/pull/642) **Android** tools 3.3 & **Gradle** 4.10.3 update | |||
| * [GH-654](https://github.com/apache/cordova-android/pull/654) Quick updates to top-level `project.properties` | |||
| * [GH-635](https://github.com/apache/cordova-android/pull/635) Ignore **Android** Studio `.idea` files in project | |||
| * [GH-624](https://github.com/apache/cordova-android/pull/624) Add missing log to Java version check | |||
| * [GH-630](https://github.com/apache/cordova-android/pull/630) Update `emulator.js` to fix issue [GH-608](https://github.com/apache/cordova-android/pull/608) | |||
| * [GH-626](https://github.com/apache/cordova-android/pull/626) Added `package-lock.json` to `.gitignore` | |||
| * [GH-620](https://github.com/apache/cordova-android/pull/620) Fix requirements error messages for JDK 8 | |||
| * [GH-619](https://github.com/apache/cordova-android/pull/619) javac error message fixes in requirements check | |||
| * [GH-612](https://github.com/apache/cordova-android/pull/612) Android Platform Release Preparation (Cordova 9) | |||
| * [GH-607](https://github.com/apache/cordova-android/pull/607) Copy `node_modules` if the directory exists | |||
| * [GH-582](https://github.com/apache/cordova-android/pull/582) Improve Test `README` | |||
| * [GH-589](https://github.com/apache/cordova-android/pull/589) Rewrite install dir resolution for legacy plugins | |||
| * [GH-572](https://github.com/apache/cordova-android/pull/572) Resolve issue with plugin `target-dir="app*"` subdirs | |||
| * [GH-567](https://github.com/apache/cordova-android/pull/567) Output current package name if package name can't be validated | |||
| * [GH-507](https://github.com/apache/cordova-android/pull/507) Gradle Updates | |||
| * [GH-559](https://github.com/apache/cordova-android/pull/559) Eslint ignore version file | |||
| * [GH-550](https://github.com/apache/cordova-android/pull/550) Fix for old plugins with non-Java sources | |||
| * [GH-558](https://github.com/apache/cordova-android/pull/558) Update `cordova.js` from `cordova-js@4.2.3` | |||
| * [GH-553](https://github.com/apache/cordova-android/pull/553) Check for `build-extras.gradle` in the app-parent directory | |||
| * [GH-551](https://github.com/apache/cordova-android/pull/551) Add missing cast for `cdvMinSdkVersion` | |||
| * [GH-539](https://github.com/apache/cordova-android/pull/539) Fix destination path fallback | |||
| * [GH-544](https://github.com/apache/cordova-android/pull/544) Remove obsolete check for JellyBean | |||
| * [GH-465](https://github.com/apache/cordova-android/pull/465) Removes Gradle property in-line command arguments for `gradle.properties` | |||
| * [GH-523](https://github.com/apache/cordova-android/pull/523) Always put the Google repo above jcenter | |||
| * [GH-486](https://github.com/apache/cordova-android/pull/486) Change deprecated "compile" to "implementation" | |||
| * [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 | |||
| * [GH-493](https://github.com/apache/cordova-android/pull/493) Remove bundled dependencies | |||
| * [GH-490](https://github.com/apache/cordova-android/pull/490) Fixes build & run related bugs from builder refactor | |||
| * [GH-464](https://github.com/apache/cordova-android/pull/464) Unit tests for **Android**_sdk and **Android**Project | |||
| * [GH-448](https://github.com/apache/cordova-android/pull/448) [CB-13685](https://issues.apache.org/jira/browse/CB-13685) Adaptive Icon Support | |||
| * [GH-487](https://github.com/apache/cordova-android/pull/487) Do not attempt an activity intent AND a url load into the webview, return from the internal webview load. | |||
| * [GH-461](https://github.com/apache/cordova-android/pull/461) Remove old builders code | |||
| * [GH-463](https://github.com/apache/cordova-android/pull/463) Emulator: Add unit tests and remove Q | |||
| * [GH-462](https://github.com/apache/cordova-android/pull/462) Device: Add unit tests and remove Q | |||
| * [GH-457](https://github.com/apache/cordova-android/pull/457) Emulator: handle "device still connecting" error | |||
| * [GH-445](https://github.com/apache/cordova-android/pull/445) Run and retryPromise improvements and tests | |||
| * [GH-453](https://github.com/apache/cordova-android/pull/453) Lint JS files w/out extension too | |||
| * [GH-452](https://github.com/apache/cordova-android/pull/452) Emit log event instead of logging directly | |||
| * [GH-449](https://github.com/apache/cordova-android/pull/449) Increase old plugin compatibility | |||
| * [GH-442](https://github.com/apache/cordova-android/pull/442) Fixes and cleanup for Java tests and CI | |||
| * [GH-446](https://github.com/apache/cordova-android/pull/446) [CB-14101](https://issues.apache.org/jira/browse/CB-14101) Fix Java version check for Java >= 9 | |||
| * [CB-14127](https://issues.apache.org/jira/browse/CB-14127) Move google maven repo ahead of jcenter | |||
| * [CB-14038](https://issues.apache.org/jira/browse/CB-14038) Fix false positive detecting project type | |||
| * [CB-14008](https://issues.apache.org/jira/browse/CB-14008) Updating Gradle Libraries to work with **Android** Studio 3.1.0 | |||
| * [CB-13975](https://issues.apache.org/jira/browse/CB-13975) Fix to fire pause event when cdvStartInBackground=true | |||
| * [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.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 | |||
+ 1
- 1
node_modules/cordova-android/VERSION
View File
| @@ -1 +1 @@ | |||
| 7.1.4 | |||
| 8.0.0 | |||
+ 29
- 31
node_modules/cordova-android/appveyor.yml
View File
| @@ -1,38 +1,36 @@ | |||
| image: | |||
| - Previous Visual Studio 2015 | |||
| environment: | |||
| ANDROID_HOME: "C:\\android" | |||
| matrix: | |||
| - nodejs_version: "4" | |||
| - nodejs_version: "6" | |||
| - nodejs_version: "8" | |||
| init: | |||
| - mkdir "%ANDROID_HOME% | |||
| - cd "%ANDROID_HOME%" | |||
| - appveyor DownloadFile "https://dl.google.com/android/repository/tools_r25.2.3-windows.zip" | |||
| - 7z x "tools_r25.2.3-windows.zip" > nul | |||
| - cd "C:\projects\cordova-android" | |||
| ANDROID_HOME: "C:\\android" | |||
| # If the gradle daemon is used, the build hangs after generating the wrapper | |||
| GRADLE_OPTS: -Dorg.gradle.daemon=false | |||
| # URL for SDK Tools, Revision 26.1.1 (September 2017) | |||
| SDK_TOOLS_URL: https://dl.google.com/android/repository/sdk-tools-windows-4333796.zip | |||
| matrix: | |||
| - nodejs_version: 6 | |||
| - nodejs_version: 8 | |||
| - nodejs_version: 10 | |||
| install: | |||
| - choco install gradle -version 3.4.1 | |||
| - gradle -version | |||
| - echo y | "%ANDROID_HOME%\tools\android.bat" --silent update sdk --no-ui --all --filter platform-tools,tools,build-tools-26.0.2,android-26,android-25,extra-google-m2repository,extra-android-m2repository | |||
| # on windows we need to accept sublicenses for the new tooling, wee. 30 is an arbitrary number, | |||
| # but should be the maximum number of licenses we explicitly need to type "Y ENTER" for. | |||
| # also, the sdkmanager in all its glory leaks a bit of output to stderr, and powershell | |||
| # and appveyor interpret that as errors, and blows up. so, when piping in our "Y ENTER" | |||
| # responses, we invoke cmd so we can redirect stderr to stdout, and tell it to --update itself. | |||
| - ps: for($i=0;$i -lt 30;$i++) { $response += "y`n"}; $response | cmd /c 'C:\android\tools\bin\sdkmanager.bat 2>&1' --update | |||
| - ps: Install-Product node $env:nodejs_version | |||
| - npm install | |||
| # below is a workaround on using gradle installed via choco on appveyor | |||
| - set path=C:\ProgramData\chocolatey\lib\gradle\tools\gradle-3.4.1\bin;%path% | |||
| # Install Android SDK Tools | |||
| - mkdir "%ANDROID_HOME%" | |||
| - appveyor DownloadFile "%SDK_TOOLS_URL%" -FileName "%TMP%/sdk-tools.zip" | |||
| - 7z x "%TMP%/sdk-tools.zip" -o"%ANDROID_HOME%" > nul | |||
| - set PATH=%PATH%;"%ANDROID_HOME%\tools\bin" | |||
| - yes 2> nul | sdkmanager --licenses > nul | |||
| - sdkmanager "build-tools;28.0.3" | |||
| - choco install gradle --version 3.4.1 | |||
| - ps: Install-Product node $env:nodejs_version | |||
| - npm install | |||
| build: off | |||
| test_script: | |||
| - node --version | |||
| - npm --version | |||
| - npm test | |||
| - gradle --version | |||
| - node --version | |||
| - npm --version | |||
| - npm test | |||
+ 1
- 3
node_modules/cordova-android/bin/android_sdk_version
View File
| @@ -21,9 +21,7 @@ | |||
| var android_sdk = require('./templates/cordova/lib/android_sdk'); | |||
| android_sdk.print_newest_available_sdk_target().done(null, function(err) { | |||
| android_sdk.print_newest_available_sdk_target().done(null, function (err) { | |||
| console.error(err); | |||
| process.exit(2); | |||
| }); | |||
+ 3
- 2
node_modules/cordova-android/bin/check_reqs
View File
| @@ -22,9 +22,10 @@ | |||
| var check_reqs = require('./templates/cordova/lib/check_reqs'); | |||
| check_reqs.run().done( | |||
| function success() { | |||
| function success () { | |||
| console.log('Looks like your environment fully supports cordova-android development!'); | |||
| }, function fail(err) { | |||
| }, | |||
| function fail (err) { | |||
| console.log(err); | |||
| process.exit(2); | |||
| } | |||
+ 6
- 6
node_modules/cordova-android/bin/create
View File
| @@ -23,12 +23,12 @@ 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' }); | |||
| '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]'); | |||
+ 7
- 4
node_modules/cordova-android/bin/lib/create.js
View File
| @@ -141,9 +141,9 @@ function writeProjectProperties (projectPath, target_api) { | |||
| } | |||
| // This makes no sense, what if you're building with a different build system? | |||
| function prepBuildFiles (projectPath, builder) { | |||
| function prepBuildFiles (projectPath) { | |||
| var buildModule = require(path.resolve(projectPath, 'cordova/lib/builders/builders')); | |||
| buildModule.getBuilder(builder).prepBuildFiles(); | |||
| buildModule.getBuilder().prepBuildFiles(); | |||
| } | |||
| function copyBuildRules (projectPath, isLegacy) { | |||
| @@ -168,7 +168,10 @@ function copyScripts (projectPath) { | |||
| shell.rm('-rf', destScriptsDir); | |||
| // Copy in the new ones. | |||
| shell.cp('-r', srcScriptsDir, projectPath); | |||
| shell.cp('-r', path.join(ROOT, 'node_modules'), destScriptsDir); | |||
| let nodeModulesDir = path.join(ROOT, 'node_modules'); | |||
| if (fs.existsSync(nodeModulesDir)) shell.cp('-r', nodeModulesDir, destScriptsDir); | |||
| shell.cp(path.join(bin, 'check_reqs*'), destScriptsDir); | |||
| shell.cp(path.join(bin, 'android_sdk_version*'), destScriptsDir); | |||
| var check_reqs = path.join(destScriptsDir, 'check_reqs'); | |||
| @@ -329,7 +332,7 @@ exports.create = function (project_path, config, options, events) { | |||
| }); | |||
| // Link it to local android install. | |||
| exports.writeProjectProperties(project_path, target_api); | |||
| exports.prepBuildFiles(project_path, 'studio'); | |||
| exports.prepBuildFiles(project_path); | |||
| events.emit('log', generateDoneMessage('create', options.link)); | |||
| }).thenResolve(project_path); | |||
| }; | |||
+ 19
- 60
node_modules/cordova-android/bin/templates/cordova/Api.js
View File
| @@ -21,7 +21,6 @@ var path = require('path'); | |||
| var Q = require('q'); | |||
| var AndroidProject = require('./lib/AndroidProject'); | |||
| var AndroidStudio = require('./lib/AndroidStudio'); | |||
| var PluginManager = require('cordova-common').PluginManager; | |||
| var CordovaLogger = require('cordova-common').CordovaLogger; | |||
| @@ -56,41 +55,27 @@ function setupEvents (externalEventEmitter) { | |||
| function Api (platform, platformRootDir, events) { | |||
| this.platform = PLATFORM; | |||
| this.root = path.resolve(__dirname, '..'); | |||
| this.builder = 'gradle'; | |||
| setupEvents(events); | |||
| var self = this; | |||
| const appMain = path.join(this.root, 'app', 'src', 'main'); | |||
| const appRes = path.join(appMain, 'res'); | |||
| this.locations = { | |||
| root: self.root, | |||
| www: path.join(self.root, 'assets/www'), | |||
| res: path.join(self.root, 'res'), | |||
| platformWww: path.join(self.root, 'platform_www'), | |||
| configXml: path.join(self.root, 'res/xml/config.xml'), | |||
| defaultConfigXml: path.join(self.root, 'cordova/defaults.xml'), | |||
| strings: path.join(self.root, 'res/values/strings.xml'), | |||
| manifest: path.join(self.root, 'AndroidManifest.xml'), | |||
| build: path.join(self.root, 'build'), | |||
| javaSrc: path.join(self.root, 'src'), | |||
| 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'), | |||
| // NOTE: Due to platformApi spec we need to return relative paths here | |||
| cordovaJs: 'bin/templates/project/assets/www/cordova.js', | |||
| cordovaJsSrc: 'cordova-js-src' | |||
| }; | |||
| // XXX Override some locations for Android Studio projects | |||
| if (AndroidStudio.isAndroidStudioProject(self.root) === true) { | |||
| selfEvents.emit('log', 'Android Studio project detected'); | |||
| this.builder = 'studio'; | |||
| this.android_studio = true; | |||
| this.locations.configXml = path.join(self.root, 'app/src/main/res/xml/config.xml'); | |||
| this.locations.strings = path.join(self.root, 'app/src/main/res/values/strings.xml'); | |||
| this.locations.manifest = path.join(self.root, 'app/src/main/AndroidManifest.xml'); | |||
| // We could have Java Source, we could have other languages | |||
| this.locations.javaSrc = path.join(self.root, 'app/src/main/java/'); | |||
| this.locations.www = path.join(self.root, 'app/src/main/assets/www'); | |||
| this.locations.res = path.join(self.root, 'app/src/main/res'); | |||
| } | |||
| } | |||
| /** | |||
| @@ -223,33 +208,13 @@ Api.prototype.addPlugin = function (plugin, installOptions) { | |||
| installOptions.variables.PACKAGE_NAME = project.getPackageName(); | |||
| } | |||
| if (this.android_studio === true) { | |||
| installOptions.android_studio = true; | |||
| } | |||
| return Q().then(function () { | |||
| // CB-11964: Do a clean when installing the plugin code to get around | |||
| // the Gradle bug introduced by the Android Gradle Plugin Version 2.2 | |||
| // TODO: Delete when the next version of Android Gradle plugin comes out | |||
| // Since clean doesn't just clean the build, it also wipes out www, we need | |||
| // to pass additional options. | |||
| // Do some basic argument parsing | |||
| var opts = {}; | |||
| // Skip cleaning prepared files when not invoking via cordova CLI. | |||
| opts.noPrepare = true; | |||
| if (!AndroidStudio.isAndroidStudioProject(self.root) && !project.isClean()) { | |||
| return self.clean(opts); | |||
| } | |||
| }).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 | |||
| require('./lib/builders/builders').getBuilder(this.builder).prepBuildFiles(); | |||
| require('./lib/builders/builders').getBuilder().prepBuildFiles(); | |||
| }.bind(this)) | |||
| // CB-11022 Return truthy value to prevent running prepare after | |||
| .thenResolve(true); | |||
| @@ -271,9 +236,8 @@ Api.prototype.addPlugin = function (plugin, installOptions) { | |||
| Api.prototype.removePlugin = function (plugin, uninstallOptions) { | |||
| var project = AndroidProject.getProjectFile(this.root); | |||
| if (uninstallOptions && uninstallOptions.usePlatformWww === true && this.android_studio === true) { | |||
| if (uninstallOptions && uninstallOptions.usePlatformWww === true) { | |||
| uninstallOptions.usePlatformWww = false; | |||
| uninstallOptions.android_studio = true; | |||
| } | |||
| return PluginManager.get(this.platform, this.locations, project) | |||
| @@ -282,7 +246,7 @@ Api.prototype.removePlugin = function (plugin, uninstallOptions) { | |||
| if (plugin.getFrameworks(this.platform).length === 0) return; | |||
| selfEvents.emit('verbose', 'Updating build files since android plugin contained <framework>'); | |||
| require('./lib/builders/builders').getBuilder(this.builder).prepBuildFiles(); | |||
| require('./lib/builders/builders').getBuilder().prepBuildFiles(); | |||
| }.bind(this)) | |||
| // CB-11022 Return truthy value to prevent running prepare after | |||
| .thenResolve(true); | |||
| @@ -335,9 +299,7 @@ Api.prototype.removePlugin = function (plugin, uninstallOptions) { | |||
| */ | |||
| Api.prototype.build = function (buildOptions) { | |||
| var self = this; | |||
| if (this.android_studio) { | |||
| buildOptions.studio = true; | |||
| } | |||
| return require('./lib/check_reqs').run().then(function () { | |||
| return require('./lib/build').run.call(self, buildOptions); | |||
| }).then(function (buildResults) { | |||
| @@ -381,12 +343,9 @@ Api.prototype.run = function (runOptions) { | |||
| */ | |||
| Api.prototype.clean = function (cleanOptions) { | |||
| var self = this; | |||
| if (this.android_studio) { | |||
| // This will lint, checking for null won't | |||
| if (typeof cleanOptions === 'undefined') { | |||
| cleanOptions = {}; | |||
| } | |||
| cleanOptions.studio = true; | |||
| // This will lint, checking for null won't | |||
| if (typeof cleanOptions === 'undefined') { | |||
| cleanOptions = {}; | |||
| } | |||
| return require('./lib/check_reqs').run().then(function () { | |||
+ 13
- 12
node_modules/cordova-android/bin/templates/cordova/build
View File
| @@ -19,24 +19,25 @@ | |||
| under the License. | |||
| */ | |||
| var args = process.argv; | |||
| 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(process.argv[2]) >= 0) | |||
| 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, | |||
| 'verbose': Boolean, | |||
| 'silent': Boolean, | |||
| 'debug': Boolean, | |||
| 'release': Boolean, | |||
| 'nobuild': Boolean, | |||
| 'buildConfig' : path | |||
| }, { 'd' : '--verbose' }); | |||
| 'buildConfig': path | |||
| }, { 'd': '--verbose' }); | |||
| // Make buildOptions compatible with PlatformApi build method spec | |||
| buildOpts.argv = buildOpts.argv.original; | |||
| @@ -44,7 +45,7 @@ buildOpts.argv = buildOpts.argv.original; | |||
| require('./loggingHelper').adjustLoggerLevel(buildOpts); | |||
| new Api().build(buildOpts) | |||
| .catch(function(err) { | |||
| console.error(err.stack); | |||
| process.exit(2); | |||
| }); | |||
| .catch(function (err) { | |||
| console.error(err.stack); | |||
| process.exit(2); | |||
| }); | |||
+ 9
- 9
node_modules/cordova-android/bin/templates/cordova/clean
View File
| @@ -20,11 +20,11 @@ | |||
| */ | |||
| var Api = require('./Api'); | |||
| var path = require('path'); | |||
| var path = require('path'); | |||
| var nopt = require('nopt'); | |||
| // Support basic help commands | |||
| if(['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(process.argv[2]) >= 0) { | |||
| 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); | |||
| @@ -32,9 +32,9 @@ if(['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(process.argv[2]) >= | |||
| // Do some basic argument parsing | |||
| var opts = nopt({ | |||
| 'verbose' : Boolean, | |||
| 'silent' : Boolean | |||
| }, { 'd' : '--verbose' }); | |||
| 'verbose': Boolean, | |||
| 'silent': Boolean | |||
| }, { 'd': '--verbose' }); | |||
| // Make buildOptions compatible with PlatformApi clean method spec | |||
| opts.argv = opts.argv.original; | |||
| @@ -45,7 +45,7 @@ opts.noPrepare = true; | |||
| require('./loggingHelper').adjustLoggerLevel(opts); | |||
| new Api().clean(opts) | |||
| .catch(function(err) { | |||
| console.error(err.stack); | |||
| process.exit(2); | |||
| }); | |||
| .catch(function (err) { | |||
| console.error(err.stack); | |||
| process.exit(2); | |||
| }); | |||
+ 4
- 4
node_modules/cordova-android/bin/templates/cordova/lib/Adb.js
View File
| @@ -44,7 +44,7 @@ function isEmulator (line) { | |||
| * devices/emulators | |||
| */ | |||
| Adb.devices = function (opts) { | |||
| return spawn('adb', ['devices'], {cwd: os.tmpdir()}).then(function (output) { | |||
| return spawn('adb', ['devices'], { cwd: os.tmpdir() }).then(function (output) { | |||
| return output.split('\n').filter(function (line) { | |||
| // Filter out either real devices or emulators, depending on options | |||
| return (line && opts && opts.emulators) ? isEmulator(line) : isDevice(line); | |||
| @@ -58,7 +58,7 @@ Adb.install = function (target, packagePath, opts) { | |||
| events.emit('verbose', 'Installing apk ' + packagePath + ' on target ' + target + '...'); | |||
| var args = ['-s', target, 'install']; | |||
| if (opts && opts.replace) args.push('-r'); | |||
| return spawn('adb', args.concat(packagePath), {cwd: os.tmpdir()}).then(function (output) { | |||
| return spawn('adb', args.concat(packagePath), { cwd: os.tmpdir() }).then(function (output) { | |||
| // 'adb install' seems to always returns no error, even if installation fails | |||
| // so we catching output to detect installation failure | |||
| if (output.match(/Failure/)) { | |||
| @@ -77,14 +77,14 @@ Adb.install = function (target, packagePath, opts) { | |||
| Adb.uninstall = function (target, packageId) { | |||
| events.emit('verbose', 'Uninstalling package ' + packageId + ' from target ' + target + '...'); | |||
| return spawn('adb', ['-s', target, 'uninstall', packageId], {cwd: os.tmpdir()}); | |||
| return spawn('adb', ['-s', target, 'uninstall', packageId], { cwd: os.tmpdir() }); | |||
| }; | |||
| Adb.shell = function (target, shellCommand) { | |||
| events.emit('verbose', 'Running adb shell command "' + shellCommand + '" on target ' + target + '...'); | |||
| var args = ['-s', target, 'shell']; | |||
| shellCommand = shellCommand.split(/\s+/); | |||
| return spawn('adb', args.concat(shellCommand), {cwd: os.tmpdir()}).catch(function (output) { | |||
| return spawn('adb', args.concat(shellCommand), { cwd: os.tmpdir() }).catch(function (output) { | |||
| return Q.reject(new CordovaError('Failed to execute shell command "' + | |||
| shellCommand + '"" on device: ' + output)); | |||
| }); | |||
+ 1
- 5
node_modules/cordova-android/bin/templates/cordova/lib/AndroidManifest.js
View File
| @@ -51,15 +51,11 @@ AndroidManifest.prototype.setVersionCode = function (versionCode) { | |||
| }; | |||
| AndroidManifest.prototype.getPackageId = function () { | |||
| /* jshint -W069 */ | |||
| return this.doc.getroot().attrib['package']; | |||
| /* jshint +W069 */ | |||
| }; | |||
| AndroidManifest.prototype.setPackageId = function (pkgId) { | |||
| /* jshint -W069 */ | |||
| this.doc.getroot().attrib['package'] = pkgId; | |||
| /* jshint +W069 */ | |||
| return this; | |||
| }; | |||
| @@ -150,7 +146,7 @@ AndroidManifest.prototype.setDebuggable = function (value) { | |||
| * manifest will be written to file it has been read from. | |||
| */ | |||
| AndroidManifest.prototype.write = function (destPath) { | |||
| fs.writeFileSync(destPath || this.path, this.doc.write({indent: 4}), 'utf-8'); | |||
| fs.writeFileSync(destPath || this.path, this.doc.write({ indent: 4 }), 'utf-8'); | |||
| }; | |||
| module.exports = AndroidManifest; | |||
+ 2
- 9
node_modules/cordova-android/bin/templates/cordova/lib/AndroidProject.js
View File
| @@ -21,7 +21,6 @@ var fs = require('fs'); | |||
| var path = require('path'); | |||
| var properties_parser = require('properties-parser'); | |||
| var AndroidManifest = require('./AndroidManifest'); | |||
| var AndroidStudio = require('./AndroidStudio'); | |||
| var pluginHandlers = require('./pluginHandlers'); | |||
| var projectFileCache = {}; | |||
| @@ -62,10 +61,7 @@ function AndroidProject (projectDir) { | |||
| this._dirty = false; | |||
| this.projectDir = projectDir; | |||
| this.platformWww = path.join(this.projectDir, 'platform_www'); | |||
| this.www = path.join(this.projectDir, 'assets/www'); | |||
| if (AndroidStudio.isAndroidStudioProject(projectDir) === true) { | |||
| this.www = path.join(this.projectDir, 'app/src/main/assets/www'); | |||
| } | |||
| this.www = path.join(this.projectDir, 'app/src/main/assets/www'); | |||
| } | |||
| AndroidProject.getProjectFile = function (projectDir) { | |||
| @@ -92,10 +88,7 @@ AndroidProject.purgeCache = function (projectDir) { | |||
| * @return {String} The name of the package | |||
| */ | |||
| AndroidProject.prototype.getPackageName = function () { | |||
| var manifestPath = path.join(this.projectDir, 'AndroidManifest.xml'); | |||
| if (AndroidStudio.isAndroidStudioProject(this.projectDir) === true) { | |||
| manifestPath = path.join(this.projectDir, 'app/src/main/AndroidManifest.xml'); | |||
| } | |||
| var manifestPath = path.join(this.projectDir, 'app/src/main/AndroidManifest.xml'); | |||
| return new AndroidManifest(manifestPath).getPackageId(); | |||
| }; | |||
+ 0
- 11
node_modules/cordova-android/bin/templates/cordova/lib/AndroidStudio.js
View File
| @@ -1,11 +0,0 @@ | |||
| /* | |||
| * This is a simple routine that checks if project is an Android Studio Project | |||
| * | |||
| * @param {String} root Root folder of the project | |||
| */ | |||
| /* jshint esnext: false */ | |||
| module.exports.isAndroidStudioProject = function isAndroidStudioProject (root) { | |||
| return true; | |||
| }; | |||
+ 1
- 2
node_modules/cordova-android/bin/templates/cordova/lib/android_sdk.js
View File
| @@ -17,7 +17,6 @@ | |||
| under the License. | |||
| */ | |||
| var Q = require('q'); | |||
| var superspawn = require('cordova-common').superspawn; | |||
| var suffix_number_regex = /(\d+)$/; | |||
| @@ -95,7 +94,7 @@ module.exports.list_targets = function () { | |||
| } else throw err; | |||
| }).then(function (targets) { | |||
| if (targets.length === 0) { | |||
| return Q.reject(new Error('No android targets (SDKs) installed!')); | |||
| return Promise.reject(new Error('No android targets (SDKs) installed!')); | |||
| } | |||
| return targets; | |||
| }); | |||
+ 8
- 24
node_modules/cordova-android/bin/templates/cordova/lib/build.js
View File
| @@ -31,11 +31,10 @@ var events = require('cordova-common').events; | |||
| var spawn = require('cordova-common').superspawn.spawn; | |||
| var CordovaError = require('cordova-common').CordovaError; | |||
| module.exports.parseBuildOptions = parseOpts; | |||
| function parseOpts (options, resolvedTarget, projectRoot) { | |||
| options = options || {}; | |||
| options.argv = nopt({ | |||
| gradle: Boolean, | |||
| studio: Boolean, | |||
| prepenv: Boolean, | |||
| versionCode: String, | |||
| minSdkVersion: String, | |||
| @@ -50,26 +49,13 @@ function parseOpts (options, resolvedTarget, projectRoot) { | |||
| // Android Studio Build method is the default | |||
| var ret = { | |||
| buildType: options.release ? 'release' : 'debug', | |||
| buildMethod: process.env.ANDROID_BUILD || 'studio', | |||
| prepEnv: options.argv.prepenv, | |||
| arch: resolvedTarget && resolvedTarget.arch, | |||
| extraArgs: [] | |||
| }; | |||
| if (options.argv.gradle || options.argv.studio) { | |||
| ret.buildMethod = options.argv.studio ? 'studio' : 'gradle'; | |||
| } | |||
| // This comes from cordova/run | |||
| if (options.studio) ret.buildMethod = 'studio'; | |||
| if (options.gradle) ret.buildMethod = 'gradle'; | |||
| if (options.nobuild) ret.buildMethod = 'none'; | |||
| if (options.argv.versionCode) { ret.extraArgs.push('-PcdvVersionCode=' + options.argv.versionCode); } | |||
| if (options.argv.minSdkVersion) { ret.extraArgs.push('-PcdvMinSdkVersion=' + options.argv.minSdkVersion); } | |||
| if (options.argv.gradleArg) { | |||
| ret.extraArgs = ret.extraArgs.concat(options.argv.gradleArg); | |||
| } | |||
| @@ -129,7 +115,8 @@ function parseOpts (options, resolvedTarget, projectRoot) { | |||
| */ | |||
| module.exports.runClean = function (options) { | |||
| var opts = parseOpts(options, null, this.root); | |||
| var builder = builders.getBuilder(opts.buildMethod); | |||
| var builder = builders.getBuilder(); | |||
| return builder.prepEnv(opts).then(function () { | |||
| return builder.clean(opts); | |||
| }); | |||
| @@ -149,8 +136,8 @@ module.exports.runClean = function (options) { | |||
| */ | |||
| module.exports.run = function (options, optResolvedTarget) { | |||
| var opts = parseOpts(options, optResolvedTarget, this.root); | |||
| console.log(opts.buildMethod); | |||
| var builder = builders.getBuilder(opts.buildMethod); | |||
| var builder = builders.getBuilder(); | |||
| return builder.prepEnv(opts).then(function () { | |||
| if (opts.prepEnv) { | |||
| events.emit('verbose', 'Build file successfully prepared.'); | |||
| @@ -161,8 +148,7 @@ module.exports.run = function (options, optResolvedTarget) { | |||
| events.emit('log', 'Built the following apk(s): \n\t' + apkPaths.join('\n\t')); | |||
| return { | |||
| apkPaths: apkPaths, | |||
| buildType: opts.buildType, | |||
| buildMethod: opts.buildMethod | |||
| buildType: opts.buildType | |||
| }; | |||
| }); | |||
| }); | |||
| @@ -276,12 +262,10 @@ module.exports.help = function () { | |||
| console.log('Flags:'); | |||
| console.log(' \'--debug\': will build project in debug mode (default)'); | |||
| console.log(' \'--release\': will build project for release'); | |||
| console.log(' \'--ant\': will build project with ant'); | |||
| console.log(' \'--gradle\': will build project with gradle (default)'); | |||
| console.log(' \'--nobuild\': will skip build process (useful when using run command)'); | |||
| console.log(' \'--prepenv\': don\'t build, but copy in build scripts where necessary'); | |||
| console.log(' \'--versionCode=#\': Override versionCode for this build. Useful for uploading multiple APKs. Requires --gradle.'); | |||
| console.log(' \'--minSdkVersion=#\': Override minSdkVersion for this build. Useful for uploading multiple APKs. Requires --gradle.'); | |||
| console.log(' \'--versionCode=#\': Override versionCode for this build. Useful for uploading multiple APKs.'); | |||
| console.log(' \'--minSdkVersion=#\': Override minSdkVersion for this build. Useful for uploading multiple APKs.'); | |||
| console.log(' \'--gradleArg=<gradle command line arg>\': Extra args to pass to the gradle command. Use one flag per arg. Ex. --gradleArg=-PcdvBuildMultipleApks=true'); | |||
| console.log(''); | |||
| console.log('Signed APK flags (overwrites debug/release-signing.proprties) :'); | |||
+ 0
- 124
node_modules/cordova-android/bin/templates/cordova/lib/builders/GenericBuilder.js
View File
| @@ -1,124 +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. | |||
| */ | |||
| /* eslint no-self-assign: 0 */ | |||
| /* eslint no-unused-vars: 0 */ | |||
| var Q = require('q'); | |||
| var fs = require('fs'); | |||
| var path = require('path'); | |||
| var shell = require('shelljs'); | |||
| var events = require('cordova-common').events; | |||
| function GenericBuilder (projectDir) { | |||
| this.root = projectDir || path.resolve(__dirname, '../../..'); | |||
| this.binDirs = { | |||
| studio: path.join(this.root, 'app', 'build', 'outputs', 'apk'), | |||
| gradle: path.join(this.root, 'build', 'outputs', 'apk') | |||
| }; | |||
| } | |||
| GenericBuilder.prototype.prepEnv = function () { | |||
| return Q(); | |||
| }; | |||
| GenericBuilder.prototype.build = function () { | |||
| events.emit('log', 'Skipping build...'); | |||
| return Q(null); | |||
| }; | |||
| GenericBuilder.prototype.clean = function () { | |||
| return Q(); | |||
| }; | |||
| GenericBuilder.prototype.findOutputApks = function (build_type, arch) { | |||
| var self = this; | |||
| return Object.keys(this.binDirs).reduce(function (result, builderName) { | |||
| var binDir = self.binDirs[builderName]; | |||
| return result.concat(findOutputApksHelper(binDir, build_type, builderName === 'ant' ? null : arch)); | |||
| }, []).sort(apkSorter); | |||
| }; | |||
| module.exports = GenericBuilder; | |||
| function apkSorter (fileA, fileB) { | |||
| // De-prioritize arch specific builds | |||
| var archSpecificRE = /-x86|-arm/; | |||
| if (archSpecificRE.exec(fileA)) { | |||
| return 1; | |||
| } else if (archSpecificRE.exec(fileB)) { | |||
| return -1; | |||
| } | |||
| // De-prioritize unsigned builds | |||
| var unsignedRE = /-unsigned/; | |||
| if (unsignedRE.exec(fileA)) { | |||
| return 1; | |||
| } else if (unsignedRE.exec(fileB)) { | |||
| return -1; | |||
| } | |||
| var timeDiff = fs.statSync(fileB).mtime - fs.statSync(fileA).mtime; | |||
| return timeDiff === 0 ? fileA.length - fileB.length : timeDiff; | |||
| } | |||
| function findOutputApksHelper (dir, build_type, arch) { | |||
| var shellSilent = shell.config.silent; | |||
| shell.config.silent = true; | |||
| // list directory recursively | |||
| var ret = shell.ls('-R', dir).map(function (file) { | |||
| // ls does not include base directory | |||
| return path.join(dir, file); | |||
| }).filter(function (file) { | |||
| // find all APKs | |||
| return file.match(/\.apk?$/i); | |||
| }).filter(function (candidate) { | |||
| var apkName = path.basename(candidate); | |||
| // Need to choose between release and debug .apk. | |||
| if (build_type === 'debug') { | |||
| return /-debug/.exec(apkName) && !/-unaligned|-unsigned/.exec(apkName); | |||
| } | |||
| if (build_type === 'release') { | |||
| return /-release/.exec(apkName) && !/-unaligned/.exec(apkName); | |||
| } | |||
| return true; | |||
| }).sort(apkSorter); | |||
| shellSilent = shellSilent; | |||
| if (ret.length === 0) { | |||
| return ret; | |||
| } | |||
| // Assume arch-specific build if newest apk has -x86 or -arm. | |||
| var archSpecific = !!/-x86|-arm/.exec(path.basename(ret[0])); | |||
| // And show only arch-specific ones (or non-arch-specific) | |||
| ret = ret.filter(function (p) { | |||
| /* jshint -W018 */ | |||
| return !!/-x86|-arm/.exec(path.basename(p)) === archSpecific; | |||
| /* jshint +W018 */ | |||
| }); | |||
| if (archSpecific && ret.length > 1 && arch) { | |||
| ret = ret.filter(function (p) { | |||
| return path.basename(p).indexOf('-' + arch) !== -1; | |||
| }); | |||
| } | |||
| return ret; | |||
| } | |||
+ 0
- 331
node_modules/cordova-android/bin/templates/cordova/lib/builders/GradleBuilder.js
View File
| @@ -1,331 +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 Q = require('q'); | |||
| var fs = require('fs'); | |||
| var util = require('util'); | |||
| var path = require('path'); | |||
| var shell = require('shelljs'); | |||
| var superspawn = require('cordova-common').superspawn; | |||
| var CordovaError = require('cordova-common').CordovaError; | |||
| var events = require('cordova-common').events; | |||
| var check_reqs = require('../check_reqs'); | |||
| var GenericBuilder = require('./GenericBuilder'); | |||
| var MARKER = 'YOUR CHANGES WILL BE ERASED!'; | |||
| var SIGNING_PROPERTIES = '-signing.properties'; | |||
| var TEMPLATE = | |||
| '# This file is automatically generated.\n' + | |||
| '# Do not modify this file -- ' + MARKER + '\n'; | |||
| function GradleBuilder (projectRoot) { | |||
| GenericBuilder.call(this, projectRoot); | |||
| this.binDirs = { gradle: this.binDirs.gradle }; | |||
| } | |||
| util.inherits(GradleBuilder, GenericBuilder); | |||
| GradleBuilder.prototype.getArgs = function (cmd, opts) { | |||
| if (cmd === 'release') { | |||
| cmd = 'cdvBuildRelease'; | |||
| } else if (cmd === 'debug') { | |||
| cmd = 'cdvBuildDebug'; | |||
| } | |||
| var args = [cmd, '-b', path.join(this.root, 'build.gradle')]; | |||
| if (opts.arch) { | |||
| args.push('-PcdvBuildArch=' + opts.arch); | |||
| } | |||
| // 10 seconds -> 6 seconds | |||
| args.push('-Dorg.gradle.daemon=true'); | |||
| // to allow dex in process | |||
| args.push('-Dorg.gradle.jvmargs=-Xmx2048m'); | |||
| // allow NDK to be used - required by Gradle 1.5 plugin | |||
| args.push('-Pandroid.useDeprecatedNdk=true'); | |||
| args.push.apply(args, opts.extraArgs); | |||
| // Shaves another 100ms, but produces a "try at own risk" warning. Not worth it (yet): | |||
| // args.push('-Dorg.gradle.parallel=true'); | |||
| return args; | |||
| }; | |||
| /* | |||
| * This returns a promise | |||
| */ | |||
| GradleBuilder.prototype.runGradleWrapper = function (gradle_cmd, gradle_file) { | |||
| var gradlePath = path.join(this.root, 'gradlew'); | |||
| gradle_file = path.join(this.root, (gradle_file || 'wrapper.gradle')); | |||
| if (fs.existsSync(gradlePath)) { | |||
| // Literally do nothing, for some reason this works, while !fs.existsSync didn't on Windows | |||
| } else { | |||
| return superspawn.spawn(gradle_cmd, ['-p', this.root, 'wrapper', '-b', gradle_file], { stdio: 'pipe' }) | |||
| .progress(function (stdio) { | |||
| suppressJavaOptionsInfo(stdio); | |||
| }); | |||
| } | |||
| }; | |||
| /* | |||
| * We need to kill this in a fire. | |||
| */ | |||
| GradleBuilder.prototype.readProjectProperties = function () { | |||
| function findAllUniq (data, r) { | |||
| var s = {}; | |||
| var m; | |||
| while ((m = r.exec(data))) { | |||
| s[m[1]] = 1; | |||
| } | |||
| return Object.keys(s); | |||
| } | |||
| var data = fs.readFileSync(path.join(this.root, 'project.properties'), 'utf8'); | |||
| return { | |||
| libs: findAllUniq(data, /^\s*android\.library\.reference\.\d+=(.*)(?:\s|$)/mg), | |||
| gradleIncludes: findAllUniq(data, /^\s*cordova\.gradle\.include\.\d+=(.*)(?:\s|$)/mg), | |||
| systemLibs: findAllUniq(data, /^\s*cordova\.system\.library\.\d+=(.*)(?:\s|$)/mg) | |||
| }; | |||
| }; | |||
| GradleBuilder.prototype.extractRealProjectNameFromManifest = function () { | |||
| var manifestPath = path.join(this.root, 'AndroidManifest.xml'); | |||
| var manifestData = fs.readFileSync(manifestPath, 'utf8'); | |||
| var m = /<manifest[\s\S]*?package\s*=\s*"(.*?)"/i.exec(manifestData); | |||
| if (!m) { | |||
| throw new CordovaError('Could not find package name in ' + manifestPath); | |||
| } | |||
| var packageName = m[1]; | |||
| var lastDotIndex = packageName.lastIndexOf('.'); | |||
| return packageName.substring(lastDotIndex + 1); | |||
| }; | |||
| // Makes the project buildable, minus the gradle wrapper. | |||
| GradleBuilder.prototype.prepBuildFiles = function () { | |||
| // Update the version of build.gradle in each dependent library. | |||
| var pluginBuildGradle = path.join(this.root, 'cordova', 'lib', 'plugin-build.gradle'); | |||
| var propertiesObj = this.readProjectProperties(); | |||
| var subProjects = propertiesObj.libs; | |||
| // Check and copy the gradle file into the subproject. | |||
| // Called by the loop below this function def. | |||
| var checkAndCopy = function (subProject, root) { | |||
| var subProjectGradle = path.join(root, subProject, 'build.gradle'); | |||
| // This is the future-proof way of checking if a file exists | |||
| // This must be synchronous to satisfy a Travis test | |||
| try { | |||
| fs.accessSync(subProjectGradle, fs.F_OK); | |||
| } catch (e) { | |||
| shell.cp('-f', pluginBuildGradle, subProjectGradle); | |||
| } | |||
| }; | |||
| // Some dependencies on Android don't use gradle, or don't have default | |||
| // gradle files. This copies a dummy gradle file into them | |||
| for (var i = 0; i < subProjects.length; ++i) { | |||
| if (subProjects[i] !== 'CordovaLib' && subProjects[i] !== 'app') { | |||
| checkAndCopy(subProjects[i], this.root); | |||
| } | |||
| } | |||
| var name = this.extractRealProjectNameFromManifest(); | |||
| // Remove the proj.id/name- prefix from projects: https://issues.apache.org/jira/browse/CB-9149 | |||
| var settingsGradlePaths = subProjects.map(function (p) { | |||
| var realDir = p.replace(/[/\\]/g, ':'); | |||
| var libName = realDir.replace(name + '-', ''); | |||
| var str = 'include ":' + libName + '"\n'; | |||
| if (realDir.indexOf(name + '-') !== -1) { str += 'project(":' + libName + '").projectDir = new File("' + p + '")\n'; } | |||
| return str; | |||
| }); | |||
| // Write the settings.gradle file. | |||
| fs.writeFileSync(path.join(this.root, 'settings.gradle'), | |||
| '// GENERATED FILE - DO NOT EDIT\n' + | |||
| 'include ":"\n' + settingsGradlePaths.join('')); | |||
| // Update dependencies within build.gradle. | |||
| var buildGradle = fs.readFileSync(path.join(this.root, 'build.gradle'), 'utf8'); | |||
| var depsList = ''; | |||
| var root = this.root; | |||
| // Cordova Plugins can be written as library modules that would use Cordova as a | |||
| // dependency. Because we need to make sure that Cordova is compiled only once for | |||
| // dexing, we make sure to exclude CordovaLib from these modules | |||
| var insertExclude = function (p) { | |||
| var gradlePath = path.join(root, p, 'build.gradle'); | |||
| var projectGradleFile = fs.readFileSync(gradlePath, 'utf-8'); | |||
| if (projectGradleFile.indexOf('CordovaLib') !== -1) { | |||
| depsList += '{\n exclude module:("CordovaLib")\n }\n'; | |||
| } else { | |||
| depsList += '\n'; | |||
| } | |||
| }; | |||
| subProjects.forEach(function (p) { | |||
| events.emit('log', 'Subproject Path: ' + p); | |||
| var libName = p.replace(/[/\\]/g, ':').replace(name + '-', ''); | |||
| depsList += ' implementation(project(path: "' + libName + '"))'; | |||
| insertExclude(p); | |||
| }); | |||
| // For why we do this mapping: https://issues.apache.org/jira/browse/CB-8390 | |||
| var SYSTEM_LIBRARY_MAPPINGS = [ | |||
| [/^\/?extras\/android\/support\/(.*)$/, 'com.android.support:support-$1:+'], | |||
| [/^\/?google\/google_play_services\/libproject\/google-play-services_lib\/?$/, 'com.google.android.gms:play-services:+'] | |||
| ]; | |||
| propertiesObj.systemLibs.forEach(function (p) { | |||
| var mavenRef; | |||
| // It's already in gradle form if it has two ':'s | |||
| if (/:.*:/.exec(p)) { | |||
| mavenRef = p; | |||
| } else { | |||
| for (var i = 0; i < SYSTEM_LIBRARY_MAPPINGS.length; ++i) { | |||
| var pair = SYSTEM_LIBRARY_MAPPINGS[i]; | |||
| if (pair[0].exec(p)) { | |||
| mavenRef = p.replace(pair[0], pair[1]); | |||
| break; | |||
| } | |||
| } | |||
| if (!mavenRef) { | |||
| throw new CordovaError('Unsupported system library (does not work with gradle): ' + p); | |||
| } | |||
| } | |||
| depsList += ' compile "' + mavenRef + '"\n'; | |||
| }); | |||
| // This code is dangerous and actually writes gradle declarations directly into the build.gradle | |||
| // Try not to mess with this if possible | |||
| buildGradle = buildGradle.replace(/(SUB-PROJECT DEPENDENCIES START)[\s\S]*(\/\/ SUB-PROJECT DEPENDENCIES END)/, '$1\n' + depsList + ' $2'); | |||
| var includeList = ''; | |||
| propertiesObj.gradleIncludes.forEach(function (includePath) { | |||
| includeList += 'apply from: "' + includePath + '"\n'; | |||
| }); | |||
| buildGradle = buildGradle.replace(/(PLUGIN GRADLE EXTENSIONS START)[\s\S]*(\/\/ PLUGIN GRADLE EXTENSIONS END)/, '$1\n' + includeList + '$2'); | |||
| fs.writeFileSync(path.join(this.root, 'build.gradle'), buildGradle); | |||
| }; | |||
| GradleBuilder.prototype.prepEnv = function (opts) { | |||
| var self = this; | |||
| return check_reqs.check_gradle().then(function (gradlePath) { | |||
| return self.runGradleWrapper(gradlePath); | |||
| }).then(function () { | |||
| return self.prepBuildFiles(); | |||
| }).then(function () { | |||
| // We now copy the gradle out of the framework | |||
| // This is a dirty patch to get the build working | |||
| /* | |||
| var wrapperDir = path.join(self.root, 'CordovaLib'); | |||
| if (process.platform == 'win32') { | |||
| shell.rm('-f', path.join(self.root, 'gradlew.bat')); | |||
| shell.cp(path.join(wrapperDir, 'gradlew.bat'), self.root); | |||
| } else { | |||
| shell.rm('-f', path.join(self.root, 'gradlew')); | |||
| shell.cp(path.join(wrapperDir, 'gradlew'), self.root); | |||
| } | |||
| shell.rm('-rf', path.join(self.root, 'gradle', 'wrapper')); | |||
| shell.mkdir('-p', path.join(self.root, 'gradle')); | |||
| shell.cp('-r', path.join(wrapperDir, 'gradle', 'wrapper'), path.join(self.root, 'gradle')); | |||
| */ | |||
| // If the gradle distribution URL is set, make sure it points to version we want. | |||
| // If it's not set, do nothing, assuming that we're using a future version of gradle that we don't want to mess with. | |||
| // For some reason, using ^ and $ don't work. This does the job, though. | |||
| var distributionUrlRegex = /distributionUrl.*zip/; | |||
| /* jshint -W069 */ | |||
| var distributionUrl = process.env['CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL'] || 'https\\://services.gradle.org/distributions/gradle-4.1-all.zip'; | |||
| /* jshint +W069 */ | |||
| var gradleWrapperPropertiesPath = path.join(self.root, 'gradle', 'wrapper', 'gradle-wrapper.properties'); | |||
| shell.chmod('u+w', gradleWrapperPropertiesPath); | |||
| shell.sed('-i', distributionUrlRegex, 'distributionUrl=' + distributionUrl, gradleWrapperPropertiesPath); | |||
| var propertiesFile = opts.buildType + SIGNING_PROPERTIES; | |||
| var propertiesFilePath = path.join(self.root, propertiesFile); | |||
| if (opts.packageInfo) { | |||
| fs.writeFileSync(propertiesFilePath, TEMPLATE + opts.packageInfo.toProperties()); | |||
| } else if (isAutoGenerated(propertiesFilePath)) { | |||
| shell.rm('-f', propertiesFilePath); | |||
| } | |||
| }); | |||
| }; | |||
| /* | |||
| * Builds the project with gradle. | |||
| * Returns a promise. | |||
| */ | |||
| GradleBuilder.prototype.build = function (opts) { | |||
| var wrapper = path.join(this.root, 'gradlew'); | |||
| var args = this.getArgs(opts.buildType === 'debug' ? 'debug' : 'release', opts); | |||
| return superspawn.spawn(wrapper, args, { stdio: 'pipe' }) | |||
| .progress(function (stdio) { | |||
| suppressJavaOptionsInfo(stdio); | |||
| }).catch(function (error) { | |||
| if (error.toString().indexOf('failed to find target with hash string') >= 0) { | |||
| return check_reqs.check_android_target(error).then(function () { | |||
| // If due to some odd reason - check_android_target succeeds | |||
| // we should still fail here. | |||
| return Q.reject(error); | |||
| }); | |||
| } | |||
| return Q.reject(error); | |||
| }); | |||
| }; | |||
| GradleBuilder.prototype.clean = function (opts) { | |||
| var builder = this; | |||
| var wrapper = path.join(this.root, 'gradlew'); | |||
| var args = builder.getArgs('clean', opts); | |||
| return Q().then(function () { | |||
| return superspawn.spawn(wrapper, args, { stdio: 'inherit' }); | |||
| }).then(function () { | |||
| shell.rm('-rf', path.join(builder.root, 'out')); | |||
| ['debug', 'release'].forEach(function (config) { | |||
| var propertiesFilePath = path.join(builder.root, config + SIGNING_PROPERTIES); | |||
| if (isAutoGenerated(propertiesFilePath)) { | |||
| shell.rm('-f', propertiesFilePath); | |||
| } | |||
| }); | |||
| }); | |||
| }; | |||
| module.exports = GradleBuilder; | |||
| function suppressJavaOptionsInfo (stdio) { | |||
| if (stdio.stderr) { | |||
| /* | |||
| * Workaround for the issue with Java printing some unwanted information to | |||
| * stderr instead of stdout. | |||
| * This function suppresses 'Picked up _JAVA_OPTIONS' message from being | |||
| * printed to stderr. See https://issues.apache.org/jira/browse/CB-9971 for | |||
| * explanation. | |||
| */ | |||
| var suppressThisLine = /^Picked up _JAVA_OPTIONS: /i.test(stdio.stderr.toString()); | |||
| if (suppressThisLine) { | |||
| return; | |||
| } | |||
| process.stderr.write(stdio.stderr); | |||
| } else { | |||
| process.stdout.write(stdio.stdout); | |||
| } | |||
| } | |||
| function isAutoGenerated (file) { | |||
| return fs.existsSync(file) && fs.readFileSync(file, 'utf8').indexOf(MARKER) > 0; | |||
| } | |||
+ 0
- 303
node_modules/cordova-android/bin/templates/cordova/lib/builders/StudioBuilder.js
View File
| @@ -1,303 +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 Q = require('q'); | |||
| var fs = require('fs'); | |||
| var util = require('util'); | |||
| var path = require('path'); | |||
| var shell = require('shelljs'); | |||
| var spawn = require('cordova-common').superspawn.spawn; | |||
| var events = require('cordova-common').events; | |||
| var CordovaError = require('cordova-common').CordovaError; | |||
| var check_reqs = require('../check_reqs'); | |||
| var GenericBuilder = require('./GenericBuilder'); | |||
| var MARKER = 'YOUR CHANGES WILL BE ERASED!'; | |||
| var SIGNING_PROPERTIES = '-signing.properties'; | |||
| var TEMPLATE = | |||
| '# This file is automatically generated.\n' + | |||
| '# Do not modify this file -- ' + MARKER + '\n'; | |||
| function StudioBuilder (projectRoot) { | |||
| GenericBuilder.call(this, projectRoot); | |||
| this.binDirs = {gradle: this.binDirs.studio}; | |||
| } | |||
| util.inherits(StudioBuilder, GenericBuilder); | |||
| StudioBuilder.prototype.getArgs = function (cmd, opts) { | |||
| if (cmd === 'release') { | |||
| cmd = 'cdvBuildRelease'; | |||
| } else if (cmd === 'debug') { | |||
| cmd = 'cdvBuildDebug'; | |||
| } | |||
| var args = [cmd, '-b', path.join(this.root, 'build.gradle')]; | |||
| if (opts.arch) { | |||
| args.push('-PcdvBuildArch=' + opts.arch); | |||
| } | |||
| // 10 seconds -> 6 seconds | |||
| args.push('-Dorg.gradle.daemon=true'); | |||
| // to allow dex in process | |||
| args.push('-Dorg.gradle.jvmargs=-Xmx2048m'); | |||
| // allow NDK to be used - required by Gradle 1.5 plugin | |||
| // args.push('-Pandroid.useDeprecatedNdk=true'); | |||
| args.push.apply(args, opts.extraArgs); | |||
| // Shaves another 100ms, but produces a "try at own risk" warning. Not worth it (yet): | |||
| // args.push('-Dorg.gradle.parallel=true'); | |||
| return args; | |||
| }; | |||
| /* | |||
| * This returns a promise | |||
| */ | |||
| StudioBuilder.prototype.runGradleWrapper = function (gradle_cmd) { | |||
| var gradlePath = path.join(this.root, 'gradlew'); | |||
| var wrapperGradle = path.join(this.root, 'wrapper.gradle'); | |||
| if (fs.existsSync(gradlePath)) { | |||
| // Literally do nothing, for some reason this works, while !fs.existsSync didn't on Windows | |||
| } else { | |||
| return spawn(gradle_cmd, ['-p', this.root, 'wrapper', '-b', wrapperGradle], {stdio: 'inherit'}); | |||
| } | |||
| }; | |||
| StudioBuilder.prototype.readProjectProperties = function () { | |||
| function findAllUniq (data, r) { | |||
| var s = {}; | |||
| var m; | |||
| while ((m = r.exec(data))) { | |||
| s[m[1]] = 1; | |||
| } | |||
| return Object.keys(s); | |||
| } | |||
| var data = fs.readFileSync(path.join(this.root, 'project.properties'), 'utf8'); | |||
| return { | |||
| libs: findAllUniq(data, /^\s*android\.library\.reference\.\d+=(.*)(?:\s|$)/mg), | |||
| gradleIncludes: findAllUniq(data, /^\s*cordova\.gradle\.include\.\d+=(.*)(?:\s|$)/mg), | |||
| systemLibs: findAllUniq(data, /^\s*cordova\.system\.library\.\d+=(.*)(?:\s|$)/mg) | |||
| }; | |||
| }; | |||
| StudioBuilder.prototype.extractRealProjectNameFromManifest = function () { | |||
| var manifestPath = path.join(this.root, 'app', 'src', 'main', 'AndroidManifest.xml'); | |||
| var manifestData = fs.readFileSync(manifestPath, 'utf8'); | |||
| var m = /<manifest[\s\S]*?package\s*=\s*"(.*?)"/i.exec(manifestData); | |||
| if (!m) { | |||
| throw new CordovaError('Could not find package name in ' + manifestPath); | |||
| } | |||
| var packageName = m[1]; | |||
| var lastDotIndex = packageName.lastIndexOf('.'); | |||
| return packageName.substring(lastDotIndex + 1); | |||
| }; | |||
| // Makes the project buildable, minus the gradle wrapper. | |||
| StudioBuilder.prototype.prepBuildFiles = function () { | |||
| // Update the version of build.gradle in each dependent library. | |||
| var pluginBuildGradle = path.join(this.root, 'cordova', 'lib', 'plugin-build.gradle'); | |||
| var propertiesObj = this.readProjectProperties(); | |||
| var subProjects = propertiesObj.libs; | |||
| // Check and copy the gradle file into the subproject | |||
| // Called by the loop before this function def | |||
| var checkAndCopy = function (subProject, root) { | |||
| var subProjectGradle = path.join(root, subProject, 'build.gradle'); | |||
| // This is the future-proof way of checking if a file exists | |||
| // This must be synchronous to satisfy a Travis test | |||
| try { | |||
| fs.accessSync(subProjectGradle, fs.F_OK); | |||
| } catch (e) { | |||
| shell.cp('-f', pluginBuildGradle, subProjectGradle); | |||
| } | |||
| }; | |||
| for (var i = 0; i < subProjects.length; ++i) { | |||
| if (subProjects[i] !== 'CordovaLib') { | |||
| checkAndCopy(subProjects[i], this.root); | |||
| } | |||
| } | |||
| var name = this.extractRealProjectNameFromManifest(); | |||
| // Remove the proj.id/name- prefix from projects: https://issues.apache.org/jira/browse/CB-9149 | |||
| var settingsGradlePaths = subProjects.map(function (p) { | |||
| var realDir = p.replace(/[/\\]/g, ':'); | |||
| var libName = realDir.replace(name + '-', ''); | |||
| var str = 'include ":' + libName + '"\n'; | |||
| if (realDir.indexOf(name + '-') !== -1) { | |||
| str += 'project(":' + libName + '").projectDir = new File("' + p + '")\n'; | |||
| } | |||
| return str; | |||
| }); | |||
| fs.writeFileSync(path.join(this.root, 'settings.gradle'), | |||
| '// GENERATED FILE - DO NOT EDIT\n' + | |||
| 'include ":"\n' + settingsGradlePaths.join('')); | |||
| // Update dependencies within build.gradle. | |||
| var buildGradle = fs.readFileSync(path.join(this.root, 'app', 'build.gradle'), 'utf8'); | |||
| var depsList = ''; | |||
| var root = this.root; | |||
| var insertExclude = function (p) { | |||
| var gradlePath = path.join(root, p, 'build.gradle'); | |||
| var projectGradleFile = fs.readFileSync(gradlePath, 'utf-8'); | |||
| if (projectGradleFile.indexOf('CordovaLib') !== -1) { | |||
| depsList += '{\n exclude module:("CordovaLib")\n }\n'; | |||
| } else { | |||
| depsList += '\n'; | |||
| } | |||
| }; | |||
| subProjects.forEach(function (p) { | |||
| events.emit('log', 'Subproject Path: ' + p); | |||
| var libName = p.replace(/[/\\]/g, ':').replace(name + '-', ''); | |||
| if (libName !== 'app') { | |||
| depsList += ' implementation(project(path: ":' + libName + '"))'; | |||
| insertExclude(p); | |||
| } | |||
| }); | |||
| // For why we do this mapping: https://issues.apache.org/jira/browse/CB-8390 | |||
| var SYSTEM_LIBRARY_MAPPINGS = [ | |||
| [/^\/?extras\/android\/support\/(.*)$/, 'com.android.support:support-$1:+'], | |||
| [/^\/?google\/google_play_services\/libproject\/google-play-services_lib\/?$/, 'com.google.android.gms:play-services:+'] | |||
| ]; | |||
| propertiesObj.systemLibs.forEach(function (p) { | |||
| var mavenRef; | |||
| // It's already in gradle form if it has two ':'s | |||
| if (/:.*:/.exec(p)) { | |||
| mavenRef = p; | |||
| } else { | |||
| for (var i = 0; i < SYSTEM_LIBRARY_MAPPINGS.length; ++i) { | |||
| var pair = SYSTEM_LIBRARY_MAPPINGS[i]; | |||
| if (pair[0].exec(p)) { | |||
| mavenRef = p.replace(pair[0], pair[1]); | |||
| break; | |||
| } | |||
| } | |||
| if (!mavenRef) { | |||
| throw new CordovaError('Unsupported system library (does not work with gradle): ' + p); | |||
| } | |||
| } | |||
| depsList += ' compile "' + mavenRef + '"\n'; | |||
| }); | |||
| buildGradle = buildGradle.replace(/(SUB-PROJECT DEPENDENCIES START)[\s\S]*(\/\/ SUB-PROJECT DEPENDENCIES END)/, '$1\n' + depsList + ' $2'); | |||
| var includeList = ''; | |||
| propertiesObj.gradleIncludes.forEach(function (includePath) { | |||
| includeList += 'apply from: "../' + includePath + '"\n'; | |||
| }); | |||
| buildGradle = buildGradle.replace(/(PLUGIN GRADLE EXTENSIONS START)[\s\S]*(\/\/ PLUGIN GRADLE EXTENSIONS END)/, '$1\n' + includeList + '$2'); | |||
| // This needs to be stored in the app gradle, not the root grade | |||
| fs.writeFileSync(path.join(this.root, 'app', 'build.gradle'), buildGradle); | |||
| }; | |||
| StudioBuilder.prototype.prepEnv = function (opts) { | |||
| var self = this; | |||
| return check_reqs.check_gradle() | |||
| .then(function (gradlePath) { | |||
| return self.runGradleWrapper(gradlePath); | |||
| }).then(function () { | |||
| return self.prepBuildFiles(); | |||
| }).then(function () { | |||
| // If the gradle distribution URL is set, make sure it points to version we want. | |||
| // If it's not set, do nothing, assuming that we're using a future version of gradle that we don't want to mess with. | |||
| // For some reason, using ^ and $ don't work. This does the job, though. | |||
| var distributionUrlRegex = /distributionUrl.*zip/; | |||
| var distributionUrl = process.env['CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL'] || 'https\\://services.gradle.org/distributions/gradle-4.1-all.zip'; | |||
| var gradleWrapperPropertiesPath = path.join(self.root, 'gradle', 'wrapper', 'gradle-wrapper.properties'); | |||
| shell.chmod('u+w', gradleWrapperPropertiesPath); | |||
| shell.sed('-i', distributionUrlRegex, 'distributionUrl=' + distributionUrl, gradleWrapperPropertiesPath); | |||
| var propertiesFile = opts.buildType + SIGNING_PROPERTIES; | |||
| var propertiesFilePath = path.join(self.root, propertiesFile); | |||
| if (opts.packageInfo) { | |||
| fs.writeFileSync(propertiesFilePath, TEMPLATE + opts.packageInfo.toProperties()); | |||
| } else if (isAutoGenerated(propertiesFilePath)) { | |||
| shell.rm('-f', propertiesFilePath); | |||
| } | |||
| }); | |||
| }; | |||
| /* | |||
| * Builds the project with gradle. | |||
| * Returns a promise. | |||
| */ | |||
| StudioBuilder.prototype.build = function (opts) { | |||
| var wrapper = path.join(this.root, 'gradlew'); | |||
| var args = this.getArgs(opts.buildType === 'debug' ? 'debug' : 'release', opts); | |||
| return spawn(wrapper, args, {stdio: 'pipe'}) | |||
| .progress(function (stdio) { | |||
| if (stdio.stderr) { | |||
| /* | |||
| * Workaround for the issue with Java printing some unwanted information to | |||
| * stderr instead of stdout. | |||
| * This function suppresses 'Picked up _JAVA_OPTIONS' message from being | |||
| * printed to stderr. See https://issues.apache.org/jira/browse/CB-9971 for | |||
| * explanation. | |||
| */ | |||
| var suppressThisLine = /^Picked up _JAVA_OPTIONS: /i.test(stdio.stderr.toString()); | |||
| if (suppressThisLine) { | |||
| return; | |||
| } | |||
| process.stderr.write(stdio.stderr); | |||
| } else { | |||
| process.stdout.write(stdio.stdout); | |||
| } | |||
| }).catch(function (error) { | |||
| if (error.toString().indexOf('failed to find target with hash string') >= 0) { | |||
| return check_reqs.check_android_target(error).then(function () { | |||
| // If due to some odd reason - check_android_target succeeds | |||
| // we should still fail here. | |||
| return Q.reject(error); | |||
| }); | |||
| } | |||
| return Q.reject(error); | |||
| }); | |||
| }; | |||
| StudioBuilder.prototype.clean = function (opts) { | |||
| var builder = this; | |||
| var wrapper = path.join(this.root, 'gradlew'); | |||
| var args = builder.getArgs('clean', opts); | |||
| return Q().then(function () { | |||
| return spawn(wrapper, args, {stdio: 'inherit'}); | |||
| }) | |||
| .then(function () { | |||
| shell.rm('-rf', path.join(builder.root, 'out')); | |||
| ['debug', 'release'].forEach(function (config) { | |||
| var propertiesFilePath = path.join(builder.root, config + SIGNING_PROPERTIES); | |||
| if (isAutoGenerated(propertiesFilePath)) { | |||
| shell.rm('-f', propertiesFilePath); | |||
| } | |||
| }); | |||
| }); | |||
| }; | |||
| module.exports = StudioBuilder; | |||
| function isAutoGenerated (file) { | |||
| return fs.existsSync(file) && fs.readFileSync(file, 'utf8').indexOf(MARKER) > 0; | |||
| } | |||
+ 21
- 33
node_modules/cordova-android/bin/templates/cordova/lib/builders/builders.js
View File
| @@ -1,46 +1,34 @@ | |||
| /* | |||
| 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 | |||
| 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 | |||
| 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. | |||
| 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 CordovaError = require('cordova-common').CordovaError; | |||
| var knownBuilders = { | |||
| gradle: 'GradleBuilder', | |||
| studio: 'StudioBuilder', | |||
| none: 'GenericBuilder' | |||
| }; | |||
| const CordovaError = require('cordova-common').CordovaError; | |||
| /** | |||
| * Helper method that instantiates and returns a builder for specified build | |||
| * type. | |||
| * Helper method that instantiates and returns a builder for specified build type. | |||
| * | |||
| * @param {String} builderType Builder name to construct and return. Must | |||
| * be one of 'ant', 'gradle' or 'none' | |||
| * | |||
| * @return {Builder} A builder instance for specified build type. | |||
| * @return {Builder} A builder instance for specified build type. | |||
| */ | |||
| module.exports.getBuilder = function (builderType, projectRoot) { | |||
| if (!knownBuilders[builderType]) { throw new CordovaError('Builder ' + builderType + ' is not supported.'); } | |||
| module.exports.getBuilder = function () { | |||
| try { | |||
| var Builder = require('./' + knownBuilders[builderType]); | |||
| return new Builder(projectRoot); | |||
| const Builder = require('./ProjectBuilder'); | |||
| return new Builder(); | |||
| } catch (err) { | |||
| throw new CordovaError('Failed to instantiate ' + knownBuilders[builderType] + ' builder: ' + err); | |||
| throw new CordovaError('Failed to instantiate ProjectBuilder builder: ' + err); | |||
| } | |||
| }; | |||
+ 21
- 9
node_modules/cordova-android/bin/templates/cordova/lib/check_reqs.js
View File
| @@ -19,8 +19,6 @@ | |||
| under the License. | |||
| */ | |||
| /* jshint sub:true */ | |||
| var shelljs = require('shelljs'); | |||
| var child_process = require('child_process'); | |||
| var Q = require('q'); | |||
| @@ -205,10 +203,12 @@ module.exports.check_java = function () { | |||
| return match && match[1]; | |||
| }, () => { | |||
| var msg = | |||
| 'Failed to run "javac -version", make sure that you have a JDK installed.\n' + | |||
| 'You can get it from: http://www.oracle.com/technetwork/java/javase/downloads.\n'; | |||
| 'Failed to run "javac -version", make sure that you have a JDK version 8 installed.\n' + | |||
| 'You can get it from the following location:\n' + | |||
| 'https://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html'; | |||
| if (process.env['JAVA_HOME']) { | |||
| msg += 'Your JAVA_HOME is invalid: ' + process.env['JAVA_HOME'] + '\n'; | |||
| msg += '\n\n'; | |||
| msg += 'Your JAVA_HOME is invalid: ' + process.env['JAVA_HOME']; | |||
| } | |||
| throw new CordovaError(msg); | |||
| }); | |||
| @@ -231,6 +231,14 @@ module.exports.check_android = function () { | |||
| // First ensure ANDROID_HOME is set | |||
| // If we have no hints (nothing in PATH), try a few default locations | |||
| if (!hasAndroidHome && !androidCmdPath && !adbInPath && !avdmanagerInPath) { | |||
| if (process.env['ANDROID_SDK_ROOT']) { | |||
| // Quick fix to set ANDROID_HOME according to ANDROID_SDK_ROOT | |||
| // if ANDROID_HOME is **not** defined and | |||
| // ANDROID_SDK_ROOT **is** defined | |||
| // according to environment variables as documented in: | |||
| // https://developer.android.com/studio/command-line/variables | |||
| maybeSetAndroidHome(path.join(process.env['ANDROID_SDK_ROOT'])); | |||
| } | |||
| if (module.exports.isWindows()) { | |||
| // Android Studio 1.0 installer | |||
| maybeSetAndroidHome(path.join(process.env['LOCALAPPDATA'], 'Android', 'sdk')); | |||
| @@ -355,15 +363,19 @@ module.exports.check_android_target = function (originalError) { | |||
| // Returns a promise. | |||
| module.exports.run = function () { | |||
| return Q.all([this.check_java(), this.check_android()]).then(function (values) { | |||
| console.log('ANDROID_HOME=' + process.env['ANDROID_HOME']); | |||
| console.log('JAVA_HOME=' + process.env['JAVA_HOME']); | |||
| console.log('Checking Java JDK and Android SDK versions'); | |||
| console.log('ANDROID_SDK_ROOT=' + process.env['ANDROID_SDK_ROOT'] + ' (recommended setting)'); | |||
| console.log('ANDROID_HOME=' + process.env['ANDROID_HOME'] + ' (DEPRECATED)'); | |||
| if (!String(values[0]).startsWith('1.8.')) { | |||
| throw new CordovaError('Requirements check failed for JDK 1.8'); | |||
| throw new CordovaError( | |||
| 'Requirements check failed for JDK 8 (\'1.8.*\')! Detected version: ' + values[0] + '\n' + | |||
| 'Check your ANDROID_SDK_ROOT / JAVA_HOME / PATH environment variables.' | |||
| ); | |||
| } | |||
| if (!values[1]) { | |||
| throw new CordovaError('Requirements check failed for Android SDK'); | |||
| throw new CordovaError('Requirements check failed for Android SDK! Android SDK was not detected.'); | |||
| } | |||
| }); | |||
| }; | |||
+ 5
- 6
node_modules/cordova-android/bin/templates/cordova/lib/device.js
View File
| @@ -19,7 +19,6 @@ | |||
| under the License. | |||
| */ | |||
| var Q = require('q'); | |||
| var build = require('./build'); | |||
| var path = require('path'); | |||
| var Adb = require('./Adb'); | |||
| @@ -53,13 +52,13 @@ module.exports.list = function (lookHarder) { | |||
| module.exports.resolveTarget = function (target) { | |||
| return this.list(true).then(function (device_list) { | |||
| if (!device_list || !device_list.length) { | |||
| return Q.reject(new CordovaError('Failed to deploy to device, no devices found.')); | |||
| return Promise.reject(new CordovaError('Failed to deploy to device, no devices found.')); | |||
| } | |||
| // default device | |||
| target = target || device_list[0]; | |||
| if (device_list.indexOf(target) < 0) { | |||
| return Q.reject('ERROR: Unable to find target \'' + target + '\'.'); | |||
| return Promise.reject(new CordovaError('ERROR: Unable to find target \'' + target + '\'.')); | |||
| } | |||
| return build.detectArchitecture(target).then(function (arch) { | |||
| @@ -74,7 +73,7 @@ module.exports.resolveTarget = function (target) { | |||
| * Returns a promise. | |||
| */ | |||
| module.exports.install = function (target, buildResults) { | |||
| return Q().then(function () { | |||
| return Promise.resolve().then(function () { | |||
| if (target && typeof target === 'object') { | |||
| return target; | |||
| } | |||
| @@ -87,7 +86,7 @@ module.exports.install = function (target, buildResults) { | |||
| events.emit('log', 'Using apk: ' + apk_path); | |||
| events.emit('log', 'Package name: ' + pkgName); | |||
| return Adb.install(resolvedTarget.target, apk_path, {replace: true}).catch(function (error) { | |||
| return Adb.install(resolvedTarget.target, apk_path, { replace: true }).catch(function (error) { | |||
| // CB-9557 CB-10157 only uninstall and reinstall app if the one that | |||
| // is already installed on device was signed w/different certificate | |||
| if (!/INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES/.test(error.toString())) { throw error; } | |||
| @@ -98,7 +97,7 @@ module.exports.install = function (target, buildResults) { | |||
| // This promise is always resolved, even if 'adb uninstall' fails to uninstall app | |||
| // or the app doesn't installed at all, so no error catching needed. | |||
| return Adb.uninstall(resolvedTarget.target, pkgName).then(function () { | |||
| return Adb.install(resolvedTarget.target, apk_path, {replace: true}); | |||
| return Adb.install(resolvedTarget.target, apk_path, { replace: true }); | |||
| }); | |||
| }).then(function () { | |||
| // unlock screen | |||
+ 28
- 32
node_modules/cordova-android/bin/templates/cordova/lib/emulator.js
View File
| @@ -19,8 +19,6 @@ | |||
| under the License. | |||
| */ | |||
| /* jshint sub:true */ | |||
| var android_versions = require('android-versions'); | |||
| var retry = require('./retry'); | |||
| var build = require('./build'); | |||
| @@ -34,7 +32,6 @@ var shelljs = require('shelljs'); | |||
| var android_sdk = require('./android_sdk'); | |||
| var check_reqs = require('./check_reqs'); | |||
| var Q = require('q'); | |||
| var os = require('os'); | |||
| var fs = require('fs'); | |||
| var child_process = require('child_process'); | |||
| @@ -170,15 +167,13 @@ module.exports.list_images_using_android = function () { | |||
| } | |||
| */ | |||
| module.exports.list_images = function () { | |||
| return Q.fcall(function () { | |||
| return Promise.resolve().then(function () { | |||
| if (forgivingWhichSync('avdmanager')) { | |||
| return module.exports.list_images_using_avdmanager(); | |||
| } else if (forgivingWhichSync('android')) { | |||
| return module.exports.list_images_using_android(); | |||
| } else { | |||
| return Q().then(function () { | |||
| throw new CordovaError('Could not find either `android` or `avdmanager` on your $PATH! Are you sure the Android SDK is installed and available?'); | |||
| }); | |||
| return Promise.reject(new CordovaError('Could not find either `android` or `avdmanager` on your $PATH! Are you sure the Android SDK is installed and available?')); | |||
| } | |||
| }).then(function (avds) { | |||
| // In case we're missing the Android OS version string from the target description, add it. | |||
| @@ -228,13 +223,13 @@ module.exports.best_image = function () { | |||
| // Returns a promise. | |||
| module.exports.list_started = function () { | |||
| return Adb.devices({emulators: true}); | |||
| return Adb.devices({ emulators: true }); | |||
| }; | |||
| // Returns a promise. | |||
| // TODO: we should remove this, there's a more robust method under android_sdk.js | |||
| module.exports.list_targets = function () { | |||
| return superspawn.spawn('android', ['list', 'targets'], {cwd: os.tmpdir()}).then(function (output) { | |||
| return superspawn.spawn('android', ['list', 'targets'], { cwd: os.tmpdir() }).then(function (output) { | |||
| var target_out = output.split('\n'); | |||
| var targets = []; | |||
| for (var i = target_out.length; i >= 0; i--) { | |||
| @@ -277,8 +272,8 @@ module.exports.get_available_port = function () { | |||
| module.exports.start = function (emulator_ID, boot_timeout) { | |||
| var self = this; | |||
| return Q().then(function () { | |||
| if (emulator_ID) return Q(emulator_ID); | |||
| return Promise.resolve().then(function () { | |||
| if (emulator_ID) return Promise.resolve(emulator_ID); | |||
| return self.best_image().then(function (best) { | |||
| if (best && best.name) { | |||
| @@ -287,7 +282,7 @@ module.exports.start = function (emulator_ID, boot_timeout) { | |||
| } | |||
| var androidCmd = check_reqs.getAbsoluteAndroidCmd(); | |||
| return Q.reject(new CordovaError('No emulator images (avds) found.\n' + | |||
| return Promise.reject(new CordovaError('No emulator images (avds) found.\n' + | |||
| '1. Download desired System Image by running: ' + androidCmd + ' sdk\n' + | |||
| '2. Create an AVD by running: ' + androidCmd + ' avd\n' + | |||
| 'HINT: For a faster emulator, use an Intel System Image and install the HAXM device driver\n')); | |||
| @@ -308,7 +303,7 @@ module.exports.start = function (emulator_ID, boot_timeout) { | |||
| return self.wait_for_emulator(port); | |||
| }); | |||
| }).then(function (emulatorId) { | |||
| if (!emulatorId) { return Q.reject(new CordovaError('Failed to start emulator')); } | |||
| if (!emulatorId) { return Promise.reject(new CordovaError('Failed to start emulator')); } | |||
| // wait for emulator to boot up | |||
| process.stdout.write('Waiting for emulator to boot (this may take a while)...'); | |||
| @@ -334,7 +329,7 @@ module.exports.start = function (emulator_ID, boot_timeout) { | |||
| */ | |||
| module.exports.wait_for_emulator = function (port) { | |||
| var self = this; | |||
| return Q().then(function () { | |||
| return Promise.resolve().then(function () { | |||
| var emulator_id = 'emulator-' + port; | |||
| return Adb.shell(emulator_id, 'getprop dev.bootcomplete').then(function (output) { | |||
| if (output.indexOf('1') >= 0) { | |||
| @@ -345,7 +340,8 @@ module.exports.wait_for_emulator = function (port) { | |||
| if ((error && error.message && | |||
| (error.message.indexOf('not found') > -1)) || | |||
| (error.message.indexOf('device offline') > -1) || | |||
| (error.message.indexOf('device still connecting') > -1)) { | |||
| (error.message.indexOf('device still connecting') > -1) || | |||
| (error.message.indexOf('device still authorizing') > -1)) { | |||
| // emulator not yet started, continue waiting | |||
| return self.wait_for_emulator(port); | |||
| } else { | |||
| @@ -371,10 +367,13 @@ module.exports.wait_for_boot = function (emulator_id, time_remaining) { | |||
| } else { | |||
| process.stdout.write('.'); | |||
| // Check at regular intervals | |||
| return Q.delay(time_remaining < CHECK_BOOTED_INTERVAL ? time_remaining : CHECK_BOOTED_INTERVAL).then(function () { | |||
| var updated_time = time_remaining >= 0 ? Math.max(time_remaining - CHECK_BOOTED_INTERVAL, 0) : time_remaining; | |||
| return self.wait_for_boot(emulator_id, updated_time); | |||
| return new Promise(resolve => { | |||
| const delay = time_remaining < CHECK_BOOTED_INTERVAL ? time_remaining : CHECK_BOOTED_INTERVAL; | |||
| setTimeout(() => { | |||
| const updated_time = time_remaining >= 0 ? Math.max(time_remaining - CHECK_BOOTED_INTERVAL, 0) : time_remaining; | |||
| resolve(self.wait_for_boot(emulator_id, updated_time)); | |||
| }, delay); | |||
| }); | |||
| } | |||
| }); | |||
| @@ -400,7 +399,7 @@ module.exports.create_image = function (name, target) { | |||
| // TODO: This seems like another error case, even though it always happens. | |||
| console.error('ERROR : Unable to create an avd emulator, no targets found.'); | |||
| console.error('Ensure you have targets available by running the "android" command'); | |||
| return Q.reject(); | |||
| return Promise.reject(new CordovaError()); | |||
| }, function (error) { | |||
| console.error('ERROR : Failed to create emulator image : '); | |||
| console.error(error); | |||
| @@ -411,17 +410,17 @@ module.exports.create_image = function (name, target) { | |||
| module.exports.resolveTarget = function (target) { | |||
| return this.list_started().then(function (emulator_list) { | |||
| if (emulator_list.length < 1) { | |||
| return Q.reject('No running Android emulators found, please start an emulator before deploying your project.'); | |||
| return Promise.reject(new CordovaError('No running Android emulators found, please start an emulator before deploying your project.')); | |||
| } | |||
| // default emulator | |||
| target = target || emulator_list[0]; | |||
| if (emulator_list.indexOf(target) < 0) { | |||
| return Q.reject('Unable to find target \'' + target + '\'. Failed to deploy to emulator.'); | |||
| return Promise.reject(new CordovaError('Unable to find target \'' + target + '\'. Failed to deploy to emulator.')); | |||
| } | |||
| return build.detectArchitecture(target).then(function (arch) { | |||
| return {target: target, arch: arch, isEmulator: true}; | |||
| return { target: target, arch: arch, isEmulator: true }; | |||
| }); | |||
| }); | |||
| }; | |||
| @@ -436,15 +435,12 @@ module.exports.install = function (givenTarget, buildResults) { | |||
| var target; | |||
| // We need to find the proper path to the Android Manifest | |||
| var manifestPath = path.join(__dirname, '..', '..', 'app', 'src', 'main', 'AndroidManifest.xml'); | |||
| if (buildResults.buildMethod === 'gradle') { | |||
| manifestPath = path.join(__dirname, '../../AndroidManifest.xml'); | |||
| } | |||
| var manifest = new AndroidManifest(manifestPath); | |||
| var pkgName = manifest.getPackageId(); | |||
| const manifestPath = path.join(__dirname, '..', '..', 'app', 'src', 'main', 'AndroidManifest.xml'); | |||
| const manifest = new AndroidManifest(manifestPath); | |||
| const pkgName = manifest.getPackageId(); | |||
| // resolve the target emulator | |||
| return Q().then(function () { | |||
| return Promise.resolve().then(function () { | |||
| if (givenTarget && typeof givenTarget === 'object') { | |||
| return givenTarget; | |||
| } else { | |||
| @@ -459,7 +455,7 @@ module.exports.install = function (givenTarget, buildResults) { | |||
| }).then(function () { | |||