Commit Graph

  • 46905ebe99 Merge branch 'master' into StudioProjectCompat. Dealing with latest commits merged into master. Joe Bowser 2017-07-31 13:43:21 -07:00
  • d364f46baa CB-12730: Compat - INTEGRATE Simon MacDonald 2017-07-24 23:40:01 -04:00
  • 2b53c98cf5 CB-12453: Remove unnecessary double quotes from .bat files which are the causes of crash if project path contains spaces Nikita Matrosov 2017-07-28 14:23:53 +03:00
  • 36d07d7a15 CB-13031: Fix bug with case-sensitivity of android-packageName Nikita Matrosov 2017-07-28 14:05:53 +03:00
  • 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 filmaj 2017-07-27 14:33:16 -07:00
  • 5fe95570d2 Merge branch 'master' into StudioProjectCompat Joe Bowser 2017-07-25 15:07:56 -07:00
  • c3ce2f8a07 Closes #398 filmaj 2017-07-24 10:11:21 -07:00
  • d0dab4bb09 Merge branch 'master' into StudioProjectCompat Joe Bowser 2017-07-18 14:25:56 -07:00
  • 893356abcd CB-13034: Fixing eslint error Joe Bowser 2017-07-18 14:13:53 -07:00
  • 00c879e27d It passed then failed. I'll change the test for now, because perfect is the enemy of good. Joe Bowser 2017-07-18 11:52:37 -07:00
  • b65af106ff Make the tests pass Joe Bowser 2017-07-17 13:07:32 -07:00
  • fdd7eb3446 Linting fix Joe Bowser 2017-07-14 16:51:10 -07:00
  • 22645d9158 [CB-10916] Support display name for Android Darryl Pogue 2016-06-07 13:02:18 -07:00
  • 76dd8613ca CB-12423: make explicit JDK 1.8 or greater is needed in the README. filmaj 2017-07-14 11:13:52 -05:00
  • 99f15c507d Updating paths in the unit tests, leaving the failing test and coding against that Joe Bowser 2017-07-12 11:13:20 -07:00
  • 849b887e20 Merge branch 'master' into StudioProjectCompat Joe Bowser 2017-07-12 09:39:55 -07:00
  • 245d9a1e46 Merge branch 'master' into StudioProjectCompat Joe Bowser 2017-07-12 09:33:37 -07:00
  • 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. filmaj 2017-07-11 12:25:12 -05:00
  • 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. filmaj 2017-06-27 12:02:38 -05:00
  • a7304b9a19 Finishing the linting Joe Bowser 2017-06-27 13:15:04 -07:00
  • 540929c6a0 CB-9971: Suppressed unwanted java stderr output when running gradle wrapper Nikita Matrosov 2017-06-26 20:55:14 +03:00
  • e456175a81 Merge branch 'master' into StudioProjectCompat Joe Bowser 2017-06-26 10:29:31 -07:00
  • 3ff32092a3 CB-12954 🔪 remove jshint leftovers filmaj 2017-06-26 12:26:53 -05:00
  • 55d7cf3865 CB-12895 : updated .eslintrc file in spec dir and set jasmine true and removed root is true Audrey So 2017-06-19 10:57:12 -07:00
  • ac4ac935f6 CB-12895 : added .eslintrc files to set up jasmine environment Audrey So 2017-06-19 10:21:43 -07:00
  • d83d49d83b CB-12895 : fixed eslint errors Audrey So 2017-06-13 11:42:20 -07:00
  • e36158a0da CB-12895 : added eslint and removed jshint Audrey So 2017-06-09 11:18:57 -07:00
  • 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. Joe Bowser 2017-06-22 13:46:18 -07:00
  • 5cc14b8031 CB-12605 In Windows get Android studio path from the registry Jesse MacFadyen 2017-06-20 16:54:32 -07:00
  • 1cda7a9de0 CB-11244: Found bug in Api.js where xml/strings.xml is used instead of values/strings.xml Joe Bowser 2017-06-19 14:34:03 -07:00
  • 49b76f5c71 Fixing mangled commits that crept into this branch Joe Bowser 2017-06-14 11:36:43 -07:00
  • c0474e811d Bump for travis test Joe Bowser 2017-06-14 10:16:05 -07:00
  • 40c9709445 OK, Going back to the old build.gradle for legacy projects Joe Bowser 2017-06-14 09:34:15 -07:00
  • b67e9905bc This is probably a bad idea, but we need to split the gradle files into legacy and new style Joe Bowser 2017-06-13 11:58:00 -07:00
  • 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 Joe Bowser 2017-06-13 10:36:00 -07:00
  • 33feb00e8f Adding the if statement to see if we can support both structures with minimal editing, TODO: actually write tests for this somehow Joe Bowser 2017-06-13 10:11:41 -07:00
  • 8f16df4c90 Adding logic to upgrade both Classic and Android Studio style project structures Joe Bowser 2017-06-13 08:27:46 -07:00
  • fb6cb51e64 Fixing lint errors Joe Bowser 2017-05-31 10:37:47 -07:00
  • 28ebbb8f02 CB-11244: Setup Api.js to support multiple builders based on project structure Joe Bowser 2017-05-31 10:23:35 -07:00
  • bd4ddcdedd Updated AndroidStudio to only look for the app directory to determine studio status Joe Bowser 2017-04-21 17:02:27 -07:00
  • e621edfba7 Fixing the Android Studio detection and making it automatically pick the right builder, good for upgrading Cordova Joe Bowser 2017-04-21 16:27:26 -07:00
  • 304a899114 Fixed the specification of the builders in the run command by getting build to check what was being passed from run Joe Bowser 2017-04-19 11:50:55 -07:00
  • 8391af2e8f JsHint Fixes, deleting unused methods Joe Bowser 2017-04-18 14:48:56 -07:00
  • 69ab6a0e0d Changing the project to add the app directory as a dependency Joe Bowser 2017-04-18 14:29:02 -07:00
  • 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 Joe Bowser 2017-01-04 11:48:18 -08:00
  • 69260fb96a Fix the overwriting of Fil's fix, blargh Joe Bowser 2017-04-11 14:41:27 -07:00
  • db87e0ae6a Made changes so cordova/build builds with the new project. Need to work on plugin installation. Joe Bowser 2017-04-11 13:47:40 -07:00
  • 8ead919fae Managed to get the project to mostly compile, still need to re-work the build command to add the app project Joe Bowser 2017-04-04 15:42:58 -07:00
  • b73c04f3c8 Updating gradle version in the build file Joe Bowser 2017-04-04 15:34:42 -07:00
  • 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 Joe Bowser 2017-04-04 15:18:46 -07:00
  • 7b17abc555 Fixing linting issues Joe Bowser 2017-04-04 13:38:40 -07:00
  • ffadf5dd51 Changing this so we pass lint Joe Bowser 2017-04-03 15:21:48 -07:00
  • 23d8d99925 Moving Android Manifest finding to the Gradle and Studio builders. Joe Bowser 2017-03-30 13:38:18 -07:00
  • 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! Joe Bowser 2017-03-30 12:41:44 -07:00
  • 17906735df CB-12835: add a Context getter in CordovaInterface Xiaolei Yu 2017-05-20 06:54:23 +08:00
  • 3a6e898b12 CB-12762 : pointed package.json repo items to github mirrors instead of apache repos site Audrey So 2017-06-01 09:48:24 -07:00
  • 0cc3df3747 CB-12859: document how to run the native tests. add a README to the test/ project. filmaj 2017-05-25 20:54:25 +02:00
  • 2bc842a2b3 This commit should exist on the Crosswalk Plugin, Close #357 Joe Bowser 2017-05-29 13:04:17 -07:00
  • 1c6f640026 Commit already merged, Close #378 Joe Bowser 2017-05-29 13:02:35 -07:00
  • 6daad829cc Close #283 Joe Bowser 2017-05-29 09:53:49 -07:00
  • 7d926822ed CB-8980: Ensure copied resource-files are cleaned Darryl Pogue 2017-04-21 00:18:16 -07:00
  • d4dcbb13fc CB-12617 : removed node0.x support for platforms and added engineStrict Audrey So 2017-04-05 13:59:27 -07:00
  • f396712f59 CB-12847: added bugs entry to package.json. filmaj 2017-05-24 00:54:03 +02:00
  • d97250f968 Update JS snapshot to version 6.3.0-dev (via coho) filmaj 2017-05-02 16:19:21 -07:00
  • c0df73c3c1 Set VERSION to 6.2.3 (via coho) rel/6.2.3 6.2.3 6.2.x filmaj 2017-05-02 16:19:19 -07:00
  • e7e8e95242 Set VERSION to 6.3.0-dev (via coho) filmaj 2017-05-02 16:19:19 -07:00
  • 211a7fc6a8 Update JS snapshot to version 6.2.3 (via coho) filmaj 2017-05-02 16:19:19 -07:00
  • d518a655a8 CB-12746: updated release notes for impending 6.2.3 release, since some of the reported changes did not make it into 6.2.2. filmaj 2017-05-02 15:24:06 -07:00
  • b6a5844027 CB-12746: decrement working dev version on master to 6.2.4-dev, to align with impending patch release. filmaj 2017-05-02 15:10:29 -07:00
  • ce67804b65 Set version to 6.2.3 filmaj 2017-05-02 16:03:36 -07:00
  • f3ded26e35 CB-12746: updated release notes for impending 6.2.3 release, since some of the reported changes did not make it into 6.2.2. filmaj 2017-05-02 15:24:06 -07:00
  • 4b688f8715 CB-12746: decrement working dev version on master to 6.2.4-dev, to align with impending patch release. filmaj 2017-05-02 15:10:29 -07:00
  • e3b3bcd75f CB-12015: initial-scale values less than 1.0 are ignored on Android Simon MacDonald 2017-04-20 20:41:54 -04:00
  • 5a7590397d CB-12697 Updated checked-in node_modules Steve Gill 2017-04-24 21:56:28 -07:00
  • af31c83ec1 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. filmaj 2017-04-06 15:08:22 -07:00
  • bd94735ba2 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 filmaj 2017-04-06 13:48:58 -07:00
  • 46e47a3c5c 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. filmaj 2017-04-06 13:13:38 -07:00
  • 9d9abea157 Start of GradleBuilder.js specs - puts it on the code coverage radar. filmaj 2017-05-02 14:42:50 -07:00
  • ee1165ea33 CB-12015: initial-scale values less than 1.0 are ignored on Android Simon MacDonald 2017-04-20 20:41:54 -04:00
  • 2704ee54cf This closes #374 Joe Bowser 2017-05-01 10:51:50 -07:00
  • ad01d28351 Set VERSION to 6.3.0-dev (via coho) Steve Gill 2017-04-24 22:05:43 -07:00
  • 814aca2b68 Set VERSION to 6.2.2 (via coho) rel/6.2.2 6.2.2 Steve Gill 2017-04-24 22:05:42 -07:00
  • cf159c1ae3 Update JS snapshot to version 6.2.2 (via coho) Steve Gill 2017-04-24 22:05:42 -07:00
  • a215c1cf30 CB-12697 Updated RELEASENOTES and Version for release 6.2.2 Steve Gill 2017-04-24 22:04:56 -07:00
  • cadea2f6c3 CB-12697 Updated checked-in node_modules Steve Gill 2017-04-24 21:56:28 -07:00
  • 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. filmaj 2017-04-06 15:08:22 -07:00
  • 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 filmaj 2017-04-06 13:48:58 -07:00
  • 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. filmaj 2017-04-06 13:13:38 -07:00
  • a4103d8dc8 updated version in build.gradle Steve Gill 2017-04-07 10:56:39 -07:00
  • 4868d5e59e updated build.gradle version info for bintray upload Steve Gill 2017-04-06 19:03:10 -05:00
  • 34c7e8a534 updated build.gradle version for bintray publish Steve Gill 2017-04-04 13:37:06 -05:00
  • d36cfeafa2 CB-12627 Updated RELEASENOTES and Version for release 6.2.1 rel/6.2.1 6.2.1 Steve Gill 2017-04-02 17:40:35 -05:00
  • d2c71e7d75 CB-12621: reverted elementtree dep to 0.1.6 Steve Gill 2017-04-02 17:11:17 -05:00
  • 8e0f021cad Set VERSION to 6.3.0-dev (via coho) Steve Gill 2017-04-02 17:43:13 -05:00
  • fc8cd37495 Set VERSION to 6.2.1 (via coho) Steve Gill 2017-04-02 17:43:13 -05:00
  • 3f1113ed8f Update JS snapshot to version 6.2.1 (via coho) Steve Gill 2017-04-02 17:43:13 -05:00
  • 002ab85f76 CB-12627 Updated RELEASENOTES and Version for release 6.2.1 Steve Gill 2017-04-02 17:40:35 -05:00
  • 4a0f69a3f0 CB-12621: reverted elementtree dep to 0.1.6 Steve Gill 2017-04-02 17:11:17 -05:00
  • 4d55fdb3e5 Set VERSION to 6.2.0 (via coho) rel/6.2.0 6.2.0 Steve Gill 2017-03-28 15:18:35 -07:00
  • 8a2e96d995 Update JS snapshot to version 6.3.0-dev (via coho) Steve Gill 2017-03-28 15:18:36 -07:00