623b2306ca
CB-3445: Add environment variable 'BUILD_MULTIPLE_APKS' for splitting APKs based on architecture
2014-08-28 16:18:51 -04:00
233e513860
CB-3445: Ensure that JAR files in libs directory are included
2014-08-28 11:26:58 -04:00
7caa96abcd
Fix previous merges
...
Build scripts (create and build) were mangled somewhat by the previous
merge commits. This resets them to (almost) exactly the same state as
the 3.6.x (master) branch.
Conflicts:
bin/lib/create.js
2014-08-20 11:45:35 -04:00
b2776269cf
Merge branch 'master' into 4.0.x (Gradle library dependencies)
2014-08-20 11:43:58 -04:00
b6c5a5fc9a
CB-3445: Read project.properties to configure gradle libraries
2014-08-20 11:42:04 -04:00
94943a9a84
CB-7325 Fix error message in android_sdk_version.js when missing SDK on windows
...
github: close #113
2014-08-20 11:20:02 -04:00
4c1942e3fe
Merge branch 'master' into 4.0.x (build & create script updates)
...
Conflicts:
bin/lib/check_reqs.js
bin/lib/create.js
bin/node_modules/which/package.json
bin/templates/cordova/lib/build.js
2014-08-19 12:02:36 -04:00
71e72f215d
CB-7335 Add a .gitignore to android project template
2014-08-19 11:59:18 -04:00
58cdfd86d0
CB-7330 Fix dangling function call in last commit (broke gradle builds)
2014-08-19 11:53:53 -04:00
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
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
c91b272648
CB-7044 Fix typo in prev commit causing check_reqs to always fail.
2014-08-18 15:26:52 -04:00
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
36eab713a1
CB-3445 Add .gradle template files for "update" as well as "create"
2014-08-18 14:50:27 -04:00
7133576fe9
CB-7044 Add JAVA_HOME when not set. Be stricter about ANDROID_HOME
...
Also switches to using the which module over shelljs.which (better
support for .bat files)
2014-08-18 14:45:23 -04:00
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
404ce8bc3e
Merge branch 'gradle-build-3.x'
...
This introduces the gradle build system to Cordova-android, behind a flag currently
2014-08-18 09:58:01 -04:00
a91bd095b0
CB-3445: android: Copy Gradle wrapper from Android SDK rather than bundling a JAR
2014-08-18 09:48:31 -04:00
fd6a1e5ed0
CB-3445: Add which to checked-in node_modules
2014-08-18 09:48:31 -04:00
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
8aa813b862
CB-3445: Add an initial set of Gradle build scripts
...
These scripts will build an android project, in debug and release mode.
They also support additional library projects, such as Crosswalk, being
added to libraries.gradle (and settings.gradle). A flag can be set in
libraries.gradle to enable multi-architecture builds.
2014-08-18 09:48:31 -04:00
95aa5c9f1c
CB-7321 Don't require ant for create script
2014-08-15 13:58:53 -04:00
4319447cb5
CB-7044, CB-7299 Fix up PATH problems when possible.
...
Uses heuristics:
- Adds javac to PATH based on default install paths on Windows
- Adds javac to PATH based on JAVA_HOME
- Adds android and adb to PATH based on ANDROID_HOME
- Sets ANDROID_HOME based on location of "android"
2014-08-15 13:46:20 -04:00
50ea162251
Change in test's AndroidManifest.xml needed for the test to run properly. Forgot the manifest.
2014-08-14 14:30:31 -07:00
9c239804d3
Change in test's AndroidManifest.xml needed for the test to run properly
2014-08-14 14:29:54 -07:00
a7ccb9243d
Merging latest master, including new tests
2014-08-14 14:20:49 -07:00
320e31bb10
Adding tests related to 3.5.1
2014-08-12 11:09:53 -07:00
f9b8f9a45f
CB-7159: Fix setBackgroundColor() call to support 4.0.x view classes
2014-08-11 13:25:21 -04:00
41125ea1e2
CB-7261 Fix setNativeToJsBridgeMode sometimes crashing when switching to ONLINE_EVENT
2014-08-07 16:18:56 -04:00
73219bf2d2
CB-7265 Fix crash when navigating to custom protocol (introduced in 3.5.1)
...
Conflicts:
framework/src/org/apache/cordova/CordovaUriHelper.java
Github: close #111
2014-08-07 09:58:40 -04:00
d6eb723b7f
Filter out non-launchable intents
2014-08-06 09:55:03 -04:00
993d73762c
Handle unsupported protocol errors in webview better
2014-08-06 09:55:03 -04:00
48b51c451a
CB-7238: I should have collapsed this, but Config.init() must go before the creation of CordovaWebView
2014-07-31 09:23:14 -07:00
3d191d5884
CB-7238: Minor band-aid to get tests running again, this has to go away before 3.6.0 is released, since this is an API change.
2014-07-31 08:17:31 -07:00
955133f173
Extend whitelist to handle URLs without // chars
2014-07-31 08:11:40 -07:00
5054b714e2
Set version to 4.0.0-dev in package.json
2014-07-25 20:03:42 -04:00
c2cafb4b45
CB-7172 Force window to have focus after resume
...
Workaround for some devices (Samsung Galaxy Note 3 at least)
github: close #108
2014-07-22 22:33:53 -04:00
05868b541b
Merge branch 'master' into 4.0.x (background color)
2014-07-21 15:47:03 -04:00
67f474ef42
CB-7159 Set background color of webView as well as its parent
...
github: close #109 , close #110
2014-07-21 15:46:23 -04:00
a40424e75c
Merge branch 'master' into 4.0.x (setButtonPlumbedToJs)
...
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
2014-07-18 13:49:04 -04:00
cd6c0e1de9
CB-7018 Fix setButtonPlumbedToJs never un-listening
2014-07-18 13:46:29 -04:00
a99c8219bd
Make private PluginManager.clearPluginObjects, .startupPlugins
2014-07-14 14:30:10 -04:00
a03fdaba39
Merge branch 'master' into 4.0.x (undeprecate)
2014-07-14 14:28:56 -04:00
92be0033a8
Undeprecate some just-deprecated symbols in PluginManager.
...
Forgot about custom engines again :(
2014-07-14 14:28:27 -04:00
6f301576eb
Mark PluginEntry fields as final
...
Makes the intention of the class more clear, and the public fields less
bad.
2014-07-14 14:26:21 -04:00
e2b3f76a10
Merge branch 'master' into 4.0.x (PluginEntry refactor)
...
Conflicts:
framework/src/org/apache/cordova/PluginEntry.java
framework/src/org/apache/cordova/PluginManager.java
test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
2014-07-14 14:18:10 -04:00
b934c1be6a
@Deprecate methods of PluginManager that were never meant to be public
2014-07-14 14:10:19 -04:00
145b50a320
Move plugin instantiation and instance storing logic PluginEntry->PluginManager
...
Instantiation and storing of the instance should be owned privately by
PluginManager, not exposed via an unprotected public API. That said,
this refactoring does not make any breaking changes to the public API,
except for removing the createPlugin call in PluginEntry, which should
not be called by anyone other than PluginManager anyway.
2014-07-14 14:08:27 -04:00
a33cdc9c7b
Fix broken unit test due to missing Config.init() call
2014-07-14 14:06:47 -04:00
62101e85ff
Update to check for Google Glass APIs
...
This prevents the 'cordova build android' process from blowing up on this step if you assign the GDK as the target and want to rebuild via the CLI.
close #100
2014-07-14 10:30:23 -04:00
Ian Clelland