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
filmaj
3ff32092a3
CB-12954 🔪 remove jshint leftovers
2017-06-26 12:26:53 -05: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
1cda7a9de0
CB-11244: Found bug in Api.js where xml/strings.xml is used instead of values/strings.xml
2017-06-19 14:34:03 -07:00
Joe Bowser
49b76f5c71
Fixing mangled commits that crept into this branch
2017-06-14 11:36:43 -07:00
Joe Bowser
fb6cb51e64
Fixing lint errors
2017-06-14 09:57:28 -07:00
Joe Bowser
28ebbb8f02
CB-11244: Setup Api.js to support multiple builders based on project structure
2017-06-14 09:57:28 -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
Steve Gill
13dbd2f5d4
Set VERSION to 6.3.0-dev (via coho)
2017-03-28 15:18:35 -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
filmaj
ebd4a02d2c
CB-12546: switch to superspawn for shelling out where possible. rework android sdk module to work with new sdk.
2017-03-20 10:09:45 -07:00
filmaj
4a354bba86
CB-12546: based on android command exit code and stdout, conditionally try to invoke avdmanager to list out AVD images. tweak relevant test to match behaviour. small tweak to use exposed methods for checking platform (for easier future stubbing).
2017-03-20 10:08:36 -07:00
filmaj
d40c22441f
CB-12546: move check_reqs to templates directory and update module references.
2017-03-20 10:08:36 -07:00
filmaj
6395eda0c8
CB-12546: emulator specs.
2017-03-20 10:08:36 -07:00
filmaj
eb6ada8091
CB-12546: more robust sdk location detection. ANDROID_HOME now can be set from location of either of adb, android or avdmanager commands. slightly rework logic of infering ANDROID_HOME + setting up PATH to hopefully separate the logic into clearer sections. check_reqs.check_android now validates SDK Tools 25.3.1 binaries/structure. added specs for check_reqs.check_android. move android sdk version script. expose some helper functions as module methods to help with mocking.
2017-03-20 10:08:35 -07:00
filmaj
a7ef686a27
CB-12546: leverage avdmanager if android warns it is no longer
...
useful, which happens in Android SDK Tools 25.3.1.
explicitly set the CWD of the spawned emulator process to workaround a recent google android sdk bug.
rename android_sdk_version.js to android_sdk.js, to better reflect its contents.
have create.js copy over the android_sdk_version batch file.
2017-03-20 10:08:35 -07:00
