Merge remote-tracking branch 'origin/master'

Author: farfromrefug

CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.37](https://github.com/nativescript-community/gesturehandler/compare/v2.0.36...v2.0.37) (2025-10-08)
+
+### Bug Fixes
+
+* build fix for official N cli ([8a8dcfa](https://github.com/nativescript-community/gesturehandler/commit/8a8dcfa2b1784e19955f891c12384f3d54ef01f4))
+
+## [2.0.36](https://github.com/nativescript-community/gesturehandler/compare/v2.0.34...v2.0.36) (2025-10-06)
+
+**Note:** Version bump only for package gesturehandler
+
 ## [2.0.34](https://github.com/nativescript-community/gesturehandler/compare/v2.0.33...v2.0.34) (2025-09-05)
 
 **Note:** Version bump only for package gesturehandler

lerna.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.0.35",
+    "version": "2.0.37",
     "$schema": "node_modules/@lerna-lite/cli/schemas/lerna-schema.json",
     "packages": [
         "packages/*"

packages/gesturehandler/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.37](https://github.com/nativescript-community/gesturehandler/compare/v2.0.36...v2.0.37) (2025-10-08)
+
+### Bug Fixes
+
+* build fix for official N cli ([8a8dcfa](https://github.com/nativescript-community/gesturehandler/commit/8a8dcfa2b1784e19955f891c12384f3d54ef01f4))
+
+## [2.0.36](https://github.com/nativescript-community/gesturehandler/compare/v2.0.34...v2.0.36) (2025-10-06)
+
+**Note:** Version bump only for package @nativescript-community/gesturehandler
+
 ## [2.0.34](https://github.com/nativescript-community/gesturehandler/compare/v2.0.33...v2.0.34) (2025-09-05)
 
 **Note:** Version bump only for package @nativescript-community/gesturehandler

packages/gesturehandler/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/gesturehandler",
-    "version": "2.0.34",
+    "version": "2.0.37",
     "description": "Declarative API exposing platform native touch and gesture system to NativeScript.",
     "main": "gesturehandler",
     "sideEffects": false,

packages/gesturehandler/platforms/android/include.gradle

@@ -1,32 +1,45 @@
 import groovy.json.JsonSlurper
 
-// 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"
-    }
-}
-
 dependencies {
     implementation "androidx.annotation:annotation:1.1.0"
 
     if (project.hasProperty("tempBuild")) {
+        // we need to copy the code in both places as N main gradle system does not support top level code
+        // 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"
+            }
+        }
+
         // if ui-mobile-base is provided as source the name is nativescript.aar
-        if (file("$widgetsDir/nativescript.aar").exists()) {
+	  	//else use widget-release.aar
+      	if (file("$widgetsDir/widgets-release.aar").exists()) {
+            implementation(name:'widgets-release', ext:'aar')
+        } else {
             implementation(name:'nativescript', ext:'aar')
         }
-        // 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"
-    }
+	if (project.hasProperty("tempBuild")) {
+	    // we need to copy the code in both places as N main gradle system does not support top level code
+	    // 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"
+	        }
+	    }
+	    flatDir {
+	        dirs "$widgetsDir"
+	    }
+	}
 }