[GitHub] brodybits closed pull request #470: CB-14240 mark 7.1.2-dev on 7.1.x

[GitBox <gi...@apache.org>]

brodybits closed pull request #470: CB-14240 mark 7.1.2-dev on 7.1.x
URL: https://github.com/apache/cordova-android/pull/470
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/VERSION b/VERSION
index 21c8c7b46..6b486ff36 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.1.1
+7.1.2-dev
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index b20d5ae12..9d1d6b22a 100755
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,7 +20,7 @@
 */
 
 // Coho updates this line:
-var VERSION = "7.1.1";
+var VERSION = "7.1.2-dev";
 
 module.exports.version = VERSION;
 
diff --git a/bin/templates/project/assets/www/cordova.js b/bin/templates/project/assets/www/cordova.js
index d7b144ea9..86060cfbe 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.1';
+var PLATFORM_VERSION_BUILD_LABEL = '7.1.2-dev';
 // file: src/scripts/require.js
 
 /* jshint -W079 */
diff --git a/framework/build.gradle b/framework/build.gradle
index 4ff7264c7..fd9b5b555 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.1'
+version = '7.1.2-dev'
 
 android {
     compileSdkVersion cdvCompileSdkVersion
@@ -129,9 +129,9 @@ bintray {
         licenses = ['Apache-2.0']
         labels = ['android', 'cordova', 'phonegap']
         version {
-            name = '7.1.1'
+            name = '7.1.2-dev'
             released  = new Date()
-            vcsTag = '7.1.1'
+            vcsTag = '7.1.2-dev'
         }
     }
 }
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index 4ed1b755e..f895526da 100644
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -31,7 +31,7 @@ Licensed to the Apache Software Foundation (ASF) under one
  * are not expected to implement it.
  */
 public interface CordovaWebView {
-    public static final String CORDOVA_VERSION = "7.1.1";
+    public static final String CORDOVA_VERSION = "7.1.2-dev";
 
     void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);
 
diff --git a/package.json b/package.json
index ad92a4004..570d42c93 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-android",
-  "version": "7.1.1",
+  "version": "7.1.2-dev",
   "description": "cordova-android release",
   "bin": {
     "create": "bin/create"


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org