You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by GitBox <gi...@apache.org> on 2018/06/21 10:47:16 UTC
[GitHub] janpio closed pull request #455: Start 8.0.0-dev in master - WIP
janpio closed pull request #455: Start 8.0.0-dev in master - WIP
URL: https://github.com/apache/cordova-android/pull/455
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 7e4568592..e4be07b06 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.2.0-dev
+8.0.0-dev
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index 23e837672..01229aa6d 100755
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,7 +20,7 @@
*/
// Coho updates this line:
-var VERSION = '7.2.0-dev';
+var VERSION = "8.0.0-dev";
module.exports.version = VERSION;
diff --git a/bin/templates/project/assets/www/cordova.js b/bin/templates/project/assets/www/cordova.js
index 3ae354cd8..78f7df1ef 100644
--- a/bin/templates/project/assets/www/cordova.js
+++ b/bin/templates/project/assets/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: android
-// 4450a4cea50616e080a82e8ede9e3d6a1fe3c3ec
+// f5a790b434f6ac050da55c57e5fd5770f5a16512
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,9 +19,11 @@
under the License.
*/
;(function() {
-var PLATFORM_VERSION_BUILD_LABEL = '7.2.0-dev';
+var PLATFORM_VERSION_BUILD_LABEL = '8.0.0-dev';
// file: src/scripts/require.js
+/* jshint -W079 */
+/* jshint -W020 */
var require;
var define;
@@ -324,7 +326,7 @@ module.exports = cordova;
});
-// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/android/nativeapiprovider.js
+// file: /Users/brodybits/Documents/cordova/cordova-android/cordova-js-src/android/nativeapiprovider.js
define("cordova/android/nativeapiprovider", function(require, exports, module) {
/**
@@ -347,7 +349,7 @@ module.exports = {
});
-// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/android/promptbasednativeapi.js
+// file: /Users/brodybits/Documents/cordova/cordova-android/cordova-js-src/android/promptbasednativeapi.js
define("cordova/android/promptbasednativeapi", function(require, exports, module) {
/**
@@ -879,7 +881,7 @@ module.exports = channel;
});
-// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/exec.js
+// file: /Users/brodybits/Documents/cordova/cordova-android/cordova-js-src/exec.js
define("cordova/exec", function(require, exports, module) {
/**
@@ -1637,7 +1639,7 @@ exports.reset();
});
-// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/platform.js
+// file: /Users/brodybits/Documents/cordova/cordova-android/cordova-js-src/platform.js
define("cordova/platform", function(require, exports, module) {
// The last resume event that was received that had the result of a plugin call.
@@ -1747,7 +1749,7 @@ function onMessageFromNative(msg) {
});
-// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/plugin/android/app.js
+// file: /Users/brodybits/Documents/cordova/cordova-android/cordova-js-src/plugin/android/app.js
define("cordova/plugin/android/app", function(require, exports, module) {
var exec = require('cordova/exec');
diff --git a/framework/build.gradle b/framework/build.gradle
index dfe37a1e5..3dc5865bc 100644
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -44,7 +44,7 @@ apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'
group = 'org.apache.cordova'
-version = '7.2.0-dev'
+version = '8.0.0-dev'
android {
compileSdkVersion cdvCompileSdkVersion
@@ -131,9 +131,9 @@ bintray {
licenses = ['Apache-2.0']
labels = ['android', 'cordova', 'phonegap']
version {
- name = '7.2.0-dev'
+ name = '8.0.0-dev'
released = new Date()
- vcsTag = '7.2.0-dev'
+ vcsTag = '8.0.0-dev'
}
}
}
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index 6ef6ae6e7..306339837 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.2.0-dev";
+ public static final String CORDOVA_VERSION = "8.0.0-dev";
void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);
diff --git a/package.json b/package.json
index 13893cd15..c0ddb6019 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-android",
- "version": "7.2.0-dev",
+ "version": "8.0.0-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