Merge branch 'main' of github.com:NativeScript/nativescript-cli

# Conflicts:
#	lib/controllers/platform-controller.ts
#	lib/declarations.d.ts
#	lib/options.ts
#	lib/project-data.ts
#	lib/services/android-plugin-build-service.ts
#	lib/services/android/gradle-build-args-service.ts
#	test/services/android/gradle-build-args-service.ts
#	vendor/gradle-plugin/build.gradle
#	vendor/gradle-plugin/settings.gradle

Author: farfromrefug

CHANGELOG.md

@@ -1,3 +1,46 @@
+## [8.8.2](https://github.com/NativeScript/nativescript-cli/compare/v8.8.1...v8.8.2) (2024-08-28)
+
+
+### Bug Fixes
+
+* don't quote executable in windows ([823565e](https://github.com/NativeScript/nativescript-cli/commit/823565e95102343449bc687387d43a5f223390b1))
+* typings  path separator on windows ([#5812](https://github.com/NativeScript/nativescript-cli/issues/5812)) ([25c3d67](https://github.com/NativeScript/nativescript-cli/commit/25c3d67ff92980b45326a4cc5043561bba393598))
+
+
+
+## [8.8.1](https://github.com/NativeScript/nativescript-cli/compare/v8.8.0...v8.8.1) (2024-08-19)
+
+
+### Bug Fixes
+
+* quote windows command line arguments ([#5808](https://github.com/NativeScript/nativescript-cli/issues/5808)) ([bf9a6cd](https://github.com/NativeScript/nativescript-cli/commit/bf9a6cdbed227c876b8a94a13e3517e684dad924))
+
+
+### Features
+
+* add android 35 support ([#5811](https://github.com/NativeScript/nativescript-cli/issues/5811)) ([abc7ab4](https://github.com/NativeScript/nativescript-cli/commit/abc7ab474024bda566374271e0497f4c73d78b4d))
+
+
+
+# [8.8.0](https://github.com/NativeScript/nativescript-cli/compare/v8.7.2...v8.8.0) (2024-07-11)
+
+
+### Bug Fixes
+
+* `ns config set` failure with prettier plugins ([67e68c6](https://github.com/NativeScript/nativescript-cli/commit/67e68c64aec9fcf180cbb91bcc1bfb1ee897094b))
+* **android:** use more accurate PID detection on restart ([#5804](https://github.com/NativeScript/nativescript-cli/issues/5804)) ([6509773](https://github.com/NativeScript/nativescript-cli/commit/650977342c67056a1ac3138d3810739cab95d5d5))
+
+
+### Features
+
+* ability to embed NativeScript into host Swift and Kotlin projects ([#5803](https://github.com/NativeScript/nativescript-cli/issues/5803)) ([42177c3](https://github.com/NativeScript/nativescript-cli/commit/42177c31bd034b6106500259b264db6347c5e21e))
+* add support for custom platform 'projectName' from nativescript.config ([#2107](https://github.com/NativeScript/nativescript-cli/issues/2107)) ([#5801](https://github.com/NativeScript/nativescript-cli/issues/5801)) ([32f8fc5](https://github.com/NativeScript/nativescript-cli/commit/32f8fc5332cfe8deda9606346906a4fa179fe78d))
+* gradle 8, kotlin 2 & updated bundletool ([#5799](https://github.com/NativeScript/nativescript-cli/issues/5799)) ([29acc76](https://github.com/NativeScript/nativescript-cli/commit/29acc76479646c1150440f9a4d0defa19faa74f0))
+* migrate 8.8 and associated depedencies ([#5807](https://github.com/NativeScript/nativescript-cli/issues/5807)) ([9e9773f](https://github.com/NativeScript/nativescript-cli/commit/9e9773f481991e30ac9c0aaf7a3a5dcc947fc801))
+* native add command to add native source files to the project ([#5806](https://github.com/NativeScript/nativescript-cli/issues/5806)) ([2f2d1e0](https://github.com/NativeScript/nativescript-cli/commit/2f2d1e0bfa5e3e41bba653de2393e9a2c169bd38))
+
+
+
 ## [8.7.2](https://github.com/NativeScript/nativescript-cli/compare/v8.7.1...v8.7.2) (2024-05-28)
 
 ### Bug Fixes

docs/man_pages/project/configuration/native/native-add-java.md

@@ -0,0 +1,32 @@
+<% if (isJekyll) { %>---
+title: ns native add java
+position: 2
+---<% } %>
+
+# ns native add java
+
+### Description
+
+Adds a newly generated Java file, which includes a class with the specified name, placing it in the appropriate directory.
+
+### Commands
+
+Usage | Synopsis
+------|-------
+Java | `$ ns native add java <Java class name>`
+
+### Arguments
+
+* `<Java class name>` is the fully qualified name of the `Class` to create, e.g. `org.nativescript.SomeClass`
+
+<% if(isHtml) { %>
+
+### Related Commands
+
+Command | Description
+----------|----------
+[native add swift](native-add-swift.html) | Generates and adds a Swift file containing a class of the given name.
+[native add objective-c](native-add-objective-c.html) | Generates and adds Objective-C files containing an interface of the given name.
+[native add java](native-add-java.html) | Generates and adds a Java file containing a class of the given name.
+[native add kotlin](native-add-kotlin.html) | Generates and adds a Kotlin file containing a class of the given name.
+<% } %>

docs/man_pages/project/configuration/native/native-add-kotlin.md

@@ -0,0 +1,34 @@
+<% if (isJekyll) { %>---
+title: ns native add kotlin
+position: 3
+---<% } %>
+
+# ns native add kotlin
+
+### Description
+
+Adds a newly generated Kotlin file, which includes a class with the specified name, placing it in the appropriate directory.
+
+Kotlin usage requires that the `useKotlin` property is set in `gradle.properties`, the command will set this to `true`.
+
+### Commands
+
+Usage | Synopsis
+------|-------
+Kotlin | `$ ns native add kotlin <Kotlin class name>`
+
+### Arguments
+
+* `<Kotlin class name>` is the fully qualified name of the `Class` to create, e.g. `org.nativescript.SomeClass`
+
+<% if(isHtml) { %>
+
+### Related Commands
+
+Command | Description
+----------|----------
+[native add swift](native-add-swift.html) | Generates and adds a Swift file containing a class of the given name.
+[native add objective-c](native-add-objective-c.html) | Generates and adds Objective-C files containing an interface of the given name.
+[native add java](native-add-java.html) | Generates and adds a Java file containing a class of the given name.
+[native add kotlin](native-add-kotlin.html) | Generates and adds a Kotlin file containing a class of the given name.
+<% } %>

docs/man_pages/project/configuration/native/native-add-objective-c.md

@@ -0,0 +1,34 @@
+<% if (isJekyll) { %>---
+title: ns native add objective-c
+position: 4
+---<% } %>
+
+# ns native add objective-c
+
+### Description
+
+Adds newly generated Objective-C files, which include an interface with the specified name, placing them in the appropriate directory.
+
+Objective-C usage requires that the `module.modulemap` is modified to include the header file, the command will set this entry.
+
+### Commands
+
+Usage | Synopsis
+------|-------
+Objective-C | `$ ns native add objective-c <Objective-C interface name>`
+
+### Arguments
+
+* `<Objective-C interface name>` is the name of the `interface` to create, e.g. `SomeInterface`
+
+<% if(isHtml) { %>
+
+### Related Commands
+
+Command | Description
+----------|----------
+[native add swift](native-add-swift.html) | Generates and adds a Swift file containing a class of the given name.
+[native add objective-c](native-add-objective-c.html) | Generates and adds Objective-C files containing an interface of the given name.
+[native add java](native-add-java.html) | Generates and adds a Java file containing a class of the given name.
+[native add kotlin](native-add-kotlin.html) | Generates and adds a Kotlin file containing a class of the given name.
+<% } %>

docs/man_pages/project/configuration/native/native-add-swift.md

@@ -0,0 +1,32 @@
+<% if (isJekyll) { %>---
+title: ns native add swift
+position: 5
+---<% } %>
+
+# ns native add swift
+
+### Description
+
+Adds a newly generated Swift file, which includes a class with the specified name, placing it in the appropriate directory.
+
+### Commands
+
+Usage | Synopsis
+------|-------
+Swift | `$ ns native add swift <Swift class name>`
+
+### Arguments
+
+* `<Swift class name>` is the name of the `Class` to create, e.g. `SomeClass`
+
+<% if(isHtml) { %>
+
+### Related Commands
+
+Command | Description
+----------|----------
+[native add swift](native-add-swift.html) | Generates and adds a Swift file containing a class of the given name.
+[native add objective-c](native-add-objective-c.html) | Generates and adds Objective-C files containing an interface of the given name.
+[native add java](native-add-java.html) | Generates and adds a Java file containing a class of the given name.
+[native add kotlin](native-add-kotlin.html) | Generates and adds a Kotlin file containing a class of the given name.
+<% } %>

docs/man_pages/project/configuration/native/native-add.md

@@ -0,0 +1,31 @@
+<% if (isJekyll) { %>---
+title: ns native add
+position: 1
+---<% } %>
+
+# ns native add
+
+### Description
+
+Commands to add native files to the application placing them in the correct directory.
+
+### Commands
+
+Usage | Synopsis
+------|-------
+Swift | `$ ns native add swift <Swift class name>`
+Objective-C | `$ ns native add objective-c <Objective-C interface name>`
+Java | `$ ns native add java <Java class name>`
+Kotlin | `$ ns native add kotlin <Kotlin class name>`
+
+<% if(isHtml) { %>
+
+### Related Commands
+
+Command | Description
+----------|----------
+[native add swift](native-add-swift.html) | Generates and adds a Swift file containing a class of the given name.
+[native add objective-c](native-add-objective-c.html) | Generates and adds Objective-C files containing an interface of the given name.
+[native add java](native-add-java.html) | Generates and adds a Java file containing a class of the given name.
+[native add kotlin](native-add-kotlin.html) | Generates and adds a Kotlin file containing a class of the given name.
+<% } %>

docs/man_pages/project/configuration/native/native.md

@@ -0,0 +1,31 @@
+<% if (isJekyll) { %>---
+title: ns native
+position: 1
+---<% } %>
+
+# ns native
+
+### Description
+
+Commands to add native files to the application placing them in the correct directory.
+
+### Commands
+
+Usage | Synopsis
+------|-------
+Swift | `$ ns native add swift <Swift class name>`
+Objective-C | `$ ns native add objective-c <Objective-C interface name>`
+Java | `$ ns native add java <Java class name>`
+Kotlin | `$ ns native add kotlin <Kotlin class name>`
+
+<% if(isHtml) { %>
+
+### Related Commands
+
+Command | Description
+----------|----------
+[native add swift](native-add-swift.html) | Generates and adds a Swift file containing a class of the given name.
+[native add objective-c](native-add-objective-c.html) | Generates and adds Objective-C files containing an interface of the given name.
+[native add java](native-add-java.html) | Generates and adds a Java file containing a class of the given name.
+[native add kotlin](native-add-kotlin.html) | Generates and adds a Kotlin file containing a class of the given name.
+<% } %>

lib/bootstrap.ts

@@ -199,6 +199,8 @@ injector.requireCommand("build|vision", "./commands/build");
 injector.requireCommand("build|visionos", "./commands/build");
 injector.requireCommand("deploy", "./commands/deploy");
 
+injector.requireCommand("embed", "./commands/embedding/embed");
+
 injector.require("testExecutionService", "./services/test-execution-service");
 injector.requireCommand("dev-test|android", "./commands/test");
 injector.requireCommand("dev-test|ios", "./commands/test");
@@ -458,5 +460,14 @@ injector.require("keyCommandHelper", "./helpers/key-command-helper");
 
 injector.requireCommand("start", "./commands/start");
 injector.require("startService", "./services/start-service");
-
+injector.requireCommand(
+	[
+		"native|add",
+		"native|add|java",
+		"native|add|kotlin",
+		"native|add|swift",
+		"native|add|objective-c",
+	],
+	"./commands/native-add"
+);
 require("./key-commands/bootstrap");

lib/commands/add-platform.ts

@@ -12,7 +12,8 @@ import { injector } from "../common/yok";
 
 export class AddPlatformCommand
 	extends ValidatePlatformCommandBase
-	implements ICommand {
+	implements ICommand
+{
 	public allowedParameters: ICommandParameter[] = [];
 
 	constructor(