nativescript 8.3.3 → 8.4.0

package/config/test-dependencies.json

@@ -25,7 +25,8 @@
     },
     {
         "name": "karma-jasmine",
-        "framework": "jasmine"
+        "framework": "jasmine",
+        "version": "4.0.2"
     },
     {
         "name": "karma-qunit",

package/config/test-deps-versions-generated.json

@@ -1 +1 @@
-{"@jsdevtools/coverage-istanbul-loader":"3.0.5","karma":"6.4.0","karma-coverage":"2.2.0","karma-nativescript-launcher":"0.4.0","mocha":"10.0.0","karma-mocha":"2.0.1","karma-chai":"0.1.0","karma-jasmine":"5.1.0","karma-qunit":"4.1.2","@types/karma-chai":"0.1.3","@types/mocha":"9.1.1","@types/jasmine":"4.0.3","@types/qunit":"2.19.2","nyc":"15.1.0"}
+{"@jsdevtools/coverage-istanbul-loader":"3.0.5","karma":"6.4.1","karma-coverage":"2.2.0","karma-nativescript-launcher":"0.4.0","mocha":"10.1.0","karma-mocha":"2.0.1","karma-chai":"0.1.0","karma-jasmine":"4.0.2","karma-qunit":"4.1.2","@types/karma-chai":"0.1.3","@types/mocha":"10.0.1","@types/jasmine":"4.3.0","@types/qunit":"2.19.3","nyc":"15.1.0"}

package/lib/controllers/migrate-controller.js

@@ -47,7 +47,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
             {
                 packageName: "@nativescript/core",
                 minVersion: "6.5.0",
-                desiredVersion: "~8.3.0",
+                desiredVersion: "~8.4.0",
                 shouldAddIfMissing: true,
             },
             {
@@ -57,7 +57,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
             {
                 packageName: "@nativescript/types",
                 minVersion: "7.0.0",
-                desiredVersion: "~8.3.0",
+                desiredVersion: "~8.4.0",
                 isDev: true,
             },
             {
@@ -92,7 +92,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
             {
                 packageName: "nativescript-vue",
                 minVersion: "2.7.0",
-                desiredVersion: "~2.9.1",
+                desiredVersion: "~2.9.2",
                 shouldMigrateAction(dependency, projectData, loose) {
                     return __awaiter(this, void 0, void 0, function* () {
                         if (!this.hasDependency(dependency, projectData)) {
@@ -111,7 +111,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
             {
                 packageName: "@nativescript/angular",
                 minVersion: "10.0.0",
-                desiredVersion: "^14.0.0",
+                desiredVersion: "~14.2.0",
                 shouldMigrateAction(dependency, projectData, loose) {
                     return __awaiter(this, void 0, void 0, function* () {
                         if (!this.hasDependency(dependency, projectData)) {
@@ -166,7 +166,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
                 packageName: "typescript",
                 isDev: true,
                 minVersion: "3.7.0",
-                desiredVersion: "~4.5.5",
+                desiredVersion: "~4.8.4",
             },
             {
                 packageName: "node-sass",
@@ -195,13 +195,13 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
             {
                 packageName: "@nativescript/ios",
                 minVersion: "6.5.3",
-                desiredVersion: "~8.3.0",
+                desiredVersion: "~8.4.0",
                 isDev: true,
             },
             {
                 packageName: "@nativescript/android",
                 minVersion: "7.0.0",
-                desiredVersion: "~8.3.0",
+                desiredVersion: "~8.4.0",
                 isDev: true,
             },
         ];
@@ -780,7 +780,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
     migrateNativeScriptAngular() {
         return __awaiter(this, void 0, void 0, function* () {
             const minVersion = "10.0.0";
-            const desiredVersion = "~14.1.0";
+            const desiredVersion = "~14.2.0";
             const dependencies = [
                 {
                     packageName: "@angular/animations",
@@ -876,7 +876,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
                 {
                     packageName: "nativescript-vue-template-compiler",
                     minVersion: "2.7.0",
-                    desiredVersion: "~2.9.1",
+                    desiredVersion: "~2.9.2",
                     isDev: true,
                     shouldAddIfMissing: true,
                 },

package/lib/services/android-plugin-build-service.js

@@ -251,12 +251,14 @@ class AndroidPluginBuildService {
             const gradleTemplatePath = path.resolve(path.join(__dirname, "../../vendor/gradle-plugin"));
             const allGradleTemplateFiles = path.join(gradleTemplatePath, "*");
             const buildGradlePath = path.join(pluginTempDir, "build.gradle");
+            const settingsGradlePath = path.join(pluginTempDir, "settings.gradle");
             this.$fs.copyFile(allGradleTemplateFiles, pluginTempDir);
             this.addCompileDependencies(platformsAndroidDirPath, buildGradlePath);
             const runtimeGradleVersions = yield this.getRuntimeGradleVersions(projectDir);
             this.replaceGradleVersion(pluginTempDir, runtimeGradleVersions.gradleVersion);
             this.replaceGradleAndroidPluginVersion(buildGradlePath, runtimeGradleVersions.gradleAndroidPluginVersion);
             this.replaceFileContent(buildGradlePath, "{{pluginName}}", pluginName);
+            this.replaceFileContent(settingsGradlePath, "{{pluginName}}", pluginName);
         });
     }
     getRuntimeGradleVersions(projectDir) {
@@ -449,6 +451,7 @@ class AndroidPluginBuildService {
                 "-p",
                 pluginBuildSettings.pluginDir,
                 "assembleRelease",
+                `-PtempBuild=true`,
                 `-PcompileSdk=android-${pluginBuildSettings.androidToolsInfo.compileSdkVersion}`,
                 `-PbuildToolsVersion=${pluginBuildSettings.androidToolsInfo.buildToolsVersion}`,
                 `-PappPath=${this.$projectData.getAppDirectoryPath()}`,

package/lib/services/cocoapods-service.js

@@ -17,7 +17,7 @@ const constants_1 = require("../constants");
 const helpers_1 = require("../common/helpers");
 const yok_1 = require("../common/yok");
 class CocoaPodsService {
-    constructor($cocoaPodsPlatformManager, $fs, $childProcess, $errors, $logger, $config, $xcconfigService) {
+    constructor($cocoaPodsPlatformManager, $fs, $childProcess, $errors, $logger, $config, $xcconfigService, $xcodeSelectService) {
         this.$cocoaPodsPlatformManager = $cocoaPodsPlatformManager;
         this.$fs = $fs;
         this.$childProcess = $childProcess;
@@ -25,6 +25,7 @@ class CocoaPodsService {
         this.$logger = $logger;
         this.$config = $config;
         this.$xcconfigService = $xcconfigService;
+        this.$xcodeSelectService = $xcodeSelectService;
         this.getCocoaPodsFromPodfile = _.memoize(this._getCocoaPodsFromPodfile, helpers_1.getHash);
     }
     getPodfileHeader(targetName) {
@@ -93,6 +94,10 @@ ${versionResolutionHint}`);
     }
     applyPodfileArchExclusions(projectData, platformData) {
         return __awaiter(this, void 0, void 0, function* () {
+            const xcodeVersionData = yield this.$xcodeSelectService.getXcodeVersion();
+            if (+xcodeVersionData.major !== 12) {
+                return;
+            }
             const { projectRoot } = platformData;
             const exclusionsPodfile = path.join(projectRoot, "Podfile-exclusions");
             if (!this.$fs.exists(exclusionsPodfile)) {

package/lib/services/platform-environment-requirements.js

@@ -74,8 +74,9 @@ class PlatformEnvironmentRequirements {
             win32: "windows",
             darwin: "macos",
         }[process.platform];
+        const anchor = platform ? `#${os}-${platform.toLowerCase()}` : '';
         return (`Verify that your environment is configured according to the system requirements described at\n` +
-            `https://docs.nativescript.org/environment-setup.html#${os}-${platform.toLowerCase()}.`);
+            `https://docs.nativescript.org/environment-setup.html${anchor}.`);
     }
 }
 PlatformEnvironmentRequirements.MISSING_LOCAL_SETUP_MESSAGE = "Your environment is not configured properly and you will not be able to execute local builds.";

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

@@ -334,11 +334,12 @@ class WebpackCompilerService extends events_1.EventEmitter {
         const files = message.data.emittedAssets.map((asset) => path.join(platformData.appDestinationDirectoryPath, "app", asset));
         const staleFiles = message.data.staleAssets.map((asset) => path.join(platformData.appDestinationDirectoryPath, "app", asset));
         const lastHash = (() => {
-            const fileWithLastHash = files.find((fileName) => fileName.endsWith("hot-update.js"));
-            if (!fileWithLastHash) {
+            const absoluteFileNameWithLastHash = files.find((fileName) => fileName.endsWith("hot-update.js"));
+            if (!absoluteFileNameWithLastHash) {
                 return null;
             }
-            const matches = fileWithLastHash.match(/\.(.+).hot-update\.js/);
+            const fileNameWithLastHash = path.basename(absoluteFileNameWithLastHash);
+            const matches = fileNameWithLastHash.match(/\.(.+).hot-update\.js/);
             if (matches) {
                 return matches[1];
             }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "8.3.3",
+  "version": "8.4.0",
   "author": "NativeScript <support@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {

package/vendor/gradle-plugin/build.gradle

@@ -146,6 +146,7 @@ allprojects {
 
 
 def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : 31 }
+def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : 31 as int }
 def computeBuildToolsVersion = { ->
     project.hasProperty("buildToolsVersion") ? buildToolsVersion : "31.0.0"
 }
@@ -166,7 +167,7 @@ android {
     buildToolsVersion computeBuildToolsVersion()
 
     defaultConfig {
-        targetSdkVersion 31
+        targetSdkVersion computeTargetSdkVersion()
         versionCode 1
         versionName "1.0"
     }

package/vendor/gradle-plugin/settings.gradle

@@ -1 +1,25 @@
+import groovy.json.JsonSlurper
 
+def USER_PROJECT_ROOT = "$rootDir/../../../"
+def PLATFORMS_ANDROID = "platforms/android"
+def PLUGIN_NAME = "{{pluginName}}"
+
+def dependenciesJson = file("${USER_PROJECT_ROOT}/${PLATFORMS_ANDROID}/dependencies.json")
+def appDependencies = new JsonSlurper().parseText(dependenciesJson.text)
+def pluginData = appDependencies.find { it.name == PLUGIN_NAME }
+def nativescriptDependencies = appDependencies.findAll{pluginData.name == it.name}
+
+def getDepPlatformDir = { dep ->
+        file("$USER_PROJECT_ROOT/$PLATFORMS_ANDROID/${dep.directory}/$PLATFORMS_ANDROID")
+}
+
+def applyIncludeSettingsGradlePlugin = {
+     nativescriptDependencies.each { dep ->
+            def includeSettingsGradlePath = "${getDepPlatformDir(dep)}/include-settings.gradle"
+            if (file(includeSettingsGradlePath).exists()) {
+                apply from: includeSettingsGradlePath
+            }
+    }
+}
+
+applyIncludeSettingsGradlePlugin()