From b2a00872742ef884f790720544a59268bd674c22 Mon Sep 17 00:00:00 2001 From: bdirito Date: Mon, 26 Mar 2018 15:15:21 -0600 Subject: [PATCH 1/2] updating for cordova-android@^7.0.0 --- plugin.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.xml b/plugin.xml index cf2357d..7025073 100755 --- a/plugin.xml +++ b/plugin.xml @@ -35,11 +35,11 @@ - + - + From 9b064c9ecb1c4a1e211bcd02683b53644576839f Mon Sep 17 00:00:00 2001 From: Diogo Biolo D`Agostini Date: Thu, 18 Apr 2019 08:38:40 -0300 Subject: [PATCH 2/2] Fix Cordova 9 --- hooks/lib/ios-helper.js | 4 +- package-lock.json | 83 +++++++++++++++++++++++++++++++++++++++++ package.json | 5 ++- 3 files changed, 87 insertions(+), 5 deletions(-) create mode 100644 package-lock.json diff --git a/hooks/lib/ios-helper.js b/hooks/lib/ios-helper.js index c3d4d71..00a1ed0 100644 --- a/hooks/lib/ios-helper.js +++ b/hooks/lib/ios-helper.js @@ -2,6 +2,7 @@ var fs = require("fs"); var path = require("path"); var utilities = require("./utilities"); +var xcode = require("xcode"); /** * This is used as the display text for the build phase block in XCode as well as the @@ -20,7 +21,6 @@ module.exports = { addShellScriptBuildPhase: function (context, xcodeProjectPath) { var pluginConfig = utilities.getPluginConfig("ios"); - var xcode = context.requireCordovaModule("xcode"); // Read and parse the XCode project (.pxbproj) from disk. // File format information: http://www.monobjc.net/xcode-project-file-format.html @@ -75,8 +75,6 @@ module.exports = { */ removeShellScriptBuildPhase: function (context, xcodeProjectPath) { - var xcode = context.requireCordovaModule("xcode"); - // Read and parse the XCode project (.pxbproj) from disk. // File format information: http://www.monobjc.net/xcode-project-file-format.html var xcodeProject = xcode.project(xcodeProjectPath); diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..456e4ca --- /dev/null +++ b/package-lock.json @@ -0,0 +1,83 @@ +{ + "name": "cordova-fabric-plugin", + "version": "1.1.14-dev", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "base64-js": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz", + "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==" + }, + "big-integer": { + "version": "1.6.43", + "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.43.tgz", + "integrity": "sha512-9dULc9jsKmXl0Aeunug8wbF+58n+hQoFjqClN7WeZwGLh0XJUWyJJ9Ee+Ep+Ql/J9fRsTVaeThp8MhiCCrY0Jg==" + }, + "bplist-creator": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz", + "integrity": "sha1-N98VNgkoJLh8QvlXsBNEEXNyrkU=", + "requires": { + "stream-buffers": "~2.2.0" + } + }, + "bplist-parser": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz", + "integrity": "sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=", + "requires": { + "big-integer": "^1.6.7" + } + }, + "plist": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz", + "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==", + "requires": { + "base64-js": "^1.2.3", + "xmlbuilder": "^9.0.7", + "xmldom": "0.1.x" + } + }, + "simple-plist": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.0.0.tgz", + "integrity": "sha512-043L2rO80LVF7zfZ+fqhsEkoJFvW8o59rt/l4ctx1TJWoTx7/jkiS1R5TatD15Z1oYnuLJytzE7gcnnBuIPL2g==", + "requires": { + "bplist-creator": "0.0.7", + "bplist-parser": "0.1.1", + "plist": "^3.0.1" + } + }, + "stream-buffers": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz", + "integrity": "sha1-kdX1Ew0c75bc+n9yaUUYh0HQnuQ=" + }, + "uuid": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" + }, + "xcode": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/xcode/-/xcode-2.0.0.tgz", + "integrity": "sha512-5xF6RCjAdDEiEsbbZaS/gBRt3jZ/177otZcpoLCjGN/u1LrfgH7/Sgeeavpr/jELpyDqN2im3AKosl2G2W8hfw==", + "requires": { + "simple-plist": "^1.0.0", + "uuid": "^3.3.2" + } + }, + "xmlbuilder": { + "version": "9.0.7", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", + "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=" + }, + "xmldom": { + "version": "0.1.27", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz", + "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=" + } + } +} diff --git a/package.json b/package.json index c46606d..46b3b72 100644 --- a/package.json +++ b/package.json @@ -51,10 +51,11 @@ "crashlytics": "3.9.3" }, "dependencies": { - "opencollective": "^1.0.3" + "opencollective": "^1.0.3", + "xcode": "^2.0.0" }, "collective": { "type": "opencollective", "url": "https://opencollective.com/FabricPlugin" } -} \ No newline at end of file +}