nativescript 8.8.0-embed.0 → 8.8.0-embed.2

package/lib/services/project-changes-service.js

@@ -131,7 +131,7 @@ class ProjectChangesService {
         return prepareInfoFilePath;
     }
     getPrepareInfo(platformData) {
-        if (this.$options.nativeHost) {
+        if (this.$options.hostProjectPath) {
             return null;
         }
         const prepareInfoFilePath = this.getPrepareInfoFilePath(platformData);
@@ -151,7 +151,7 @@ class ProjectChangesService {
             if (!this._prepareInfo) {
                 yield this.ensurePrepareInfo(platformData, projectData, prepareData);
             }
-            if (this.$options.nativeHost) {
+            if (this.$options.hostProjectPath) {
                 return null;
             }
             const prepareInfoFilePath = this.getPrepareInfoFilePath(platformData);

package/lib/services/project-config-service.js

@@ -195,7 +195,7 @@ export default {
                     singleQuote: true,
                 };
                 this.$logger.trace("updating config, prettier options: ", prettierOptions);
-                this.$fs.writeFile(configFilePath, (0, prettier_1.format)(newContent, Object.assign(Object.assign({}, prettierOptions), { parser: "typescript" })));
+                this.$fs.writeFile(configFilePath, (0, prettier_1.format)(newContent, Object.assign(Object.assign({}, prettierOptions), { parser: "typescript", plugins: [] })));
             }
             catch (error) {
                 this.$logger.error(`Failed to update config.` + error);

package/lib/services/webpack/webpack-compiler-service.js

@@ -94,8 +94,8 @@ class WebpackCompilerService extends events_1.EventEmitter {
                                     hash: "",
                                 };
                             }
-                            const files = result.emittedFiles.map((file) => path.join(platformData.appDestinationDirectoryPath, this.$options.nativeHostModule, file));
-                            const fallbackFiles = result.fallbackFiles.map((file) => path.join(platformData.appDestinationDirectoryPath, this.$options.nativeHostModule, file));
+                            const files = result.emittedFiles.map((file) => path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName, file));
+                            const fallbackFiles = result.fallbackFiles.map((file) => path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName, file));
                             const data = {
                                 files,
                                 hasOnlyHotUpdateFiles: files.every((f) => f.indexOf("hot-update") > -1),
@@ -218,11 +218,11 @@ class WebpackCompilerService extends events_1.EventEmitter {
                 cwd: projectData.projectDir,
                 stdio,
             };
-            if (this.$options.nativeHost) {
+            if (this.$options.hostProjectPath) {
                 options.env = {
-                    USER_PROJECT_PLATFORMS_ANDROID: this.$options.nativeHost,
-                    USER_PROJECT_PLATFORMS_ANDROID_MODULE: this.$options.nativeHostModule,
-                    USER_PROJECT_PLATFORMS_IOS: this.$options.nativeHost,
+                    USER_PROJECT_PLATFORMS_ANDROID: this.$options.hostProjectPath,
+                    USER_PROJECT_PLATFORMS_ANDROID_MODULE: this.$options.hostProjectModuleName,
+                    USER_PROJECT_PLATFORMS_IOS: this.$options.hostProjectPath,
                 };
             }
             const childProcess = this.$childProcess.spawn(process.execPath, args, options);
@@ -345,8 +345,8 @@ class WebpackCompilerService extends events_1.EventEmitter {
             return;
         }
         this.$logger.trace("Webpack build done!");
-        const files = message.data.emittedAssets.map((asset) => path.join(platformData.appDestinationDirectoryPath, this.$options.nativeHostModule, asset));
-        const staleFiles = message.data.staleAssets.map((asset) => path.join(platformData.appDestinationDirectoryPath, this.$options.nativeHostModule, asset));
+        const files = message.data.emittedAssets.map((asset) => path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName, asset));
+        const staleFiles = message.data.staleAssets.map((asset) => path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName, asset));
         const lastHash = (() => {
             const absoluteFileNameWithLastHash = files.find((fileName) => fileName.endsWith("hot-update.js"));
             if (!absoluteFileNameWithLastHash) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "main": "./lib/nativescript-cli-lib.js",
-  "version": "8.8.0-embed.0",
+  "version": "8.8.0-embed.2",
   "author": "NativeScript <support@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {

package/vendor/aab-tool/README.txt

@@ -1 +1 @@
-Downloaded from https://github.com/google/bundletool/releases/tag/1.8.2
+Downloaded from https://github.com/google/bundletool/releases/tag/1.15.6

package/vendor/gradle-plugin/build.gradle

@@ -30,11 +30,11 @@ buildscript {
     def getDepPlatformDir = { dep ->
         file("${project.ext.USER_PROJECT_PLATFORMS_ANDROID}/${dep.directory}/$PLATFORMS_ANDROID")
     }
-    def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "1.8.20" }
+    def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "2.0.0" }
     def kotlinVersion = computeKotlinVersion()
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:{{runtimeAndroidPluginVersion}}'
@@ -150,7 +150,6 @@ allprojects {
             url 'https://maven.google.com/'
             name 'Google'
         }
-        jcenter()
         if (pluginDependencies.size() > 0) {
             flatDir {
                 dirs pluginDependencies
@@ -160,13 +159,29 @@ allprojects {
 }
 
 
-def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : 31 }
-def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : 31 as int }
+def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : 34 }
+def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : 34 as int }
 def computeBuildToolsVersion = { ->
-    project.hasProperty("buildToolsVersion") ? buildToolsVersion : "31.0.0"
+    project.hasProperty("buildToolsVersion") ? buildToolsVersion : "34.0.0"
 }
 
 android {
+    namespace "{{pluginNamespace}}"
+
+    kotlinOptions {
+        jvmTarget = '17'
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+
+    if (project.hasProperty("ndkVersion")) {
+        ndkVersion project.ndkVersion
+    }
+
     def applyPluginGradleConfigurations = { ->
         nativescriptDependencies.each { dep ->
             def includeGradlePath = "${getDepPlatformDir(dep)}/include.gradle"
@@ -220,15 +235,6 @@ task addDependenciesFromNativeScriptPlugins {
     }
 }
 
-afterEvaluate {
-    def generateBuildConfig =  project.hasProperty("generateBuildConfig") ? project.generateBuildConfig : false
-    def generateR =  project.hasProperty("generateR") ? project.generateR : false
-    generateReleaseBuildConfig.enabled = generateBuildConfig
-    generateDebugBuildConfig.enabled = generateBuildConfig
-    generateReleaseResValues.enabled = generateR
-    generateDebugResValues.enabled = generateR
-}
-
 tasks.whenTaskAdded({ DefaultTask currentTask ->
     if (currentTask.name == 'bundleRelease' || currentTask.name == 'bundleDebug') {
         def generateBuildConfig =  project.hasProperty("generateBuildConfig") ? project.generateBuildConfig : false

package/vendor/gradle-plugin/settings.gradle

@@ -12,8 +12,6 @@ if (USER_PROJECT_PLATFORMS_ANDROID_FROM_ENV != null && !USER_PROJECT_PLATFORMS_A
     USER_PROJECT_PLATFORMS_ANDROID = "$rootDir/../../../platforms/android"
 }
 
-System.out.println("!!!!! VM: USER_PROJECT_PLATFORMS_ANDROID: " + USER_PROJECT_PLATFORMS_ANDROID);
-
 def dependenciesJson = file("${USER_PROJECT_PLATFORMS_ANDROID}/dependencies.json")
 def appDependencies = new JsonSlurper().parseText(dependenciesJson.text)
 def pluginData = appDependencies.find { it.name == PLUGIN_NAME }