Andrew Grieve
87cdc5ad1c
Merge branch 'master' into 4.0.x (SplashScreen breakout)
...
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
framework/src/org/apache/cordova/CordovaWebView.java
2014-12-10 16:09:22 -05:00
Brian Geppert
ffd14fe7d9
Revert Gradle distributionUrlRegex cleanup.
...
This reverts commit 75a0a6752a
2014-12-09 14:23:38 -05:00
Andrew Grieve
66fa12a091
CB-8119 Restart adb when we detect it's hung
2014-12-04 10:00:26 -05:00
Andrew Grieve
b1bdf23d9c
Switch default build type to gradle (4.0.x only)
2014-12-03 10:12:31 -05:00
Andrew Grieve
7fbb2b195f
CB-8081 Allow gradle builds to use Java 6 instead of requiring 7
2014-11-26 11:44:49 -05: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
0d313a3964
gradle: Write sub-project list explicitly to make Android Studio happy
2014-09-23 21:03:00 -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
879da03438
CB-7579 Fix run script's ability to use non-arch-specific APKs
2014-09-22 14:23:30 -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
a5d300c6ff
CB-7512 Use aligned apk rather than unaligned apk when sorting
2014-09-16 14:59:43 -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
00f6d30e08
CB-7512 Change gradle android plugins from 0.10 -> 0.12
2014-09-16 13:00:27 -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
Michal Mocny
f9b89e98c2
Fix invalid syntax (missing + in multiline string)
2014-09-15 10:34:43 -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
4bc2051f44
CB-3445: Allow build and run scripts to select APK by architecture
2014-08-29 16:00:13 -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
Andrew Grieve
58cdfd86d0
CB-7330 Fix dangling function call in last commit (broke gradle builds)
2014-08-19 11:53:53 -04:00
Andrew Grieve
dfa66b9dd4
CB-7330 Don't run "android update" during creation
...
Instead, have the build script copy do the equivalent logic on each
build.
Advantages:
- Scripts run much faster
- No more duplicate CordovaLib entries in project.properties
- Building is more independent from create/update script (more robust)
2014-08-18 23:24:29 -04:00
Andrew Grieve
d56ea25816
CB-3445 Add gradle support clean command (plus some code cleanup)
...
* Don't run ant clean for gradle ever
* Don't set sdk.dir since ANDROID_HOME is not always set
* Don't export builders
2014-08-18 16:19:40 -04:00
Andrew Grieve
ca8bb75b40
CB-3445 Copy gradle wrapper in build instead of create
...
This should play nicer with updates to the android SDK.
2014-08-18 14:51:40 -04:00
Andrew Grieve
effffcba1d
CB-3445 Speed up gradle building (incremental builds go from 10s -> 1.5s for me)
...
Biggest win is disabling the linter.
2014-08-18 14:17:34 -04:00
Ian Clelland
7d6ac87033
CB-3445: Add option to build and install with gradle
...
This gives build/cordova two new command-line arguments: --ant and
--gradle, and will select the build type from those. As a fallback
for the Cordova CLI, the environment variable ANDROID_BUILD can also be
used, set to either "ant" or "gradle".
The default is currently "ant", but it is intended for this to change in
the future.
2014-08-18 09:48:31 -04:00
Andrew Grieve
95aa5c9f1c
CB-7321 Don't require ant for create script
2014-08-15 13:58:53 -04:00
Marcel Kinard
32e07c22d0
CB-6876 Show the correct executable name
2014-06-04 19:23:43 -04:00
Marcel Kinard
d427c52aac
CB-6876 Fix the "print usage"
2014-06-04 19:12:55 -04:00
Ningxin Hu
e6adbb0e42
CB-6543 Fix cordova/run failure when no custom_rules.xml available
...
Github: Close #99
2014-04-28 22:50:22 -04:00
Andrew Grieve
600599f49e
Fix type "LANCH" -> "LAUNCH"
2014-01-22 14:53:40 -05:00
Andrew Grieve
f83d7a7cd1
CB-5793 Add work-around for library references not working with custom output directory (ugh).
2014-01-21 15:09:15 -05:00
Andrew Grieve
7094047b3d
CB-5793 Forgot to update ant path for clean.
2014-01-20 10:26:53 -05:00
Andrew Grieve
11d3607688
CB-5793 Don't clean before build and change output directory to ant-build to avoid conflicts with Eclipse.
2014-01-19 23:09:00 -05:00
Andrew Grieve
ef9ace9e65
CB-5803 Fix cordova/emulate on windows.
2014-01-16 13:19:39 -05:00
Andrew Grieve
22e4039133
CB-5801 Add spawn work-around on windows for it not being able to execute .cmd files
...
More info: https://github.com/joyent/node/issues/2318
2014-01-16 12:11:31 -05:00
Andrew Grieve
4971670e56
CB-5801 exec->spawn in build to make sure compile errors are shown.
2014-01-15 11:41:34 -05:00
Vyacheslav Shabelnik
8e260d5c40
CB-5714 Fix of android build when too big output stops build with error due to buffer overflow.
2013-12-30 11:06:37 -05:00
Justin Wark
be2f7d7a8a
Remove 2 X console.log from exec.js
...
With these console.log statements the output from commands such as 'list-devices' is very messy and hence difficult to parse the output programatically.
2013-12-23 08:54:46 -05:00
Josh Soref
74ea6bf00a
Spelling fixes
2013-12-05 12:20:58 -05:00
Braden Shepherdson
8783cf03b2
[CB-4996] Fix paths with spaces while launching on emulator and device
2013-11-06 10:37:59 -05:00
Joe Bowser
96d4a22215
CB-5209: Dirty, Dirty Fix for Building. This works, but needs to be prettier.
2013-10-29 14:27:46 -04:00
Braden Shepherdson
b57317bdc2
Refactoring Android project-level and platform scripts to use Q.js
...
This eliminates the use of shelljs.exec's sync mode, which is the source
of the filehandle leaks that can cause EMFILE on OSX, and are
CPU-intensive everywhere.
Tested locally, needs poking before it gets released.
2013-10-16 13:10:53 -04:00
Andrew Grieve
437daa368a
[CB-4782] Convert ApplicationInfo.java -> appinfo.js
2013-09-10 16:32:42 -04:00
Andrew Grieve
1bfcc92677
Make version in version script easier to replace by coho
2013-09-09 15:37:00 -04:00
Benn Mapes
1bd4900981
[CB-3542] rewrote cli tooling scripts in node
2013-08-26 14:45:28 -07:00
Tomaz Muraus
121b74fa0c
[CB-4495] Modify start-emulator script to exit immediately on a fatal emulator error.
2013-08-15 11:46:50 -04:00
bennmapes
bf6291020a
Added 'log' back to windows cli tooling
2013-07-03 10:52:13 -07:00
Benn Mapes
4ec3d6d064
[CB-3625] [CB-3338] updated windows cli scripts and added version option
2013-06-18 14:56:11 -07:00
Fil Maj
0efd9fcac0
[CB-3627] start-emulator now properly starts, waits for and unlocks an emulator, consumed by run as well.
2013-06-14 17:22:57 -07:00
