Andrew Grieve
|
6d5b88d7b9
|
Merge branch 'master' into 4.0.x (per-arch gradle builds)
|
2014-09-24 16:18:51 -04:00 |
|
Max Woghiren
|
a986e72338
|
Added gradle distribution URL updating. (commit fix-up)
|
2014-09-24 16:18:18 -04:00 |
|
Andrew Grieve
|
162d9b6c2e
|
gradle: Build only the active architecture when applicable
|
2014-09-24 16:16:59 -04:00 |
|
Andrew Grieve
|
f7f49d27c5
|
Merge branch 'master' into 4.0.x (gradle Android Studio)
|
2014-09-23 21:04:55 -04:00 |
|
Andrew Grieve
|
9e3ccf4b3e
|
gradle: Fix warning about dynamic properties being deprecated
|
2014-09-23 21:04:04 -04:00 |
|
Andrew Grieve
|
6b71c2f392
|
gradle: Have project's build.gradle look for a build-extras.gradle
|
2014-09-23 21:03:17 -04:00 |
|
Andrew Grieve
|
0d313a3964
|
gradle: Write sub-project list explicitly to make Android Studio happy
|
2014-09-23 21:03:00 -04:00 |
|
Max Woghiren
|
75a0a6752a
|
Improved a regex.
|
2014-09-23 14:27:54 -04:00 |
|
Andrew Grieve
|
363fc8deb5
|
Merge branch 'master' into 4.0.x (gradle plugin template)
Conflicts:
bin/templates/cordova/lib/build.js
framework/build.gradle
|
2014-09-22 22:28:59 -04:00 |
|
Max Woghiren
|
ddac192c4a
|
Added gradle distribution URL updating.
Conflicts:
bin/templates/cordova/lib/build.js
framework/build.gradle
|
2014-09-22 22:27:43 -04:00 |
|
Andrew Grieve
|
69a03c2e16
|
CB-7512 Use a standard build.gradle for all plugins
Plugins can extend it by providing a "build-extras.gradle"
|
2014-09-22 22:27:43 -04:00 |
|
Andrew Grieve
|
2b128b85f7
|
CB-7512 Make gradle build only a single config for sub-libraries (release vs debug)
|
2014-09-22 20:54:28 -04:00 |
|
Max Woghiren
|
b09f973231
|
Added gradle distribution URL updating.
|
2014-09-22 16:47:01 -04:00 |
|
Andrew Grieve
|
95815a558c
|
Merge branch 'master' into 4.0.x (fix ant run command)
|
2014-09-22 15:38:59 -04:00 |
|
Andrew Grieve
|
879da03438
|
CB-7579 Fix run script's ability to use non-arch-specific APKs
|
2014-09-22 14:23:30 -04:00 |
|
Andrew Grieve
|
d022be547b
|
Merge branch 'master' into 4.0.x (gradle)
|
2014-09-17 21:27:55 -04:00 |
|
Andrew Grieve
|
3f83fdbfc1
|
CB-7512 Fix gradle asking for release password when building for debug
|
2014-09-17 21:27:06 -04:00 |
|
Ian Clelland
|
215adab1f9
|
Merge branch 'master' into 4.0.x (Gradle env vars)
|
2014-09-17 15:58:46 -04:00 |
|
Ian Clelland
|
7ce46ed60c
|
CB-3445: Make minSdkVersion and base versionCode settable through env vars
|
2014-09-17 15:58:22 -04:00 |
|
Andrew Grieve
|
c32bcca67b
|
Merge branch 'master' into 4.0.x (gradle optional password)
|
2014-09-17 15:30:20 -04:00 |
|
Andrew Grieve
|
cb442364ca
|
CB-7512 Make key password optional & prompt for it when missing
|
2014-09-17 15:29:57 -04:00 |
|
Andrew Grieve
|
6bdc01290d
|
Merge branch 'master' into 4.0.x (gradle fix)
|
2014-09-16 15:15:11 -04:00 |
|
Andrew Grieve
|
ac34bf1e54
|
CB-7512 Fix gradle not copying all archs to out/ (broken by prev commit)
|
2014-09-16 15:14:40 -04:00 |
|
Andrew Grieve
|
6fb164d200
|
Merge branch 'master' into 4.0.x (unaligned apk fix)
|
2014-09-16 15:00:54 -04:00 |
|
Andrew Grieve
|
a5d300c6ff
|
CB-7512 Use aligned apk rather than unaligned apk when sorting
|
2014-09-16 14:59:43 -04:00 |
|
Andrew Grieve
|
6eb4409a72
|
Merge branch 'master' into 4.0.x (gradle debug v release)
|
2014-09-16 14:14:46 -04:00 |
|
Andrew Grieve
|
533677df8b
|
CB-7512 Speed up gradle builds by building debug or release (not both)
|
2014-09-16 14:13:49 -04:00 |
|
Andrew Grieve
|
8f27b2ab56
|
Merge branch 'master' into 4.0.x (gradle fixes)
|
2014-09-16 13:02:55 -04:00 |
|
Andrew Grieve
|
25be42d385
|
CB-7512 Add gradle environment vars for signing apks
|
2014-09-16 13:01:25 -04:00 |
|
Andrew Grieve
|
00f6d30e08
|
CB-7512 Change gradle android plugins from 0.10 -> 0.12
|
2014-09-16 13:00:27 -04:00 |
|
mbillau
|
d9900a725d
|
Second part of CB-7499, support RTL text direction
|
2014-09-15 16:03:00 -04:00 |
|
Andrew Grieve
|
a10106c61a
|
Merge branch 'master' into 4.0.x (x86 deploy)
|
2014-09-15 14:24:45 -04:00 |
|
Andrew Grieve
|
5cb01f2ae9
|
CB-7554 Use x86 apk when deploying to an intel device / emulator
|
2014-09-15 14:23:26 -04:00 |
|
Ian Clelland
|
4c1efe7ad4
|
Merge branch 'master' into 4.0.x
|
2014-09-15 12:16:03 -04:00 |
|
Ian Clelland
|
4be92f285a
|
CB-7512: Fix logic for detecting SDK directory
|
2014-09-15 12:15:32 -04:00 |
|
Michal Mocny
|
f9b89e98c2
|
Fix invalid syntax (missing + in multiline string)
|
2014-09-15 10:34:43 -04:00 |
|
Michal Mocny
|
be01ce03d0
|
Fix invalid syntax (missing + in multiline string)
|
2014-09-12 17:00:29 -04:00 |
|
Andrew Grieve
|
30e8b818f5
|
Merge branch 'master' into 4.0.x (error messages)
|
2014-09-12 14:21:47 -04:00 |
|
Andrew Grieve
|
525ce0e0ad
|
CB-7536 Tweak error messages for missing JDK / SDK / AVDs
|
2014-09-12 14:19:13 -04:00 |
|
Ian Clelland
|
dd5a337a49
|
Merge branch 'master' into 4.0.x
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
|
2014-09-11 10:18:35 -04:00 |
|
Ian Clelland
|
0e78dc35d8
|
CB-7512: Read android target from project.properties if possible
|
2014-09-10 11:39:29 -04:00 |
|
Ian Clelland
|
c8bbdb23de
|
CB-7512: Determine SDK and build tools version dynamcally at build time
|
2014-09-10 10:57:43 -04:00 |
|
Ian Clelland
|
7ee8117186
|
CB-7463: Adding licence to project template gradle file
|
2014-09-10 10:54:21 -04:00 |
|
Steven Gill
|
91cf78f183
|
Set VERSION to 3.7.0-dev (via coho)
|
2014-08-29 16:34:12 -07:00 |
|
Ian Clelland
|
0b6b068097
|
CB-3445: Allow build and run scripts to select APK by architecture
|
2014-08-29 16:00:54 -04:00 |
|
Ian Clelland
|
4bc2051f44
|
CB-3445: Allow build and run scripts to select APK by architecture
|
2014-08-29 16:00:13 -04:00 |
|
Ian Clelland
|
623b2306ca
|
CB-3445: Add environment variable 'BUILD_MULTIPLE_APKS' for splitting APKs based on architecture
|
2014-08-28 16:18:51 -04:00 |
|
Ian Clelland
|
34dde53506
|
CB-3445: Add environment variable 'BUILD_MULTIPLE_APKS' for splitting APKs based on architecture
|
2014-08-28 16:18:02 -04:00 |
|
Ian Clelland
|
7a09182446
|
CB-3445: Ensure that JAR files in libs directory are included
|
2014-08-28 13:17:26 -04:00 |
|
Ian Clelland
|
233e513860
|
CB-3445: Ensure that JAR files in libs directory are included
|
2014-08-28 11:26:58 -04:00 |
|