fix(android): buid fix in some cases

farfromrefug · farfromrefug · commit a1b75ca008ef · 2022-02-17T15:32:38.000+01:00
diff --git a/plugin/package.json b/plugin/package.json
@@ -34,5 +34,6 @@
     "bootstrapper": "nativescript-plugin-seed",
     "dependencies": {
         "@nativescript-community/observable": "^2.0.8"
-    }
+    },
+    "gitHead": "531e9068c445832a6faf6bb8e227b738baa6ef18"
 }
diff --git a/plugin/platforms/android/include.gradle b/plugin/platforms/android/include.gradle
@@ -4,12 +4,13 @@ dependencies {
     implementation "androidx.annotation:annotation:1.1.0"
 }
 repositories {
-    def widgetsDir = '../../../node_modules/@nativescript/core/platforms/android'
-    def appPackageJsonFile = file("../../../package.json")
+    def appDir = "$rootDir/../../.."
+    def widgetsDir = "$appDir/node_modules/@nativescript/core/platforms/android"
+    def appPackageJsonFile = file("$appDir/package.json")
     if (appPackageJsonFile.exists()) {
         def appPackageJson = new JsonSlurper().parseText(appPackageJsonFile.text)
         if (appPackageJson.dependencies['@akylas/nativescript'] != null) {
-            widgetsDir = '../../../node_modules/@akylas/nativescript/platforms/android'
+            widgetsDir = "$appDir/node_modules/@akylas/nativescript/platforms/android"
         }
     }
     flatDir {

Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,6 @@`
`34`	`34`	`"bootstrapper": "nativescript-plugin-seed",`
`35`	`35`	`"dependencies": {`
`36`	`36`	`"@nativescript-community/observable": "^2.0.8"`
`37`		`- }`
	`37`	`+ },`
	`38`	`+ "gitHead": "531e9068c445832a6faf6bb8e227b738baa6ef18"`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,13 @@ dependencies {`
`4`	`4`	`implementation "androidx.annotation:annotation:1.1.0"`
`5`	`5`	`}`
`6`	`6`	`repositories {`
`7`		`- def widgetsDir = '../../../node_modules/@nativescript/core/platforms/android'`
`8`		`- def appPackageJsonFile = file("../../../package.json")`
	`7`	`+ def appDir = "$rootDir/../../.."`
	`8`	`+ def widgetsDir = "$appDir/node_modules/@nativescript/core/platforms/android"`
	`9`	`+ def appPackageJsonFile = file("$appDir/package.json")`
`9`	`10`	`if (appPackageJsonFile.exists()) {`
`10`	`11`	`def appPackageJson = new JsonSlurper().parseText(appPackageJsonFile.text)`
`11`	`12`	`if (appPackageJson.dependencies['@akylas/nativescript'] != null) {`
`12`		`- widgetsDir = '../../../node_modules/@akylas/nativescript/platforms/android'`
	`13`	`+ widgetsDir = "$appDir/node_modules/@akylas/nativescript/platforms/android"`
`13`	`14`	`}`
`14`	`15`	`}`
`15`	`16`	`flatDir {`