From 2b33bdbf8068a01ede19a6c11990b495327be5a8 Mon Sep 17 00:00:00 2001 From: Josh Kasten Date: Wed, 22 Aug 2018 13:55:31 -0700 Subject: [PATCH] Revert install hooks modifying build.gradle --- .gitignore | 4 +- lib/postinstall.js | 115 ------------------------------------------ package.json | 8 +-- postinstall-hooks.js | 4 -- preuninstall-hooks.js | 4 -- 5 files changed, 3 insertions(+), 132 deletions(-) delete mode 100644 lib/postinstall.js delete mode 100644 postinstall-hooks.js delete mode 100644 preuninstall-hooks.js diff --git a/.gitignore b/.gitignore index c9f5bc2..18abdad 100755 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,4 @@ demo/*.d.ts demo/lib demo/platforms demo/node_modules -node_modules -!lib/postinstall.js -!*-hooks.js \ No newline at end of file +node_modules \ No newline at end of file diff --git a/lib/postinstall.js b/lib/postinstall.js deleted file mode 100644 index 34c3c00..0000000 --- a/lib/postinstall.js +++ /dev/null @@ -1,115 +0,0 @@ -var fs = require("fs"); -var path = require("path"); -var appRoot = "../../"; - -/** - * Create dev tools gradle runtime entry - */ -function writeFabricServiceGradleHook() { - console.log("Install Onesignal-build-gradle hook."); - try { - if (!fs.existsSync(path.join(appRoot, "hooks"))) { - fs.mkdirSync(path.join(appRoot, "hooks")); - } - if (!fs.existsSync(path.join(appRoot, "hooks", "after-prepare"))) { - fs.mkdirSync(path.join(appRoot, "hooks", "after-prepare")); - } - var scriptContent = - ` -var path = require("path"); -var fs = require("fs"); -module.exports = function($logger, $projectData, hookArgs) { - var platform = hookArgs.platform.toLowerCase(); - - function updateAppGradleScript(file) { - var appBuildGradleContent = fs.readFileSync(file).toString(); - if (!appBuildGradleContent.match(/.*onesignal.*/)) { - $logger.trace("Configuring Onesignal for Android"); - var search = -1; - - var repositories = appBuildGradleContent.match(/repositories \{([^}]+)\}/gm); - if (!repositories) { - return; - } - search = appBuildGradleContent.indexOf(repositories[0]) + repositories[0].length; - appBuildGradleContent = appBuildGradleContent.substr(0, search) + \`\n maven { url "https://plugins.gradle.org/m2/" }\n\` + appBuildGradleContent.substr(search); - - search = appBuildGradleContent.indexOf("apply plugin: \\"com.android.application\\""); - if (search == -1) { - return; - } - appBuildGradleContent = appBuildGradleContent.substr(0, search + 39) + \`\napply plugin: "com.onesignal.androidsdk.onesignal-gradle-plugin"\n\` + appBuildGradleContent.substr(search + 39); - - appBuildGradleContent = appBuildGradleContent + \` - configurations.all { - resolutionStrategy.eachDependency { DependencyResolveDetails details -> - def requested = details.requested - if (requested.group == 'com.android.support') { - if (!requested.name.startsWith("multidex")) { - details.useVersion '27.1.0' - } - } - } - } - \`; - - fs.writeFileSync(file, appBuildGradleContent); - $logger.trace('Written build.gradle'); - } - } - - function updateGradleScript(file) { - var buildGradleContent = fs.readFileSync(file).toString(); - if (!buildGradleContent.match(/.*onesignal.*/)) { - $logger.trace("Configuring Onesignal for Android"); - var search = -1; - - var repositories = buildGradleContent.match(/repositories \{([^}]+)\}/gm); - if (!repositories) { - return; - } - search = buildGradleContent.indexOf(repositories[0]) + repositories[0].length; - buildGradleContent = buildGradleContent.substr(0, search) + \`\n maven { url "https://plugins.gradle.org/m2/" }\n\` + buildGradleContent.substr(search); - - search = buildGradleContent.indexOf("dependencies", search); - if (search == -1) { - return; - } - search = buildGradleContent.indexOf("}", search); - if (search == -1) { - return; - } - buildGradleContent = buildGradleContent.substr(0, search - 1) + \` classpath "gradle.plugin.com.onesignal:onesignal-gradle-plugin:[0.10.1, 0.99.99]"\n\` + buildGradleContent.substr(search - 1); - - fs.writeFileSync(file, buildGradleContent); - $logger.trace('Written build.gradle'); - } - } - - if (platform === 'android') { - var androidPlatformDir = path.join(__dirname, "..", "..", 'platforms', 'android'); - var androidAppPlatformDir = path.join(__dirname, "..", "..", 'platforms', 'android', 'app'); - var gradleScript = path.join(androidPlatformDir, 'build.gradle'); - var gradleAppScript = path.join(androidAppPlatformDir, 'build.gradle'); - - if (fs.existsSync(gradleAppScript)) { - updateAppGradleScript(gradleAppScript); - updateGradleScript(gradleScript); - } else { - updateGradleScript(gradleScript); - } - } -}; - -`; - console.log("Writing 'nativescript-onesignal-gradle.js' to " + appRoot + "hooks/after-prepare"); - var scriptPath = path.join(appRoot, "hooks", "after-prepare", "nativescript-onesignal-gradle.js"); - fs.writeFileSync(scriptPath, scriptContent); - } catch (e) { - console.log("Failed to install nativescript-onesignal-gradle hook."); - console.log(e); - throw e; - } -} - -writeFabricServiceGradleHook(); diff --git a/package.json b/package.json index 757da53..6467807 100755 --- a/package.json +++ b/package.json @@ -39,16 +39,12 @@ "demo.ios": "npm run preparedemo && cd demo && tns run ios", "demo.android": "npm run preparedemo && cd demo && tns run android", "preparedemo": "npm run build && cd demo && tns plugin remove nativescript-onesignal && tns plugin add .. && tns install", - "setup": "npm i && cd demo && npm i && cd .. && npm run build && cd demo && tns plugin add .. && cd ..", - "postinstall": "node postinstall-hooks.js && node lib/postinstall.js", - "preuninstall": "node preuninstall-hooks.js" + "setup": "npm i && cd demo && npm i && cd .. && npm run build && cd demo && tns plugin add .. && cd .." }, "devDependencies": { "tns-core-modules": "^2.2.0", "tns-platform-declarations": "^2.2.0", "typescript": "^1.8.10" - }, - "dependencies": { - "nativescript-hook": "^0.2.4" } } + diff --git a/postinstall-hooks.js b/postinstall-hooks.js deleted file mode 100644 index 5c27593..0000000 --- a/postinstall-hooks.js +++ /dev/null @@ -1,4 +0,0 @@ -var tnsHook = require('nativescript-hook'); -if (tnsHook) { - tnsHook(__dirname).postinstall(); -} diff --git a/preuninstall-hooks.js b/preuninstall-hooks.js deleted file mode 100644 index 4793381..0000000 --- a/preuninstall-hooks.js +++ /dev/null @@ -1,4 +0,0 @@ -var tnsHook = require('nativescript-hook'); -if (tnsHook) { - tnsHook(__dirname).preuninstall(); -}