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
filmaj
458e479681
Trying AppVeyor-supplied workaround for current appveyor time out issues. See http://help.appveyor.com/discussions/problems/7159-builds-timing-out-after-an-hour
2017-07-27 14:33:16 -07:00
Joe Bowser
5fe95570d2
Merge branch 'master' into StudioProjectCompat
2017-07-25 15:07:56 -07:00
filmaj
c3ce2f8a07
Closes #398
2017-07-24 10:11:21 -07: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
Joe Bowser
00c879e27d
It passed then failed. I'll change the test for now, because perfect is the enemy of good.
2017-07-18 11:53:44 -07:00
Joe Bowser
b65af106ff
Make the tests pass
2017-07-17 13:07:32 -07:00
Joe Bowser
fdd7eb3446
Linting fix
2017-07-14 16:51:10 -07:00
Darryl Pogue
22645d9158
[CB-10916] Support display name for Android
2017-07-14 17:37:15 -02:30
filmaj
76dd8613ca
CB-12423: make explicit JDK 1.8 or greater is needed in the README.
2017-07-14 11:13:52 -05:00
Joe Bowser
99f15c507d
Updating paths in the unit tests, leaving the failing test and coding against that
2017-07-12 11:13:20 -07:00
Joe Bowser
849b887e20
Merge branch 'master' into StudioProjectCompat
2017-07-12 09:39:55 -07:00
Joe Bowser
245d9a1e46
Merge branch 'master' into StudioProjectCompat
2017-07-12 09:33:37 -07:00
filmaj
5917d4ef0b
CB-13006: removed create and update end-to-end tests, and instead added more unit test coverage. tweaked code coverage invocation so that we get coverage details on the create.js module. slight changes to the create.js module so that it is slightly easier to test.
2017-07-11 12:54:15 -05:00
filmaj
90053eb9df
CB-12950: lots of tweaks for end-to-end test runs, especially on CI:
...
- rename npm tasks to reflect what they do (npm run unit-tests, npm run e2e-tests). main `npm test` runs linter, unit tests and e2e tests now.
- locked jasmine down to ~2.6.0.
- consolidate gitignores.
- updated travis to run `npm test`. add android sdk installation to appveyor ci run.align android dpendencies across travis and appveyor. have appveyor install gradle. force gradle to version 3.4.1 in appveyor, as that seems to be the only version choco has. explicitly invoke sdkmanager to move license accepting process along.
2017-06-27 15:59:16 -05: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
ac4ac935f6
CB-12895 : added .eslintrc files to set up jasmine environment
2017-06-23 08:07:08 -07:00
Audrey So
d83d49d83b
CB-12895 : fixed eslint errors
2017-06-23 08:07:08 -07:00
Audrey So
e36158a0da
CB-12895 : added eslint and removed jshint
2017-06-23 08:07:07 -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
c0474e811d
Bump for travis test
2017-06-14 10:16:05 -07:00
Joe Bowser
40c9709445
OK, Going back to the old build.gradle for legacy projects
2017-06-14 09:57:29 -07:00
Joe Bowser
b67e9905bc
This is probably a bad idea, but we need to split the gradle files into legacy and new style
2017-06-14 09:57:28 -07:00
Joe Bowser
c74192d578
Adding conditional code into Gradle, this is a bit dirty since we can't explicitly test it but we'll just have to rely on jasmine
2017-06-14 09:57:28 -07:00
Joe Bowser
33feb00e8f
Adding the if statement to see if we can support both structures with minimal editing, TODO: actually write tests for this somehow
2017-06-14 09:57:28 -07:00
Joe Bowser
8f16df4c90
Adding logic to upgrade both Classic and Android Studio style project structures
2017-06-14 09:57:28 -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
a216f0db75
CB-11244: Changing directory creation, will most likely hide this behind a flag for the next release of Cordova-Android, and then make it default in the next major pending feedback
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
8ead919fae
Managed to get the project to mostly compile, still need to re-work the build command to add the app project
2017-06-14 09:57:26 -07:00
Joe Bowser
b73c04f3c8
Updating gradle version in the build file
2017-06-14 09:57:26 -07:00
Joe Bowser
f790aeb8f6
Setting up the create command so we actually have all the directories in the right place, and define default variables in the top level build.gradle
2017-06-14 09:57:26 -07:00
