Merge remote-tracking branch 'origin/master'

Author: farfromrefug

packages/gesturehandler/platforms/android/include.gradle

@@ -1,22 +1,32 @@
 import groovy.json.JsonSlurper
-dependencies {
-    if (project.hasProperty("tempBuild")) {
-        implementation(name:'widgets-release', ext:'aar')
+
+// for now we support only @nativescript/core and @akylas/nativescript
+// we should have a more generic way
+def widgetsDir = "$USER_PROJECT_ROOT/node_modules/@nativescript/core/platforms/android"
+def appPackageJsonFile = file("$USER_PROJECT_ROOT/package.json")
+if (appPackageJsonFile.exists()) {
+    def appPackageJson = new JsonSlurper().parseText(appPackageJsonFile.text)
+    if (appPackageJson.dependencies['@akylas/nativescript'] != null) {
+        widgetsDir = "$USER_PROJECT_ROOT/node_modules/@akylas/nativescript/platforms/android"
     }
-    implementation "androidx.annotation:annotation:1.1.0"
 }
-repositories {
+
+dependencies {
+    implementation "androidx.annotation:annotation:1.1.0"
+
     if (project.hasProperty("tempBuild")) {
-        def widgetsDir = "$USER_PROJECT_ROOT/node_modules/@nativescript/core/platforms/android"
-        def appPackageJsonFile = file("$USER_PROJECT_ROOT/package.json")
-        if (appPackageJsonFile.exists()) {
-            def appPackageJson = new JsonSlurper().parseText(appPackageJsonFile.text)
-            if (appPackageJson.dependencies['@akylas/nativescript'] != null) {
-                widgetsDir = "$USER_PROJECT_ROOT/node_modules/@akylas/nativescript/platforms/android"
-            }
+        // if ui-mobile-base is provided as source the name is nativescript.aar
+        if (file("$widgetsDir/nativescript.aar").exists()) {
+            implementation(name:'nativescript', ext:'aar')
         }
-        flatDir {
-            dirs "$widgetsDir"
+        // if ui-mobile-base is provided as aar the name is widget-release.aar
+        if (file("$widgetsDir/widget-release.aar").exists()) {
+            implementation(name:'widget-release', ext:'aar')
         }
     }
-}
+}
+repositories {
+    flatDir {
+        dirs "$widgetsDir"
+    }
+}