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.

Sign up for GitHub

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

Fix for Updating Bolts Framework and Cordova 9 #143

Merged
merged 3 commits into from
Mar 23, 2020
Merged

Fix for Updating Bolts Framework and Cordova 9 #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
296b276
Fix Plugin.xml to use Bolts framework using Pods
pushparajsamant Mar 22, 2020
e7d8b12
Fix for cordova 9
pushparajsamant Mar 22, 2020
c60aa48
Cordova-9-Updates (#1)
pushparajsamant Mar 23, 2020
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
9 changes: 8 additions & 1 deletion plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,14 @@
<framework src="libz.tbd" />
<framework src="libsqlite3.tbd" />
<framework src="src/ios/Frameworks/Parse.framework" custom="true" />
<framework src="src/ios/Frameworks/Bolts.framework" custom="true" />
<podspec>
<config>
<source url="https://github.com/CocoaPods/Specs.git"/>
</config>
<pods use-frameworks="true">
<pod name="Bolts" git="https://github.com/BoltsFramework/Bolts-ObjC" branch="master" />
</pods>
</podspec>
</platform>

<platform name="windows">
Expand Down
8 changes: 4 additions & 4 deletions scripts/afterAndroidPrepare.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module.exports = function (context) {
var fs = context.requireCordovaModule('fs');
var path = context.requireCordovaModule('path');
var ET = context.requireCordovaModule('elementtree');
var ConfigFile = context.requireCordovaModule("cordova-common").ConfigFile;
var fs = require('fs');
var path = require('path');
var ET = require('elementtree');
var ConfigFile = require("cordova-common").ConfigFile;

var configXml = new ConfigFile(context.opts.projectRoot, null, './config.xml');

Expand Down
4 changes: 2 additions & 2 deletions scripts/beforeAndroidInstall.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
var DefaultApplicationName = ["github.taivo.parsepushplugin", "ParsePushApplication"].join('.');

module.exports = function(context) {
var path = context.requireCordovaModule('path');
var ConfigFile = context.requireCordovaModule("cordova-common").ConfigFile;
var path = require('path');
var ConfigFile = require("cordova-common").ConfigFile;

var androidPrjDir = path.join(context.opts.projectRoot, 'platforms/android/app/src/main');
var androidManifest = new ConfigFile(androidPrjDir, 'android', 'AndroidManifest.xml');
Expand Down
4 changes: 2 additions & 2 deletions scripts/beforeAndroidUninstall.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
var DefaultApplicationName = ["github.taivo.parsepushplugin", "ParsePushApplication"].join('.');

module.exports = function(context) {
var path = context.requireCordovaModule('path');
var ConfigFile = context.requireCordovaModule("cordova-common").ConfigFile;
var path = require('path');
var ConfigFile = require("cordova-common").ConfigFile;

var androidPrjDir = path.join(context.opts.projectRoot, 'platforms/android/app/src/main');
var androidManifest = new ConfigFile(androidPrjDir, 'android', 'AndroidManifest.xml');
Expand Down