Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updating for cordova-android@^7.0.0 #129

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions hooks/lib/ios-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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);
Expand Down
83 changes: 83 additions & 0 deletions package-lock.json

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

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
4 changes: 2 additions & 2 deletions plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
</feature>
</config-file>

<config-file target="AndroidManifest.xml" parent="/*">
<config-file target="app/src/main/AndroidManifest.xml" parent="/*">
<uses-permission android:name="android.permission.INTERNET" />
</config-file>

<config-file target="AndroidManifest.xml" parent="application">
<config-file target="app/src/main/AndroidManifest.xml" parent="application">
<meta-data android:name="io.fabric.ApiKey" android:value="$FABRIC_API_KEY"/>
</config-file>

Expand Down