Commit Graph

  • 879da03438 CB-7579 Fix run script's ability to use non-arch-specific APKs Andrew Grieve 2014-09-22 14:23:30 -04:00
  • d022be547b Merge branch 'master' into 4.0.x (gradle) Andrew Grieve 2014-09-17 21:27:55 -04:00
  • 3f83fdbfc1 CB-7512 Fix gradle asking for release password when building for debug Andrew Grieve 2014-09-17 21:27:06 -04:00
  • 949152532c Merge branch 'CB-7493' of https://github.com/MSOpenTech/cordova-android purplecabbage 2014-09-17 14:58:08 -07:00
  • 215adab1f9 Merge branch 'master' into 4.0.x (Gradle env vars) Ian Clelland 2014-09-17 15:58:46 -04:00
  • 7ce46ed60c CB-3445: Make minSdkVersion and base versionCode settable through env vars Ian Clelland 2014-09-17 15:54:28 -04:00
  • c32bcca67b Merge branch 'master' into 4.0.x (gradle optional password) Andrew Grieve 2014-09-17 15:30:20 -04:00
  • cb442364ca CB-7512 Make key password optional & prompt for it when missing Andrew Grieve 2014-09-17 15:29:57 -04:00
  • 6bdc01290d Merge branch 'master' into 4.0.x (gradle fix) Andrew Grieve 2014-09-16 15:15:11 -04:00
  • ac34bf1e54 CB-7512 Fix gradle not copying all archs to out/ (broken by prev commit) Andrew Grieve 2014-09-16 15:14:40 -04:00
  • 6fb164d200 Merge branch 'master' into 4.0.x (unaligned apk fix) Andrew Grieve 2014-09-16 15:00:54 -04:00
  • a5d300c6ff CB-7512 Use aligned apk rather than unaligned apk when sorting Andrew Grieve 2014-09-16 14:59:43 -04:00
  • 6eb4409a72 Merge branch 'master' into 4.0.x (gradle debug v release) Andrew Grieve 2014-09-16 14:14:46 -04:00
  • 533677df8b CB-7512 Speed up gradle builds by building debug or release (not both) Andrew Grieve 2014-09-16 14:13:49 -04:00
  • 8f27b2ab56 Merge branch 'master' into 4.0.x (gradle fixes) Andrew Grieve 2014-09-16 13:02:55 -04:00
  • 25be42d385 CB-7512 Add gradle environment vars for signing apks Andrew Grieve 2014-09-16 13:01:25 -04:00
  • 00f6d30e08 CB-7512 Change gradle android plugins from 0.10 -> 0.12 Andrew Grieve 2014-09-16 13:00:27 -04:00
  • 090822eb41 CB-7536 check_reqs: windows tweaks + sdk manager error message Andrew Grieve 2014-09-16 10:28:34 -04:00
  • d9900a725d Second part of CB-7499, support RTL text direction mbillau 2014-09-09 09:38:15 -04:00
  • a10106c61a Merge branch 'master' into 4.0.x (x86 deploy) Andrew Grieve 2014-09-15 14:24:45 -04:00
  • 5cb01f2ae9 CB-7554 Use x86 apk when deploying to an intel device / emulator Andrew Grieve 2014-09-15 14:23:26 -04:00
  • 4c1efe7ad4 Merge branch 'master' into 4.0.x Ian Clelland 2014-09-15 12:16:03 -04:00
  • 4be92f285a CB-7512: Fix logic for detecting SDK directory Ian Clelland 2014-09-15 12:15:32 -04:00
  • f9b89e98c2 Fix invalid syntax (missing + in multiline string) Michal Mocny 2014-09-12 17:00:29 -04:00
  • be01ce03d0 Fix invalid syntax (missing + in multiline string) Michal Mocny 2014-09-12 17:00:29 -04:00
  • f221441877 Update JS snapshot to version 3.7.0-dev (via coho) Marcel Kinard 2014-09-12 16:01:27 -04:00
  • 18fda7ec68 Merge branch 'master' into 4.0.x (more error message) Andrew Grieve 2014-09-12 16:18:12 -04:00
  • f2e8c00f49 CB-7536 Tweak Android SDK not installed error message. Andrew Grieve 2014-09-12 16:17:42 -04:00
  • e2e38ad2b4 Set VERSION to 3.6.3 (via coho) 3.6.3 Marcel Kinard 2014-09-12 15:50:25 -04:00
  • 30e8b818f5 Merge branch 'master' into 4.0.x (error messages) Andrew Grieve 2014-09-12 14:21:47 -04:00
  • 525ce0e0ad CB-7536 Tweak error messages for missing JDK / SDK / AVDs Andrew Grieve 2014-09-12 14:19:13 -04:00
  • 3cd567dc95 Merge branch 'master' into 4.0.x (better auto-detect sdk) Andrew Grieve 2014-09-11 16:01:01 -04:00
  • 2f7ffa3636 CB-7511 Auto-detect android sdk when using stand-alone sdk installer Andrew Grieve 2014-09-11 15:36:35 -04:00
  • d99386ef1e Merge branch 'master' into 4.0.x Ian Clelland 2014-09-11 15:12:31 -04:00
  • 9ae3d2c074 CB-7512: Copy cordova.gradle file to project root on build Ian Clelland 2014-09-11 15:12:07 -04:00
  • dd5a337a49 Merge branch 'master' into 4.0.x Ian Clelland 2014-09-11 10:18:35 -04:00
  • 51e634ccb4 Merge branch 'master' into 4.0.x (up to 3.7.0-dev) Ian Clelland 2014-09-11 10:16:28 -04:00
  • 31b1a821ca Merge branch 'master' into 4.0.x (External whitelist changes) Ian Clelland 2014-09-11 10:08:45 -04:00
  • bf13fd48ce Use add --compact flag in check_reqs when listing targets. No functional change. Andrew Grieve 2014-09-10 12:43:40 -04:00
  • 3b99760a42 CB-7330 Don't run check_reqs for bin/create. Andrew Grieve 2014-09-10 12:42:37 -04:00
  • 0e78dc35d8 CB-7512: Read android target from project.properties if possible Ian Clelland 2014-09-10 11:39:29 -04:00
  • c8bbdb23de CB-7512: Determine SDK and build tools version dynamcally at build time Ian Clelland 2014-09-10 10:57:43 -04:00
  • 7ee8117186 CB-7463: Adding licence to project template gradle file Ian Clelland 2014-09-10 10:54:21 -04:00
  • 8237c41143 CB-7511 Auto-detect Android SDK when Android Studio is installed Andrew Grieve 2014-09-10 10:14:38 -04:00
  • d52ca93ba6 CB-7493 Adds test-build command to package.json Vladimir Kotikov 2014-09-09 09:59:34 +04:00
  • caa82b2f26 CB-7383 Bump version to 3.6.1 3.6.1 Marcel Kinard 2014-09-05 14:08:46 -04:00
  • 5652fdc030 updated releasenotes Steven Gill 2014-09-02 17:09:14 -07:00
  • 7dbc5b0965 CB-7463: Adding licences. I don't know what the gradle syntax is for comments, that still needs to be done. 3.6.0 Joe Bowser 2014-09-04 10:32:29 -07:00
  • 60578f3f0d CB-7463: Looked at the Apache BigTop git, gradle uses C-style comments Joe Bowser 2014-09-04 10:49:43 -07:00
  • 8354651059 CB-7463: Looked at the Apache BigTop git, gradle uses C-style comments Joe Bowser 2014-09-04 10:49:43 -07:00
  • 81cc3c260f CB-7463: Adding licences. I don't know what the gradle syntax is for comments, that still needs to be done. Joe Bowser 2014-09-04 10:32:29 -07:00
  • 4dc32e194b CB-7460: Fixing bug with KitKat where the background colour would override the CSS colours on the application Joe Bowser 2014-09-03 15:23:41 -07:00
  • afdd16a214 CB-7460: Fixing bug with KitKat where the background colour would override the CSS colours on the application Joe Bowser 2014-09-03 15:23:41 -07:00
  • 5a82dd5110 updated releasenotes Steven Gill 2014-09-02 17:09:14 -07:00
  • f20708a5e7 Update JS snapshot to version 3.7.0-dev (via coho) Steven Gill 2014-08-29 16:34:17 -07:00
  • 91cf78f183 Set VERSION to 3.7.0-dev (via coho) Steven Gill 2014-08-29 16:34:12 -07:00
  • 014327c59a Set VERSION to 3.6.0 (via coho) Steven Gill 2014-08-29 16:34:11 -07:00
  • 0cde8819cf CB-7410 fix the menu test Marcel Kinard 2014-08-29 18:07:29 -04:00
  • 07632b0eeb CB-7410 Fix the errorUrl test Marcel Kinard 2014-08-29 17:38:03 -04:00
  • 4a7f825cfe CB-7410 Fix Basic Authentication test Marcel Kinard 2014-08-29 16:38:38 -04:00
  • 0b6b068097 CB-3445: Allow build and run scripts to select APK by architecture Ian Clelland 2014-08-29 16:00:13 -04:00
  • 4bc2051f44 CB-3445: Allow build and run scripts to select APK by architecture Ian Clelland 2014-08-29 16:00:13 -04:00
  • 623b2306ca CB-3445: Add environment variable 'BUILD_MULTIPLE_APKS' for splitting APKs based on architecture Ian Clelland 2014-08-28 16:17:54 -04:00
  • 34dde53506 CB-3445: Add environment variable 'BUILD_MULTIPLE_APKS' for splitting APKs based on architecture Ian Clelland 2014-08-28 16:17:54 -04:00
  • 7a09182446 CB-3445: Ensure that JAR files in libs directory are included Ian Clelland 2014-08-28 11:26:35 -04:00
  • 233e513860 CB-3445: Ensure that JAR files in libs directory are included Ian Clelland 2014-08-28 11:26:35 -04:00
  • 85bcbdc894 CB-7267 update RELEASENOTES for 3.5.1 3.5.x Marcel Kinard 2014-08-28 09:42:53 -04:00
  • eb8cf56e8e CB-7267 update RELEASENOTES for 3.5.1 Marcel Kinard 2014-08-28 09:42:53 -04:00
  • 12a27643db CB-7410 clarify the title Marcel Kinard 2014-08-27 13:56:31 -04:00
  • c6ccde0558 CB-7385 update cordova.js for testing prior to branch/tag Marcel Kinard 2014-08-27 09:04:32 -04:00
  • 16e3ebd87b CB-7410 add whitelist entries to get iframe/GoogleMaps working Marcel Kinard 2014-08-26 17:20:58 -04:00
  • 94c096dd5b CB-7291 propogate change in method signature to the native tests Marcel Kinard 2014-08-26 16:38:04 -04:00
  • 2e3e4ec3b2 Merge branch 'CB-7291' Ian Clelland 2014-08-26 15:25:41 -04:00
  • 6e222c3938 CB-7291: Restrict meaning of "*" in internal whitelist to just http and https CB-7291 Ian Clelland 2014-08-26 14:58:00 -04:00
  • 3b3bd9b6c9 CB-7291: Only add file, content and data URLs to internal whitelist Ian Clelland 2014-08-21 16:10:32 -04:00
  • 4e3331ba66 CB-7291: Add defaults to external whitelist Ian Clelland 2014-08-21 15:59:05 -04:00
  • 7caa96abcd Fix previous merges Ian Clelland 2014-08-20 11:17:04 -04:00
  • b2776269cf Merge branch 'master' into 4.0.x (Gradle library dependencies) Ian Clelland 2014-08-20 11:43:58 -04:00
  • b6c5a5fc9a CB-3445: Read project.properties to configure gradle libraries Ian Clelland 2014-08-20 10:44:48 -04:00
  • 94943a9a84 CB-7325 Fix error message in android_sdk_version.js when missing SDK on windows Refael Ackermann 2014-08-18 14:53:07 +03:00
  • 4c1942e3fe Merge branch 'master' into 4.0.x (build & create script updates) Andrew Grieve 2014-08-19 12:02:36 -04:00
  • 71e72f215d CB-7335 Add a .gitignore to android project template Andrew Grieve 2014-08-19 11:59:18 -04:00
  • 58cdfd86d0 CB-7330 Fix dangling function call in last commit (broke gradle builds) Andrew Grieve 2014-08-19 11:53:53 -04:00
  • dfa66b9dd4 CB-7330 Don't run "android update" during creation Andrew Grieve 2014-08-18 23:21:26 -04:00
  • d56ea25816 CB-3445 Add gradle support clean command (plus some code cleanup) Andrew Grieve 2014-08-18 16:19:40 -04:00
  • c91b272648 CB-7044 Fix typo in prev commit causing check_reqs to always fail. Andrew Grieve 2014-08-18 15:26:05 -04:00
  • ca8bb75b40 CB-3445 Copy gradle wrapper in build instead of create Andrew Grieve 2014-08-18 14:51:10 -04:00
  • 36eab713a1 CB-3445 Add .gradle template files for "update" as well as "create" Andrew Grieve 2014-08-18 14:50:27 -04:00
  • 7133576fe9 CB-7044 Add JAVA_HOME when not set. Be stricter about ANDROID_HOME Andrew Grieve 2014-08-18 14:45:23 -04:00
  • effffcba1d CB-3445 Speed up gradle building (incremental builds go from 10s -> 1.5s for me) Andrew Grieve 2014-08-18 14:16:27 -04:00
  • 404ce8bc3e Merge branch 'gradle-build-3.x' Ian Clelland 2014-08-18 09:58:01 -04:00
  • a91bd095b0 CB-3445: android: Copy Gradle wrapper from Android SDK rather than bundling a JAR Ian Clelland 2014-06-19 16:12:40 -04:00
  • fd6a1e5ed0 CB-3445: Add which to checked-in node_modules CheckIn_node_modules_which Ian Clelland 2014-08-15 13:35:50 -04:00
  • 7d6ac87033 CB-3445: Add option to build and install with gradle Ian Clelland 2014-08-18 09:44:00 -04:00
  • 8aa813b862 CB-3445: Add an initial set of Gradle build scripts Ian Clelland 2014-08-18 09:40:33 -04:00
  • 95aa5c9f1c CB-7321 Don't require ant for create script Andrew Grieve 2014-08-15 13:58:53 -04:00
  • 4319447cb5 CB-7044, CB-7299 Fix up PATH problems when possible. Andrew Grieve 2014-08-15 13:42:43 -04:00
  • 50ea162251 Change in test's AndroidManifest.xml needed for the test to run properly. Forgot the manifest. Joe Bowser 2014-08-14 14:30:31 -07:00
  • 9c239804d3 Change in test's AndroidManifest.xml needed for the test to run properly Joe Bowser 2014-08-14 14:29:54 -07:00
  • a7ccb9243d Merging latest master, including new tests Joe Bowser 2014-08-14 14:20:49 -07:00