Skip to content
This repository was archived by the owner on Apr 3, 2020. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: crosswalk-project/cordova-plugin-crosswalk-webview
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: ChefSteps/cordova-plugin-crosswalk-webview
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 1 commit
  • 8 files changed
  • 1 contributor

Commits on Aug 15, 2019

  1. Update for Cordova 9, requireCordovaFile => require

    Mark Parris committed Aug 15, 2019
    Copy the full SHA
    58ed5c8 View commit details
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
platforms/android/libs/xwalk_core_library/build/
platforms/android/libs/xwalk_core_library/build.gradle
*.iml

node_modules/
2 changes: 1 addition & 1 deletion hooks/after_build/000-build_64_bit.js
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
module.exports = function(context) {

/** @external */
var deferral = context.requireCordovaModule('q').defer(),
var deferral = context.require('q').defer(),
UpdateConfig = require('./../update_config.js'),
updateConfig = new UpdateConfig(context);

2 changes: 1 addition & 1 deletion hooks/after_plugin_install/000-shared_mode_special.js
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
module.exports = function(context) {

/** @external */
var deferral = context.requireCordovaModule('q').defer(),
var deferral = context.require('q').defer(),
UpdateConfig = require('./../update_config.js'),
updateConfig = new UpdateConfig(context);

2 changes: 1 addition & 1 deletion hooks/before_build/000-build_64_bit.js
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
module.exports = function(context) {

/** @external */
var deferral = context.requireCordovaModule('q').defer(),
var deferral = context.require('q').defer(),
UpdateConfig = require('./../update_config.js'),
updateConfig = new UpdateConfig(context);

2 changes: 1 addition & 1 deletion hooks/before_plugin_uninstall/000-shared_mode_special.js
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
module.exports = function(context) {

/** @external */
var deferral = context.requireCordovaModule('q').defer(),
var deferral = context.require('q').defer(),
UpdateConfig = require('./../update_config.js'),
updateConfig = new UpdateConfig(context);

14 changes: 7 additions & 7 deletions hooks/update_config.js
View file
Original file line number Diff line number Diff line change
@@ -5,17 +5,17 @@ module.exports = function(context) {
var ConfigParser, XmlHelpers;
try {
// cordova-lib >= 5.3.4 doesn't contain ConfigParser and xml-helpers anymore
ConfigParser = context.requireCordovaModule("cordova-common").ConfigParser;
XmlHelpers = context.requireCordovaModule("cordova-common").xmlHelpers;
ConfigParser = context.require("cordova-common").ConfigParser;
XmlHelpers = context.require("cordova-common").xmlHelpers;
} catch (e) {
ConfigParser = context.requireCordovaModule("cordova-lib/src/configparser/ConfigParser");
XmlHelpers = context.requireCordovaModule("cordova-lib/src/util/xml-helpers");
ConfigParser = context.require("cordova-lib/src/configparser/ConfigParser");
XmlHelpers = context.require("cordova-lib/src/util/xml-helpers");
}

/** @external */
var fs = context.requireCordovaModule('fs'),
path = context.requireCordovaModule('path'),
et = context.requireCordovaModule('elementtree');
var fs = context.require('fs'),
path = context.require('path'),
et = context.require('elementtree');

/** @defaults */
var xwalkVariables = {},
13 changes: 13 additions & 0 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 10 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -35,6 +35,12 @@
"cordova": ">=5.2.0",
"cordova-android": ">=6"
},
"2.4.0": {
"cordova": ">=5.2.0",
"cordova-android": ">=6",
"cordova-common": "3.2.0",
"cordova-lib": "9.0.1"
},
"3.0.0": {
"cordova": ">100"
}
@@ -45,5 +51,8 @@
"bugs": {
"url": "https://crosswalk-project.org/jira"
},
"homepage": "https://github.com/crosswalk-project/cordova-plugin-crosswalk-webview"
"homepage": "https://github.com/crosswalk-project/cordova-plugin-crosswalk-webview",
"dependencies": {
"q": "^1.4.1"
}
}