github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-04-23 00:00:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,534 Commits 56 Branches 164 Tags
6cf6e20d2ec7a9e90d9aec1cbdbf5b34e08c799d
Commit Graph

232 Commits

Author SHA1 Message Date
Joe Bowser 6cf6e20d2e Merge branch 'master' into StudioProjectCompat, fixing conflicts, need 
to re-add previous PR fix on the branch
 2017-10-18 11:04:44 -07:00
filmaj 1f12fdbeea CB-13404: add android-versions to bundledDependencies. Ignore best emulator selection when parsed AVD information does not include API level in the target 2017-10-05 15:17:31 -05:00
Joe Bowser 8743e88550 CB-11244: Fixing eslint errors 2017-10-03 15:06:54 -07:00
Joe Bowser f3c238db1c CB-11244: Adding specs for resource files inside an Android Studio Project 2017-10-03 14:16:27 -07:00
Joe Bowser 2534a3c767 CB-11244: Added remapping for drawables 2017-10-02 19:04:40 -07:00
Joe Bowser b1f527e682 Merge branch 'master' into StudioProjectCompat 2017-09-28 10:21:49 -07:00
Joe Bowser 7d282426c4 Merge branch 'master' into StudioProjectCompat 
Another merge commit to track master changes
 2017-09-14 11:45:57 -07:00
filmaj 1637937664 CB-12981: handle SDK 26.0.2 slightly different AVD list output for Android 8+ AVDs. Would cause "cannot read property replace of undefined" errors when trying to deploy an Android 8 emulator. 2017-09-14 11:26:18 -07:00
filmaj 03144eb160 Add a node and npm package.json script for running java unit tests. Include them in the top-level npm test script. Run java unit tests in travis. Small refactor in gradlebuilder to support building gradle wrapper more easily. Don't explicitly build gradlew on appveyor CI as now npm test will do it for you. 2017-09-14 09:57:37 -07:00
Gil Pedersen cb2f396e33 Update maven repo to include most recent lib versions 2017-08-29 17:27:02 +02:00
Joe Bowser 8fdb16c555 Fixing cordova-cli related bug 2017-08-04 12:00:39 -07:00
Joe Bowser e91b19d006 Fixing error caused by merge commit 2017-07-31 14:10:14 -07:00
Joe Bowser 46905ebe99 Merge branch 'master' into StudioProjectCompat. Dealing with latest 
commits merged into master.
 2017-07-31 13:43:21 -07:00
Nikita Matrosov 2b53c98cf5 CB-12453: Remove unnecessary double quotes from .bat files which are the causes of crash if project path contains spaces 
this closes #362
 2017-07-28 14:23:53 +03:00
Nikita Matrosov 36d07d7a15 CB-13031: Fix bug with case-sensitivity of android-packageName 
this closes #397
 2017-07-28 14:05:53 +03:00
Joe Bowser d0dab4bb09 Merge branch 'master' into StudioProjectCompat 
I fixed the master so it passes eslint.
 2017-07-18 14:25:56 -07:00
Joe Bowser 893356abcd CB-13034: Fixing eslint error 2017-07-18 14:13:53 -07:00
Darryl Pogue 22645d9158 [CB-10916] Support display name for Android 2017-07-14 17:37:15 -02:30
Joe Bowser 245d9a1e46 Merge branch 'master' into StudioProjectCompat 2017-07-12 09:33:37 -07:00
Joe Bowser a7304b9a19 Finishing the linting 2017-06-27 13:15:04 -07:00
Nikita Matrosov 540929c6a0 CB-9971: Suppressed unwanted java stderr output when running gradle wrapper 
this closes #388
 2017-06-26 21:17:58 +03:00
Joe Bowser e456175a81 Merge branch 'master' into StudioProjectCompat 
This will have to be linted
 2017-06-26 10:29:31 -07:00
Audrey So 55d7cf3865 CB-12895 : updated .eslintrc file in spec dir and set jasmine true and removed root is true 2017-06-23 08:44:08 -07:00
Audrey So d83d49d83b CB-12895 : fixed eslint errors 2017-06-23 08:07:08 -07:00
Joe Bowser b20028c42b The prepare step was broken, which breaks the CLI workflow. This was caused by hardcoding the Java directory, which is a very bad idea. 2017-06-22 13:46:18 -07:00
Jesse MacFadyen 5cc14b8031 CB-12605 In Windows get Android studio path from the registry 
This closes #387
 2017-06-22 10:55:39 -07:00
Joe Bowser 49b76f5c71 Fixing mangled commits that crept into this branch 2017-06-14 11:36:43 -07:00
Joe Bowser bd4ddcdedd Updated AndroidStudio to only look for the app directory to determine studio status 2017-06-14 09:57:28 -07:00
Joe Bowser e621edfba7 Fixing the Android Studio detection and making it automatically pick the right builder, good for upgrading Cordova 2017-06-14 09:57:27 -07:00
Joe Bowser 304a899114 Fixed the specification of the builders in the run command by getting build to check what was being passed from run 2017-06-14 09:57:27 -07:00
Joe Bowser 8391af2e8f JsHint Fixes, deleting unused methods 2017-06-14 09:57:27 -07:00
Joe Bowser 69ab6a0e0d Changing the project to add the app directory as a dependency 2017-06-14 09:57:27 -07:00
Joe Bowser 69260fb96a Fix the overwriting of Fil's fix, blargh 2017-06-14 09:57:27 -07:00
Joe Bowser db87e0ae6a Made changes so cordova/build builds with the new project. Need to work on plugin installation. 2017-06-14 09:57:26 -07:00
Joe Bowser 23d8d99925 Moving Android Manifest finding to the Gradle and Studio builders. 2017-06-14 09:57:25 -07:00
Joe Bowser d88df59c32 Adding the Studio Builder to build a project based on Android Studio, 
and deleting Ant, since Google does not support Ant Builds anymore.
Sorry guys!
 2017-06-14 09:57:25 -07:00
Darryl Pogue 7d926822ed CB-8980: Ensure copied resource-files are cleaned 
This closes #377
 2017-05-25 16:11:20 -07:00
filmaj 9d9abea157 Start of GradleBuilder.js specs - puts it on the code coverage radar. 2017-05-02 15:31:26 -07:00
filmaj e13e15d3e9 CB-12640: better handling of unrecognized commands on windows. removed error checking in emulator image listing when shelling out, as we already defensively dont shell out if the program is not on the PATH / not recognized. added additional test for windows unrecognized command errors for target listing. fixed up spying in a test. 2017-04-10 12:12:46 -07:00
filmaj 6ef2f67ae8 CB-12640: flipped avd parsing logic so that it always tries to use avdmanager to retrieve avds first, then falls back to android command if avdmanager cannot be found (and errors with ENOENT). updated tests - and added explicit tests to ensure to shell out to singular forms of sub-commands when executing android 2017-04-10 12:12:46 -07:00
filmaj 765c4ee9f6 CB-12640: support for android sdk tools 26.0.1. simplified target parsing by using avdmanager instead of sdkmanager. flipped target parsing logic so that it always tries to use avdmanager to retrieve targets first, then falls back to android command if avdmanager cannot be found (and errors with ENOENT). updated tests. 2017-04-10 12:12:46 -07:00
Darryl Pogue 0df50c3f33 CB-8978 Prepare copy resource-files from config.xml 
This closes #321
 2017-03-27 22:13:13 -07:00
Alexander Sorokin 08c80f77a9 CB-12605 Fix a requirements check failure on Windows 2017-03-27 11:47:32 +03:00
Joe Bowser ea8d65d7fc CB-12595: Remove the console.log stuff 
This closes #370
 2017-03-24 10:22:11 -07:00
Joe Bowser e3198b0f6b CB-12595: Ugly code, but this should find an Android Studio installation and use the sweet gradle center found inside 2017-03-24 10:22:07 -07:00
filmaj 2f2e8a560d CB-12546: account for quotes when detecting android command error for Windows. 2017-03-20 10:09:46 -07:00
filmaj 884818934f CB-12546: on create, update the require path for certain helper modules as directory structure differs. big ol TODO dropped as it _is_ kinda weird. 2017-03-20 10:09:45 -07:00
filmaj 1d8e6f53a1 CB-12546: sort detected targets by numerical suffix when reporting most recent version of android sdk target installed. 2017-03-20 10:09:45 -07:00
filmaj 3554267adf CB-12546: more specs for android_sdk and check_reqs. added fixtures for sdk targets. refactored target listing. 2017-03-20 10:09:45 -07:00
filmaj f7687a2567 CB-12546: use android_sdk list_targets instead of rewriting the same thing again. 2017-03-20 10:09:45 -07:00