nativescript 9.0.7 → 9.0.8-sap.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/config/test-deps-versions-generated.json +1 -1
  2. package/lib/android-tools-info.js +13 -1
  3. package/lib/common/mobile/emulator-helper.js +4 -0
  4. package/package.json +2 -2
package/config/test-deps-versions-generated.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "karma": "6.4.4",
4
4
  "karma-coverage": "2.2.1",
5
5
  "karma-nativescript-launcher": "1.0.0",
6
- "mocha": "11.8.0",
6
+ "mocha": "12.0.0",
7
7
  "karma-mocha": "2.0.1",
8
8
  "karma-chai": "0.1.0",
9
9
  "karma-jasmine": "4.0.2",
package/lib/android-tools-info.js CHANGED
@@ -109,7 +109,19 @@ class AndroidToolsInfo {
109
109
  const userSpecifiedCompileSdk = this.$options.compileSdk;
110
110
  if (userSpecifiedCompileSdk) {
111
111
  const androidCompileSdk = `${doctor_1.androidToolsInfo.ANDROID_TARGET_PREFIX}-${userSpecifiedCompileSdk}`;
112
- if (!_.includes(installedTargets, androidCompileSdk)) {
112
+ // SDK platforms newer than android-36 may install into directories named
113
+ // "android-<api>.<minor>" (e.g. "android-37.0") with no plain
114
+ // "android-<api>" directory, so installed targets are matched on their
115
+ // API level rather than the exact directory name.
116
+ const isTargetInstalled = _.some(installedTargets, (target) => {
117
+ if (target === androidCompileSdk) {
118
+ return true;
119
+ }
120
+ const targetMatch = target.match(/^android-(\d+)(?:\.\d+)?$/);
121
+ return (targetMatch &&
122
+ parseInt(targetMatch[1], 10) === userSpecifiedCompileSdk);
123
+ });
124
+ if (!isTargetInstalled) {
113
125
  this.$errors.fail(`You have specified '${userSpecifiedCompileSdk}' for compile sdk, but it is not installed on your system.`);
114
126
  }
115
127
  return userSpecifiedCompileSdk;
package/lib/common/mobile/emulator-helper.js CHANGED
@@ -8,7 +8,11 @@ class EmulatorHelper {
8
8
  constructor() {
9
9
  // https://developer.android.com/guide/topics/manifest/uses-sdk-element
10
10
  this.mapAndroidApiLevelToVersion = {
11
+ "android-37": "17.0.0",
12
+ "android-37.0": "17.0.0",
13
+ "android-37.1": "17.0.0",
11
14
  "android-36": "16.0.0",
15
+ "android-36.1": "16.0.0",
12
16
  "android-35": "15.0.0",
13
17
  "android-34": "14.0.0",
14
18
  "android-33": "13.0.0",
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "nativescript",
3
3
  "main": "./lib/nativescript-cli-lib.js",
4
- "version": "9.0.7",
4
+ "version": "9.0.8-sap.0",
5
5
  "author": "NativeScript <oss@nativescript.org>",
6
6
  "description": "Command-line interface for building NativeScript projects",
7
7
  "bin": {
@@ -55,7 +55,7 @@
55
55
  ],
56
56
  "dependencies": {
57
57
  "@foxt/js-srp": "0.0.3-patch2",
58
- "@nativescript/doctor": "2.0.17",
58
+ "@nativescript/doctor": "2.0.18",
59
59
  "@nativescript/hook": "3.0.5",
60
60
  "@npmcli/arborist": "9.1.8",
61
61
  "@nstudio/trapezedev-project": "7.2.3",