From a68f9fd752a25bb680da96414a3b956357c2dfcb Mon Sep 17 00:00:00 2001 From: "Christopher J. Brody" Date: Thu, 22 Nov 2018 22:38:38 -0500 Subject: [PATCH] Update VERSION & RELEASENOTES for 7.1.4 NOTE: VERSION was updated based on e1befac. --- RELEASENOTES.md | 6 ++++++ VERSION | 2 +- bin/templates/cordova/version | 2 +- bin/templates/project/assets/www/cordova.js | 2 +- framework/build.gradle | 6 +++--- framework/src/org/apache/cordova/CordovaWebView.java | 2 +- package.json | 2 +- 7 files changed, 14 insertions(+), 8 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index f76df415..dab263b6 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -20,6 +20,12 @@ --> ## Release Notes for Cordova (Android) ## +### 7.1.4 (Nov 22, 2018) + +* Update android-versions to `1.4.0`, with added support for Android Pie ([#573](https://github.com/apache/cordova-android/pull/573)) +* Output current package name if package name can't be validated ([#567](https://github.com/apache/cordova-android/pull/567)) +* Resolve issue with plugin `target-dir="*app*"` subdirs ([#572](https://github.com/apache/cordova-android/pull/572)) + ### 7.1.3 (Nov 19, 2018) * [GH-495](https://github.com/apache/cordova-android/pull/495) Incorrect default sdk version issue fix diff --git a/VERSION b/VERSION index 2c45a02e..b7f8ee41 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.1.4-dev +7.1.4 diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version index 2e787ae7..42d31ce6 100755 --- a/bin/templates/cordova/version +++ b/bin/templates/cordova/version @@ -20,7 +20,7 @@ */ // Coho updates this line: -var VERSION = "7.1.4-dev"; +var VERSION = "7.1.4"; module.exports.version = VERSION; diff --git a/bin/templates/project/assets/www/cordova.js b/bin/templates/project/assets/www/cordova.js index a991320d..da35c021 100644 --- a/bin/templates/project/assets/www/cordova.js +++ b/bin/templates/project/assets/www/cordova.js @@ -19,7 +19,7 @@ under the License. */ ;(function() { -var PLATFORM_VERSION_BUILD_LABEL = '7.1.4-dev'; +var PLATFORM_VERSION_BUILD_LABEL = '7.1.4'; // file: src/scripts/require.js /* jshint -W079 */ diff --git a/framework/build.gradle b/framework/build.gradle index b2ea38be..4f7f171c 100644 --- a/framework/build.gradle +++ b/framework/build.gradle @@ -42,7 +42,7 @@ apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' group = 'org.apache.cordova' -version = '7.1.4-dev' +version = '7.1.4' android { compileSdkVersion cdvCompileSdkVersion @@ -129,9 +129,9 @@ bintray { licenses = ['Apache-2.0'] labels = ['android', 'cordova', 'phonegap'] version { - name = '7.1.4-dev' + name = '7.1.4' released = new Date() - vcsTag = '7.1.4-dev' + vcsTag = '7.1.4' } } } diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java index 51733996..f4cab35f 100644 --- a/framework/src/org/apache/cordova/CordovaWebView.java +++ b/framework/src/org/apache/cordova/CordovaWebView.java @@ -31,7 +31,7 @@ import android.webkit.WebChromeClient.CustomViewCallback; * are not expected to implement it. */ public interface CordovaWebView { - public static final String CORDOVA_VERSION = "7.1.4-dev"; + public static final String CORDOVA_VERSION = "7.1.4"; void init(CordovaInterface cordova, List pluginEntries, CordovaPreferences preferences); diff --git a/package.json b/package.json index 0b2eab74..ebd7bb0e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova-android", - "version": "7.1.4-dev", + "version": "7.1.4", "description": "cordova-android release", "bin": { "create": "bin/create"