diff --git a/circle.yml b/circle.yml index ffe3e0d..bfd6723 100644 --- a/circle.yml +++ b/circle.yml @@ -28,7 +28,7 @@ jobs: android: docker: - - image: circleci/android:api-26-alpha + - image: circleci/android:api-28 environment: - JVM_OPTS: -Xmx3200m working_directory: ~/project/Example @@ -57,7 +57,7 @@ jobs: publish: docker: - - image: circleci/android:api-26-alpha + - image: circleci/android:api-28 steps: - checkout - run: diff --git a/intercom-plugin/scripts/checkForUpdate.js b/intercom-plugin/scripts/checkForUpdate.js index eaee666..a00d54e 100644 --- a/intercom-plugin/scripts/checkForUpdate.js +++ b/intercom-plugin/scripts/checkForUpdate.js @@ -1,6 +1,6 @@ -function fetchUpdateInfo(context, callback) { - var fs = context.requireCordovaModule('fs'); +var fs = require('fs'); +function fetchUpdateInfo(callback) { var updateInfo = { releaseDate: 0, podUpdateDate: 0, @@ -18,18 +18,16 @@ function fetchUpdateInfo(context, callback) { }); } -function writeUpdateInfo(context, updateInfo, callback) { - var fs = context.requireCordovaModule('fs'); +function writeUpdateInfo(updateInfo, callback) { fs.writeFile('platforms/ios/.intercom_update', JSON.stringify(updateInfo), 'utf8', function (err,data) { callback(); }); } -function updateIntercomIfNeeded(context, updateInfo, callback) { - var exec = context.requireCordovaModule('child_process').exec; - +function updateIntercomIfNeeded(updateInfo, callback) { + var exec = require('child_process').exec; var completion = function() { - writeUpdateInfo(context, updateInfo, function() { + writeUpdateInfo(updateInfo, function() { callback(); }); }; @@ -48,8 +46,8 @@ function updateIntercomIfNeeded(context, updateInfo, callback) { } } -function fetchLatestRelease(context, callback) { - var https = context.requireCordovaModule('https'); +function fetchLatestRelease(callback) { + var https = require('https'); var req = https.get({ headers: { @@ -78,14 +76,14 @@ function fetchLatestRelease(context, callback) { }); } -module.exports = function(context) { - var Q = context.requireCordovaModule('q'); - var deferral = new Q.defer(); +module.exports = function() { + var q = require('q'); + var deferral = new q.defer(); - fetchUpdateInfo(context, function(updateInfo) { + fetchUpdateInfo(function(updateInfo) { // Check at most once every 48 hours if (Date.now() - updateInfo.lastCheckDate > 1000 * 60 * 60 * 48) { - fetchLatestRelease(context, function(releaseData) { + fetchLatestRelease(function(releaseData) { updateInfo.lastCheckDate = Date.now(); if (releaseData != null) { @@ -95,7 +93,7 @@ module.exports = function(context) { updateInfo.releaseDate = Date.now(); } - updateIntercomIfNeeded(context, updateInfo, function() { + updateIntercomIfNeeded(updateInfo, function() { deferral.resolve(); }); }); diff --git a/intercom-plugin/scripts/prepareCocoaPods.js b/intercom-plugin/scripts/prepareCocoaPods.js index 30061a8..178a663 100644 --- a/intercom-plugin/scripts/prepareCocoaPods.js +++ b/intercom-plugin/scripts/prepareCocoaPods.js @@ -1,7 +1,8 @@ -module.exports = function(context) { - var Q = context.requireCordovaModule('q'); - var deferral = new Q.defer(); - var exec = context.requireCordovaModule('child_process').exec; +module.exports = function() { + var q = require('q'); + var exec = require('child_process').exec; + + var deferral = new q.defer(); console.log('Updating CocoaPods specs repo'); exec('pod repo update master', function(error, stdout, stderr) {