95815a558c
Merge branch 'master' into 4.0.x (fix ant run command)
2014-09-22 15:38:59 -04:00
879da03438
CB-7579 Fix run script's ability to use non-arch-specific APKs
2014-09-22 14:23:30 -04:00
d022be547b
Merge branch 'master' into 4.0.x (gradle)
2014-09-17 21:27:55 -04:00
3f83fdbfc1
CB-7512 Fix gradle asking for release password when building for debug
2014-09-17 21:27:06 -04:00
949152532c
Merge branch 'CB-7493' of https://github.com/MSOpenTech/cordova-android
2014-09-17 14:58:08 -07:00
215adab1f9
Merge branch 'master' into 4.0.x (Gradle env vars)
2014-09-17 15:58:46 -04:00
7ce46ed60c
CB-3445: Make minSdkVersion and base versionCode settable through env vars
2014-09-17 15:58:22 -04:00
c32bcca67b
Merge branch 'master' into 4.0.x (gradle optional password)
2014-09-17 15:30:20 -04:00
cb442364ca
CB-7512 Make key password optional & prompt for it when missing
2014-09-17 15:29:57 -04:00
6bdc01290d
Merge branch 'master' into 4.0.x (gradle fix)
2014-09-16 15:15:11 -04:00
ac34bf1e54
CB-7512 Fix gradle not copying all archs to out/ (broken by prev commit)
2014-09-16 15:14:40 -04:00
6fb164d200
Merge branch 'master' into 4.0.x (unaligned apk fix)
2014-09-16 15:00:54 -04:00
a5d300c6ff
CB-7512 Use aligned apk rather than unaligned apk when sorting
2014-09-16 14:59:43 -04:00
6eb4409a72
Merge branch 'master' into 4.0.x (gradle debug v release)
2014-09-16 14:14:46 -04:00
533677df8b
CB-7512 Speed up gradle builds by building debug or release (not both)
2014-09-16 14:13:49 -04:00
8f27b2ab56
Merge branch 'master' into 4.0.x (gradle fixes)
2014-09-16 13:02:55 -04:00
25be42d385
CB-7512 Add gradle environment vars for signing apks
2014-09-16 13:01:25 -04:00
00f6d30e08
CB-7512 Change gradle android plugins from 0.10 -> 0.12
2014-09-16 13:00:27 -04:00
090822eb41
CB-7536 check_reqs: windows tweaks + sdk manager error message
...
1. Don't escape \s since those are used by windows for directory seperators
2. Don't warn about missing directories on windows when we're just
testing for their existence
3. Don't give command to install sdk from command-line, since they also
require Build-tools and Platform-tools (which are not installed by
default with IDE-less SDK installer).
2014-09-16 11:13:15 -04:00
d9900a725d
Second part of CB-7499, support RTL text direction
2014-09-15 16:03:00 -04:00
a10106c61a
Merge branch 'master' into 4.0.x (x86 deploy)
2014-09-15 14:24:45 -04:00
5cb01f2ae9
CB-7554 Use x86 apk when deploying to an intel device / emulator
2014-09-15 14:23:26 -04:00
4c1efe7ad4
Merge branch 'master' into 4.0.x
2014-09-15 12:16:03 -04:00
4be92f285a
CB-7512: Fix logic for detecting SDK directory
2014-09-15 12:15:32 -04:00
f9b89e98c2
Fix invalid syntax (missing + in multiline string)
2014-09-15 10:34:43 -04:00
be01ce03d0
Fix invalid syntax (missing + in multiline string)
2014-09-12 17:00:29 -04:00
f221441877
Update JS snapshot to version 3.7.0-dev (via coho)
2014-09-12 16:34:06 -04:00
18fda7ec68
Merge branch 'master' into 4.0.x (more error message)
2014-09-12 16:18:12 -04:00
f2e8c00f49
CB-7536 Tweak Android SDK not installed error message.
...
We no longer require you to edit your PATH
2014-09-12 16:17:42 -04:00
30e8b818f5
Merge branch 'master' into 4.0.x (error messages)
2014-09-12 14:21:47 -04:00
525ce0e0ad
CB-7536 Tweak error messages for missing JDK / SDK / AVDs
2014-09-12 14:19:13 -04:00
3cd567dc95
Merge branch 'master' into 4.0.x (better auto-detect sdk)
2014-09-11 16:01:01 -04:00
2f7ffa3636
CB-7511 Auto-detect android sdk when using stand-alone sdk installer
2014-09-11 15:37:22 -04:00
d99386ef1e
Merge branch 'master' into 4.0.x
2014-09-11 15:12:31 -04:00
9ae3d2c074
CB-7512: Copy cordova.gradle file to project root on build
2014-09-11 15:12:07 -04:00
dd5a337a49
Merge branch 'master' into 4.0.x
...
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
2014-09-11 10:18:35 -04:00
51e634ccb4
Merge branch 'master' into 4.0.x (up to 3.7.0-dev)
...
Conflicts:
VERSION
bin/templates/cordova/version
framework/src/org/apache/cordova/CordovaWebView.java
package.json
test/src/org/apache/cordova/test/basicauth.java
test/src/org/apache/cordova/test/menus.java
2014-09-11 10:16:46 -04:00
31b1a821ca
Merge branch 'master' into 4.0.x (External whitelist changes)
2014-09-11 10:08:45 -04:00
bf13fd48ce
Use add --compact flag in check_reqs when listing targets. No functional change.
2014-09-10 12:44:17 -04:00
3b99760a42
CB-7330 Don't run check_reqs for bin/create.
...
The create / update script doesn't require any dependencies, so we
shouldn't fail without them.
2014-09-10 12:44:17 -04:00
0e78dc35d8
CB-7512: Read android target from project.properties if possible
2014-09-10 11:39:29 -04:00
c8bbdb23de
CB-7512: Determine SDK and build tools version dynamcally at build time
2014-09-10 10:57:43 -04:00
7ee8117186
CB-7463: Adding licence to project template gradle file
2014-09-10 10:54:21 -04:00
8237c41143
CB-7511 Auto-detect Android SDK when Android Studio is installed
2014-09-10 10:14:38 -04:00
d52ca93ba6
CB-7493 Adds test-build command to package.json
2014-09-09 17:53:22 +04:00
8354651059
CB-7463: Looked at the Apache BigTop git, gradle uses C-style comments
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.
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
2014-09-03 15:42:39 -07:00
5a82dd5110
updated releasenotes
2014-09-02 17:09:24 -07:00
f20708a5e7
Update JS snapshot to version 3.7.0-dev (via coho)
2014-08-29 16:34:17 -07:00
Andrew Grieve