b69fed18e2
Move cordova.gradle from project template to CordovaLib
...
Make it easier to share with tests project.
Also, one less file in the project template is a good thing.
2015-01-20 11:04:40 -05:00
2964aea447
gradle: Fix incorrect buildTools dependencies in framework's build.gradle
...
(although it didn't seem to hurt anything?)
2015-01-20 10:49:19 -05:00
587488a1b1
Merge branch 'master' into 4.0.x (cert challenges)
...
Conflicts:
framework/src/org/apache/cordova/AndroidWebViewClient.java
2015-01-19 22:22:02 -05:00
623b394c83
CB-8328 Allow plugins to handle certificate challenges ( close #150 )
...
This is a new API for Lollipop
2015-01-19 22:17:39 -05:00
e671ffdab1
Merge branch 'master' into 4.0.x (gradle fixes)
2015-01-19 22:04:10 -05:00
92d1080b2f
Adds cdvPrintProps gradle task: dumps out all cdv properties
...
Useful for debugging.
2015-01-19 21:59:02 -05:00
893c0e9b67
CB-8255 Pass arch to gradle regardless of cdvBuildMultipleApks
...
This also pushes the "which target to build" logic into gradle, since
build.js doesn't actually know the value of `cdvBuildMultipleApks`.
2015-01-19 21:56:46 -05:00
af60f71ea3
CB-8255 Fix cordova/build --gradleVar=--foo=bar stripping off =bar
2015-01-19 21:54:29 -05:00
9a952f1004
Fix cordova/build not printing out all gradle args in console message
2015-01-19 21:53:08 -05:00
3ec7dfff8b
Fix cordova/run not finding apk when multi-arch is specified but only arch-independent apk exists
2015-01-19 21:51:57 -05:00
d30a5e0388
Fix exception for unknown flag in cordova/run
2015-01-19 21:50:14 -05:00
fcece7e189
Allow --ant, --gradle for cordova/run
2015-01-19 21:49:36 -05:00
3949d9633c
Merge branch 'master' into 4.0.x (file input, auth dialogs)
...
Conflicts:
framework/src/org/apache/cordova/AndroidChromeClient.java
framework/src/org/apache/cordova/CordovaActivity.java
framework/src/org/apache/cordova/SplashScreenInternal.java
2015-01-19 16:34:06 -05:00
62c1c5f38b
CB-8017 Add support for <input type=file> for Lollipop
...
Also refactors a bit to remove related special-case code from CordovaActivity
2015-01-19 16:15:25 -05:00
56204c5748
CB-8329 Cancel outstanding ActivityResult requests when a new startActivityForResult occurs
2015-01-19 16:13:48 -05:00
34c163be88
CB-8280 android: Don't apply SplashScreenDelay when .show() is called explicitly
2015-01-19 13:42:11 -05:00
11002d4a56
CB-8201 Add support for auth dialogs into Cordova Android
2015-01-16 13:06:10 +03:00
240f27ce97
CB-8314 Speed up Travis CI ( close #148 )
2015-01-15 20:36:30 -05:00
5295be1c25
Revert "Delete VERSION file (superseded by package.json)"
...
This reverts commit 238a67af3ahttps://github.com/apache/cordova-lib/blob/0f5dbafface487c5738f294e47520d8b2381134d/cordova-lib/src/cordova/platform.js#L495
2015-01-13 15:35:25 -05:00
238a67af3a
Delete VERSION file (superseded by package.json)
2015-01-13 10:02:00 -05:00
4382234676
Merge branch 'master' into 4.0.x (fix windows space-in-path bug)
...
close #147
Conflicts:
VERSION
bin/templates/cordova/version
framework/assets/www/cordova.js
framework/src/org/apache/cordova/CordovaWebView.java
package.json
2015-01-13 10:01:31 -05:00
8e5c93a31f
CB-4914 Fix build whitespace issue
2015-01-13 09:59:29 -05:00
0e5d72dc5d
Update JS snapshot to version 3.8.0-dev (via coho)
2015-01-12 14:55:49 -08:00
4b8069f5ec
Set VERSION to 3.8.0-dev (via coho)
2015-01-12 14:55:48 -08:00
a816a48416
Merge branch 'master' into 4.0.x (delete onDestroy)
...
Conflicts:
framework/assets/www/cordova.js
framework/src/org/apache/cordova/CordovaWebView.java
2015-01-12 10:58:00 -05:00
5415440829
CB-8210 Remove unused onDestroy channel ( close #146 )
...
- Channel was defined as internal event and fired by javascript eval()
- Rather than change firing of event, simpler to remove as was not used
2015-01-12 10:50:36 -05:00
9668272b80
Merge branch 'master' into 4.0.x
...
* Fix CB-8062 on 4.0.x branch
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
2015-01-09 13:38:38 -08:00
15e19489e3
CB-8026: Bumping up Android Version and setting it up to allow third-party cookies. This might change later.
2015-01-09 11:31:29 -08:00
2083f683ad
Merge branch 'master' into 4.0.x (gradle properties)
...
Conflicts:
bin/templates/cordova/lib/build.js
2015-01-08 15:43:22 -05:00
c3610aa43c
CB-8255 Use properties rather than environment variables for gradle settings
2015-01-08 15:26:24 -05:00
df4fbc272a
CB-8210 Update JS snapshot with 4.0.x-specific platformVersion to fix CoreAndroid vs App plugin name
2015-01-05 22:09:12 -05:00
9698a995fb
Merge branch 'master' into 4.0.x (drop events before startup)
2015-01-05 16:33:05 -05:00
c1ac3aa483
CB-8210 Drop events from native that occur before start-up
2015-01-05 16:32:39 -05:00
311bdbd360
Merge branch 'master' into 4.0.x (loadUrl->sendEvent)
...
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
2015-01-05 16:26:58 -05:00
291f111913
CB-8210 Use PluginResult for various events from native ( close #144 )
...
- Change to send events via plugin message channel: various buttons, pause/resume
2015-01-05 16:15:17 -05:00
95e10bdb9e
Merge branch 'master' into 4.0.x (run --list)
2015-01-03 21:06:07 -05:00
c2a6dcb6bd
CB-8168 Add support for cordova/run --list ( closes #139 )
2015-01-03 21:05:52 -05:00
61c4bb9888
Merge branch 'master' into 4.0.x (keyboard events via PluginResult)
...
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
2014-12-30 23:30:42 -05:00
3439746645
CB-8210 Use PluginResult instead of sendJavascript() for keyboard events ( close #142 )
...
- Initialize a message channel for native -> Javascript in the core App plugin
- Change keyboard detection to send events via plugin message channel, instead
using eval() (i.e. webView.sendJavascript())
2014-12-30 23:25:56 -05:00
b10fe465ab
Closing stale pull request: close #114
2014-12-30 23:20:52 -05:00
c6b171ba95
CB-6630 Delete bundled (and outdated) copy of OkHttp
...
Those that want to use OkHttp can use a plugin.
2014-12-30 23:00:18 -05:00
5a17d6cd5f
Merge branch 'master' into 4.0.x (gradle - maven and CordovaLib dep)
2014-12-30 22:59:50 -05:00
480af2644c
CB-8228 Gradle: Allow plugins to use Maven dependencies
2014-12-30 22:57:53 -05:00
ecd2e06883
CB-8229 Gradle: Add CordovaLib as a dependency to all plugin sub-projects
2014-12-30 22:56:43 -05:00
4f3ae23170
Merge branch 'master' into 4.0.x (--minSdkVersion and --versionCode)
...
Conflicts:
bin/templates/project/build.gradle
2014-12-24 13:35:39 -05:00
7cfb33d0ef
CB-7980 Add --minSdkVersion and --versionCode flags to cordova/build command
...
These are also exposed via environment variables: ANDROID_VERSION_CODE, ANDROID_MIN_SDK_VERSION
This also fixes build.gradle modifying the value set by ANDROID_VERSION_CODE when multi-apk is enabled (override should never be modified)
2014-12-23 16:26:43 -05:00
9224ab1592
CB-7980: Add 9 to versionCode for minSdk 20+ if not multiarch
2014-12-23 15:29:40 -05:00
a696ff37f1
Merge branch 'master' into 4.0.x (Plugin set multiarach)
2014-12-22 23:19:56 -05:00
931a996dab
Allow plugins to set ext.multiarch to enable multiple APK building
...
The xwalk webView need build multiple apks by default after install
cordova-crosswalk-engine plugin, we can set ext.multiarch=true to open
the flag in plugin, it don't necessary set system environment BUILD_MULTIPLE_APKS
manually.
This closes #141
2014-12-22 23:19:27 -05:00
68c03090a3
Merge branch 'master' into 4.0.x (Gradle lint stages)
2014-12-22 13:29:50 -05:00
Andrew Grieve