diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 73b2760a..55886e11 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -20,6 +20,13 @@ --> ## Release Notes for Cordova (Android) ## +### 7.1.2 (Nov 08, 2018) +* [CB-14127](https://issues.apache.org/jira/browse/CB-14127): Always put the Google repo above jcenter +* [CB-14165](https://issues.apache.org/jira/browse/CB-14165): Emulator: handle "device still connecting" error (#457) +* [CB-14125](https://issues.apache.org/jira/browse/CB-14125): Increase old plugin compatibility +* [CB-13830](https://issues.apache.org/jira/browse/CB-13830): Add handlers for plugins that use non-Java source files, such as Camera +* [CB-14038](https://issues.apache.org/jira/browse/CB-14038): fix false positive detecting project type + ### 7.1.1 (Jul 11, 2018) * Fix unsafe property access in run.js (#445) * Emit log event instead of logging directly (#452) diff --git a/VERSION b/VERSION index 6b486ff3..a8a18875 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.1.2-dev +7.1.2 diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version index 9d1d6b22..6f490b8d 100755 --- a/bin/templates/cordova/version +++ b/bin/templates/cordova/version @@ -20,7 +20,7 @@ */ // Coho updates this line: -var VERSION = "7.1.2-dev"; +var VERSION = "7.1.2"; module.exports.version = VERSION; diff --git a/bin/templates/project/assets/www/cordova.js b/bin/templates/project/assets/www/cordova.js index 86060cfb..a9f8bb0d 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.2-dev'; +var PLATFORM_VERSION_BUILD_LABEL = '7.1.2'; // file: src/scripts/require.js /* jshint -W079 */ @@ -2186,4 +2186,4 @@ window.cordova = require('cordova'); require('cordova/init'); -})(); \ No newline at end of file +})(); diff --git a/framework/build.gradle b/framework/build.gradle index 2b616c7c..28c5e594 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.2-dev' +version = '7.1.2' android { compileSdkVersion cdvCompileSdkVersion @@ -129,9 +129,9 @@ bintray { licenses = ['Apache-2.0'] labels = ['android', 'cordova', 'phonegap'] version { - name = '7.1.2-dev' + name = '7.1.2' released = new Date() - vcsTag = '7.1.2-dev' + vcsTag = '7.1.2' } } } diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java index f895526d..64d410ea 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.2-dev"; + public static final String CORDOVA_VERSION = "7.1.2"; void init(CordovaInterface cordova, List pluginEntries, CordovaPreferences preferences); diff --git a/package.json b/package.json index 570d42c9..24deb1d7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova-android", - "version": "7.1.2-dev", + "version": "7.1.2", "description": "cordova-android release", "bin": { "create": "bin/create"