You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2017/11/29 19:34:35 UTC
[cordova-android] 01/01: Merge branch 'master' into 6.4.x
This is an automated email from the ASF dual-hosted git repository.
bowserj pushed a commit to branch 6.4.x
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
commit fae39dd2e58cf8f9fa81c9aa542628a2f7b0de21
Merge: 7a27ee4 3ad1ed7
Author: Joe Bowser <bo...@apache.org>
AuthorDate: Tue Nov 28 10:39:54 2017 -0800
Merge branch 'master' into 6.4.x
Merging all non-StudioProjectCompat work into the 6.4.x branch for
possible 6.x, or 6.4.x work in the future.
VERSION | 2 +-
.../cordova/lib/builders/GenericBuilder.js | 19 ++++++++++--
bin/templates/cordova/version | 2 +-
bin/templates/project/assets/www/cordova.js | 4 +--
bin/templates/project/build.gradle | 34 ++++++++++++++++++---
.../project/res/drawable-land-hdpi/screen.png | Bin 218302 -> 64368 bytes
.../project/res/drawable-land-ldpi/screen.png | Bin 42616 -> 15341 bytes
.../project/res/drawable-land-mdpi/screen.png | Bin 92347 -> 31136 bytes
.../project/res/drawable-land-xhdpi/screen.png | Bin 489604 -> 142334 bytes
.../project/res/drawable-land-xxhdpi/screen.png | Bin 1135414 -> 227190 bytes
.../project/res/drawable-land-xxxhdpi/screen.png | Bin 1460298 -> 293416 bytes
.../project/res/drawable-port-hdpi/screen.png | Bin 222148 -> 67702 bytes
.../project/res/drawable-port-ldpi/screen.png | Bin 42034 -> 15345 bytes
.../project/res/drawable-port-mdpi/screen.png | Bin 90555 -> 30079 bytes
.../project/res/drawable-port-xhdpi/screen.png | Bin 504508 -> 141738 bytes
.../project/res/drawable-port-xxhdpi/screen.png | Bin 1166124 -> 211817 bytes
.../project/res/drawable-port-xxxhdpi/screen.png | Bin 1595731 -> 299018 bytes
bin/templates/project/res/mipmap-hdpi/icon.png | Bin 6080 -> 3345 bytes
bin/templates/project/res/mipmap-ldpi/icon.png | Bin 3096 -> 1821 bytes
bin/templates/project/res/mipmap-mdpi/icon.png | Bin 4090 -> 2368 bytes
bin/templates/project/res/mipmap-xhdpi/icon.png | Bin 7685 -> 4085 bytes
bin/templates/project/res/mipmap-xxhdpi/icon.png | Bin 14189 -> 6421 bytes
bin/templates/project/res/mipmap-xxxhdpi/icon.png | Bin 17965 -> 7934 bytes
framework/build.gradle | 10 ++++--
framework/gradle/wrapper/gradle-wrapper.properties | 4 +--
.../src/org/apache/cordova/CordovaInterface.java | 11 ++++++-
.../org/apache/cordova/CordovaInterfaceImpl.java | 6 ++++
.../src/org/apache/cordova/CordovaWebView.java | 2 +-
package.json | 2 +-
29 files changed, 79 insertions(+), 17 deletions(-)
diff --cc VERSION
index 19b860c,1c12120..25af95d
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
- 6.4.0
-6.5.0-dev
++6.4.1-dev
diff --cc bin/templates/cordova/version
index 775a4cd,cf4c590..2ae022d
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@@ -20,7 -20,7 +20,7 @@@
*/
// Coho updates this line:
- var VERSION = "6.4.0";
-var VERSION = "6.5.0-dev";
++var VERSION = "6.4.1-dev";
module.exports.version = VERSION;
diff --cc bin/templates/project/assets/www/cordova.js
index 487939c,5eb7b4d..141ca31
--- a/bin/templates/project/assets/www/cordova.js
+++ b/bin/templates/project/assets/www/cordova.js
@@@ -19,7 -19,7 +19,7 @@@
under the License.
*/
;(function() {
- var PLATFORM_VERSION_BUILD_LABEL = '6.4.0';
-var PLATFORM_VERSION_BUILD_LABEL = '6.5.0-dev';
++var PLATFORM_VERSION_BUILD_LABEL = '6.4.1-dev';
// file: src/scripts/require.js
/* jshint -W079 */
@@@ -2185,4 -2185,4 +2185,4 @@@ window.cordova = require('cordova')
require('cordova/init');
--})();
++})();
diff --cc framework/build.gradle
index f8e3a95,1ad622c..cd9e6d4
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@@ -42,7 -42,7 +42,7 @@@ apply plugin: 'com.github.dcendents.and
apply plugin: 'com.jfrog.bintray'
group = 'org.apache.cordova'
- version = '6.4.0'
-version = '6.5.0-dev'
++version = '6.4.1-dev'
android {
compileSdkVersion cdvCompileSdkVersion
@@@ -129,9 -129,9 +129,15 @@@ bintray
licenses = ['Apache-2.0']
labels = ['android', 'cordova', 'phonegap']
version {
++<<<<<<< HEAD
+ name = '6.4.0'
+ released = new Date()
+ vcsTag = '6.4.0'
++=======
+ name = '6.5.0-dev'
+ released = new Date()
+ vcsTag = '6.5.0-dev'
++>>>>>>> master
}
}
}
diff --cc framework/src/org/apache/cordova/CordovaWebView.java
index 7ab2f91,6b34ff5..4f8c440
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@@ -31,7 -31,7 +31,7 @@@ import android.webkit.WebChromeClient.C
* are not expected to implement it.
*/
public interface CordovaWebView {
- public static final String CORDOVA_VERSION = "6.4.0";
- public static final String CORDOVA_VERSION = "6.5.0-dev";
++ public static final String CORDOVA_VERSION = "6.4.1-dev";
void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);
--
To stop receiving notification emails like this one, please contact
"commits@cordova.apache.org" <co...@cordova.apache.org>.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org