nativescript 9.1.0-alpha.11 → 9.1.0-alpha.12

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

@@ -201,7 +201,10 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         };
     }
     async createProject(frameworkDir, frameworkVersion, projectData) {
-        if (semver.lt(frameworkVersion, AndroidProjectService.MIN_RUNTIME_VERSION_WITH_GRADLE)) {
+        var _a;
+        const packageName = ((_a = projectData.nsConfig.android) === null || _a === void 0 ? void 0 : _a.runtimePackageName) || constants.SCOPED_ANDROID_RUNTIME_NAME;
+        if (packageName === constants.SCOPED_ANDROID_RUNTIME_NAME &&
+            semver.lt(frameworkVersion, AndroidProjectService.MIN_RUNTIME_VERSION_WITH_GRADLE)) {
             this.$errors.fail(`The NativeScript CLI requires Android runtime ${AndroidProjectService.MIN_RUNTIME_VERSION_WITH_GRADLE} or later to work properly.`);
         }
         this.$fs.ensureDirectoryExists(this.getPlatformData(projectData).projectRoot);
@@ -288,7 +291,10 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         return null;
     }
     async updatePlatform(currentVersion, newVersion, canUpdate, projectData, addPlatform, removePlatforms) {
-        if (semver.eq(newVersion, AndroidProjectService.MIN_RUNTIME_VERSION_WITH_GRADLE)) {
+        var _a;
+        const packageName = ((_a = projectData.nsConfig.android) === null || _a === void 0 ? void 0 : _a.runtimePackageName) || constants.SCOPED_ANDROID_RUNTIME_NAME;
+        if (packageName === constants.SCOPED_ANDROID_RUNTIME_NAME &&
+            semver.eq(newVersion, AndroidProjectService.MIN_RUNTIME_VERSION_WITH_GRADLE)) {
             const platformLowercase = this.getPlatformData(projectData).normalizedPlatformName.toLowerCase();
             await removePlatforms([platformLowercase.split("@")[0]]);
             await addPlatform(platformLowercase);

package/lib/services/ios/spm-service.js

@@ -128,7 +128,7 @@ class SPMService {
         let lineBuffer = "";
         const render = () => {
             const elapsed = Math.round((Date.now() - startedAt) / 1000);
-            spinner.text = `${activity}… ${color_1.color.dim(`(${elapsed}s)`)}`;
+            spinner.text = `${activity}… ${color_1.color.dim(`(${this.formatElapsed(elapsed)})`)}`;
         };
         // keep the elapsed timer ticking even when xcodebuild is silent (e.g.
         // while a binary artifact downloads) so the user can see it's alive.
@@ -207,10 +207,10 @@ class SPMService {
             return "Downloading Swift Package binaries (first build only)";
         }
         if (/^Fetching\b/i.test(trimmed)) {
-            return `Fetching ${this.shortenPackageRef(trimmed)}`;
+            return this.describePackageActivity("Fetching", trimmed);
         }
         if (/^Cloning\b/i.test(trimmed)) {
-            return `Cloning ${this.shortenPackageRef(trimmed)}`;
+            return this.describePackageActivity("Cloning", trimmed);
         }
         if (/Computing version for/i.test(trimmed)) {
             return "Computing package versions";
@@ -223,17 +223,36 @@ class SPMService {
         }
         return null;
     }
-    /** Extracts a short, readable name from a SwiftPM repo URL/log line. */
+    /**
+     * Builds a stable, self-explanatory activity label with the package being
+     * worked on in parentheses, e.g. "Fetching Swift Packages (Auth0.swift)".
+     */
+    describePackageActivity(verb, line) {
+        const packageRef = this.shortenPackageRef(line);
+        return packageRef
+            ? `${verb} Swift Packages (${packageRef})`
+            : `${verb} Swift Packages`;
+    }
+    /**
+     * Extracts a short, readable name from a SwiftPM repo URL/log line, or null
+     * when the line contains no URL to name the package by.
+     */
     shortenPackageRef(line) {
         const match = line.match(/https?:\/\/\S+/);
         if (!match) {
-            return "Swift Packages";
+            return null;
         }
         return path
             .basename(match[0])
             .replace(/\.git$/, "")
             .replace(/[)\s].*$/, "");
     }
+    /** Formats an elapsed duration in whole seconds as "5m 15s". */
+    formatElapsed(totalSeconds) {
+        const minutes = Math.floor(totalSeconds / 60);
+        const seconds = totalSeconds % 60;
+        return `${minutes}m ${seconds}s`;
+    }
     /** True when the Xcode project references any Swift packages. */
     hasSPMReferences(platformData, projectData) {
         const pbxprojPath = path.join(platformData.projectRoot, `${projectData.projectName}.xcodeproj`, "project.pbxproj");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "main": "./lib/nativescript-cli-lib.js",
-  "version": "9.1.0-alpha.11",
+  "version": "9.1.0-alpha.12",
   "author": "NativeScript <oss@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {