[
https://issues.apache.org/jira/browse/CB-14244?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16566227#comment-16566227
]
ASF GitHub Bot commented on CB-14244:
-------------------------------------
brodybits closed pull request #387: CB-14244 start 5.0.0-dev in master branch
URL: https://github.com/apache/cordova-ios/pull/387
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/CordovaLib/VERSION b/CordovaLib/VERSION
index 8ffeec0a3..55fd6dfea 100644
--- a/CordovaLib/VERSION
+++ b/CordovaLib/VERSION
@@ -1 +1 @@
-4.6.0-dev
+5.0.0-dev
diff --git a/CordovaLib/cordova.js b/CordovaLib/cordova.js
index 128941d3c..f66938983 100644
--- a/CordovaLib/cordova.js
+++ b/CordovaLib/cordova.js
@@ -1,5 +1,5 @@
// Platform: ios
-// 4450a4cea50616e080a82e8ede9e3d6a1fe3c3ec
+// 9e8e1b716252c4a08abcd31a13013b868d6f4141
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +19,7 @@
under the License.
*/
;(function() {
-var PLATFORM_VERSION_BUILD_LABEL = '4.6.0-dev';
+var PLATFORM_VERSION_BUILD_LABEL = '5.0.0-dev';
// file: src/scripts/require.js
/* jshint -W079 */
@@ -307,6 +307,7 @@ var cordova = {
} catch (err) {
var msg = 'Error in ' + (isSuccess ? 'Success' : 'Error') + '
callbackId: ' + callbackId + ' : ' + err;
console && console.log && console.log(msg);
+ console && console.log && err.stack && console.log(err.stack);
cordova.fireWindowEvent('cordovacallbackerror', { 'message': msg
});
throw err;
}
@@ -836,7 +837,7 @@ module.exports = channel;
});
-// file: /Users/spindori/Documents/Cordova/cordova-ios/cordova-js-src/exec.js
+// file: /Users/brodybits/Documents/cordova/cordova-ios/cordova-js-src/exec.js
define("cordova/exec", function(require, exports, module) {
/*global require, module, atob, document */
@@ -1559,7 +1560,7 @@ exports.reset();
});
-// file:
/Users/spindori/Documents/Cordova/cordova-ios/cordova-js-src/platform.js
+// file:
/Users/brodybits/Documents/cordova/cordova-ios/cordova-js-src/platform.js
define("cordova/platform", function(require, exports, module) {
module.exports = {
@@ -1575,7 +1576,7 @@ module.exports = {
});
-// file:
/Users/spindori/Documents/Cordova/cordova-ios/cordova-js-src/plugin/ios/console.js
+// file:
/Users/brodybits/Documents/cordova/cordova-ios/cordova-js-src/plugin/ios/console.js
define("cordova/plugin/ios/console", function(require, exports, module) {
//------------------------------------------------------------------------------
@@ -1746,7 +1747,7 @@ for (var key in console) {
});
-// file:
/Users/spindori/Documents/Cordova/cordova-ios/cordova-js-src/plugin/ios/logger.js
+// file:
/Users/brodybits/Documents/cordova/cordova-ios/cordova-js-src/plugin/ios/logger.js
define("cordova/plugin/ios/logger", function(require, exports, module) {
//------------------------------------------------------------------------------
diff --git a/bin/templates/scripts/cordova/version
b/bin/templates/scripts/cordova/version
index 109839209..59e3899ee 100755
--- a/bin/templates/scripts/cordova/version
+++ b/bin/templates/scripts/cordova/version
@@ -26,7 +26,7 @@
*/
// Coho updates this line
-var VERSION="4.6.0-dev";
+var VERSION="5.0.0-dev";
module.exports.version = VERSION;
diff --git a/package.json b/package.json
index bc28cbc2a..e9ab39ee8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-ios",
- "version": "4.6.0-dev",
+ "version": "5.0.0-dev",
"description": "cordova-ios release",
"main": "bin/templates/scripts/cordova/Api.js",
"repository": {
----------------------------------------------------------------
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:
[email protected]
> start [email protected]
> ---------------------------
>
> Key: CB-14244
> URL: https://issues.apache.org/jira/browse/CB-14244
> Project: Apache Cordova
> Issue Type: Task
> Components: cordova-ios
> Reporter: Chris Brody
> Assignee: Chris Brody
> Priority: Major
>
> To be done before the following in {{master}} branch of {{cordova-ios}}:
> * CB-14074 - remove Node.js 4 support from {{package.json}},
> {{.travis.yml}}, {{appveyor.yml}}, ...
> * CB-14242 - remove committed {{node_modules}}
> * any other potentially breaking changes
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
