nativescript 8.9.0-alpha.3 → 8.9.0-dev.1
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.
- package/config/test-deps-versions-generated.json +1 -1
- package/lib/android-tools-info.js +9 -20
- package/lib/base-package-manager.js +47 -64
- package/lib/bun-package-manager.js +65 -88
- package/lib/color.js +2 -2
- package/lib/commands/add-platform.js +14 -30
- package/lib/commands/apple-login.js +18 -29
- package/lib/commands/appstore-list.js +34 -45
- package/lib/commands/appstore-upload.js +52 -65
- package/lib/commands/build.js +55 -87
- package/lib/commands/clean.js +161 -176
- package/lib/commands/command-base.js +14 -27
- package/lib/commands/config.js +48 -67
- package/lib/commands/create-project.js +210 -229
- package/lib/commands/debug.js +66 -88
- package/lib/commands/deploy.js +28 -44
- package/lib/commands/embedding/embed.js +33 -52
- package/lib/commands/extensibility/install-extension.js +5 -16
- package/lib/commands/extensibility/list-extensions.js +13 -24
- package/lib/commands/extensibility/uninstall-extension.js +4 -15
- package/lib/commands/fonts.js +30 -41
- package/lib/commands/generate-assets.js +13 -28
- package/lib/commands/generate-help.js +2 -13
- package/lib/commands/generate.js +12 -60
- package/lib/commands/info.js +2 -13
- package/lib/commands/install.js +34 -49
- package/lib/commands/list-platforms.js +14 -25
- package/lib/commands/migrate.js +15 -26
- package/lib/commands/native-add.js +23 -46
- package/lib/commands/platform-clean.js +19 -32
- package/lib/commands/plugin/add-plugin.js +12 -25
- package/lib/commands/plugin/build-plugin.js +31 -44
- package/lib/commands/plugin/create-plugin.js +110 -133
- package/lib/commands/plugin/list-plugins.js +22 -33
- package/lib/commands/plugin/remove-plugin.js +20 -33
- package/lib/commands/plugin/update-plugin.js +20 -33
- package/lib/commands/post-install.js +20 -33
- package/lib/commands/prepare.js +19 -35
- package/lib/commands/preview.js +49 -62
- package/lib/commands/remove-platform.js +7 -18
- package/lib/commands/resources/resources-update.js +13 -26
- package/lib/commands/run.js +55 -76
- package/lib/commands/start.js +6 -19
- package/lib/commands/test-init.js +123 -134
- package/lib/commands/test.js +66 -89
- package/lib/commands/typings.js +126 -142
- package/lib/commands/update-platform.js +22 -35
- package/lib/commands/update.js +30 -43
- package/lib/common/child-process.js +53 -72
- package/lib/common/codeGeneration/code-entity.js +1 -1
- package/lib/common/codeGeneration/code-printer.js +1 -1
- package/lib/common/command-params.js +7 -18
- package/lib/common/commands/analytics.js +27 -40
- package/lib/common/commands/autocompletion.js +39 -56
- package/lib/common/commands/device/device-log-stream.js +12 -23
- package/lib/common/commands/device/get-file.js +22 -33
- package/lib/common/commands/device/list-applications.js +12 -23
- package/lib/common/commands/device/list-devices.js +72 -87
- package/lib/common/commands/device/list-files.js +23 -34
- package/lib/common/commands/device/put-file.js +22 -33
- package/lib/common/commands/device/run-application.js +12 -25
- package/lib/common/commands/device/stop-application.js +11 -22
- package/lib/common/commands/device/uninstall-application.js +6 -17
- package/lib/common/commands/generate-messages.js +17 -28
- package/lib/common/commands/help.js +20 -33
- package/lib/common/commands/package-manager-get.js +6 -17
- package/lib/common/commands/package-manager-set.js +9 -20
- package/lib/common/commands/post-install.js +2 -13
- package/lib/common/commands/preuninstall.js +23 -38
- package/lib/common/commands/proxy/proxy-base.js +8 -19
- package/lib/common/commands/proxy/proxy-clear.js +4 -15
- package/lib/common/commands/proxy/proxy-get.js +3 -14
- package/lib/common/commands/proxy/proxy-set.js +87 -100
- package/lib/common/constants.js +11 -11
- package/lib/common/decorators.js +10 -22
- package/lib/common/dispatchers.js +79 -96
- package/lib/common/errors.js +89 -104
- package/lib/common/file-system.js +108 -130
- package/lib/common/header.js +1 -2
- package/lib/common/helpers.js +149 -178
- package/lib/common/host-info.js +37 -50
- package/lib/common/http-client.js +93 -108
- package/lib/common/logger/appenders/cli-appender.js +1 -2
- package/lib/common/logger/appenders/emit-appender.js +1 -2
- package/lib/common/logger/layouts/cli-layout.js +1 -2
- package/lib/common/logger/logger.js +4 -4
- package/lib/common/mobile/android/android-application-manager.js +121 -142
- package/lib/common/mobile/android/android-debug-bridge-result-handler.js +1 -1
- package/lib/common/mobile/android/android-debug-bridge.js +87 -112
- package/lib/common/mobile/android/android-device-file-system.js +98 -131
- package/lib/common/mobile/android/android-device-hash-service.js +50 -75
- package/lib/common/mobile/android/android-device.js +68 -85
- package/lib/common/mobile/android/android-emulator-services.js +105 -130
- package/lib/common/mobile/android/android-ini-file-parser.js +8 -6
- package/lib/common/mobile/android/android-log-filter.js +1 -1
- package/lib/common/mobile/android/android-virtual-device-service.js +76 -97
- package/lib/common/mobile/android/device-android-debug-bridge.js +13 -29
- package/lib/common/mobile/android/genymotion/genymotion-service.js +91 -118
- package/lib/common/mobile/android/genymotion/virtualbox-service.js +64 -81
- package/lib/common/mobile/android/logcat-helper.js +108 -127
- package/lib/common/mobile/application-manager-base.js +84 -107
- package/lib/common/mobile/device-log-provider-base.js +7 -18
- package/lib/common/mobile/ios/device/ios-application-manager.js +79 -108
- package/lib/common/mobile/ios/device/ios-device-file-system.js +78 -105
- package/lib/common/mobile/ios/device/ios-device-operations.js +105 -142
- package/lib/common/mobile/ios/device/ios-device.js +20 -36
- package/lib/common/mobile/ios/ios-device-base.js +58 -81
- package/lib/common/mobile/ios/simulator/ios-emulator-services.js +63 -92
- package/lib/common/mobile/ios/simulator/ios-sim-resolver.js +1 -1
- package/lib/common/mobile/ios/simulator/ios-simulator-application-manager.js +60 -89
- package/lib/common/mobile/ios/simulator/ios-simulator-device.js +27 -43
- package/lib/common/mobile/ios/simulator/ios-simulator-file-system.js +37 -62
- package/lib/common/mobile/ios/simulator/ios-simulator-log-provider.js +24 -35
- package/lib/common/mobile/mobile-core/android-device-discovery.js +43 -62
- package/lib/common/mobile/mobile-core/android-emulator-discovery.js +21 -32
- package/lib/common/mobile/mobile-core/android-process-service.js +143 -182
- package/lib/common/mobile/mobile-core/device-discovery.js +2 -13
- package/lib/common/mobile/mobile-core/devices-service.js +386 -436
- package/lib/common/mobile/mobile-core/ios-device-discovery.js +24 -35
- package/lib/common/mobile/mobile-core/ios-simulator-discovery.js +47 -62
- package/lib/common/mobile/mobile-helper.js +15 -26
- package/lib/common/mobile/wp8/wp8-emulator-services.js +25 -52
- package/lib/common/opener.js +2 -2
- package/lib/common/prompter.js +90 -105
- package/lib/common/queue.js +9 -20
- package/lib/common/services/auto-completion-service.js +39 -52
- package/lib/common/services/cancellation.js +17 -28
- package/lib/common/services/commands-service.js +146 -169
- package/lib/common/services/help-service.js +132 -157
- package/lib/common/services/hooks-service.js +93 -108
- package/lib/common/services/ios-notification-service.js +21 -34
- package/lib/common/services/json-file-settings-service.js +52 -71
- package/lib/common/services/lock-service.js +35 -52
- package/lib/common/services/message-contract-generator.js +35 -46
- package/lib/common/services/micro-templating-service.js +4 -15
- package/lib/common/services/net-service.js +90 -107
- package/lib/common/services/project-files-manager.js +10 -23
- package/lib/common/services/proxy-service.js +13 -24
- package/lib/common/services/qr.js +13 -24
- package/lib/common/services/settings-service.js +1 -1
- package/lib/common/services/xcode-select-service.js +20 -35
- package/lib/common/utils.js +2 -2
- package/lib/common/validators/project-name-validator.js +1 -1
- package/lib/common/validators/validation-result.js +1 -1
- package/lib/common/verify-node-version.js +2 -3
- package/lib/common/yok.js +23 -36
- package/lib/config.js +36 -51
- package/lib/constants.js +24 -24
- package/lib/controllers/build-controller.js +82 -99
- package/lib/controllers/debug-controller.js +107 -128
- package/lib/controllers/deploy-controller.js +15 -23
- package/lib/controllers/migrate-controller.js +722 -795
- package/lib/controllers/platform-controller.js +70 -85
- package/lib/controllers/prepare-controller.js +232 -261
- package/lib/controllers/run-controller.js +397 -411
- package/lib/controllers/update-controller-base.js +16 -29
- package/lib/controllers/update-controller.js +94 -119
- package/lib/data/prepare-data.js +4 -1
- package/lib/definitions/ios.d.ts +11 -1
- package/lib/detached-processes/cleanup-js-subprocess.js +3 -12
- package/lib/detached-processes/cleanup-process.js +16 -25
- package/lib/device-path-provider.js +23 -34
- package/lib/device-sockets/ios/app-debug-socket-proxy-factory.js +149 -164
- package/lib/device-sockets/ios/notification.js +1 -1
- package/lib/device-sockets/ios/socket-request-executor.js +24 -39
- package/lib/helpers/android-bundle-validator-helper.js +1 -1
- package/lib/helpers/deploy-command-helper.js +44 -49
- package/lib/helpers/key-command-helper.js +4 -13
- package/lib/helpers/livesync-command-helper.js +137 -152
- package/lib/helpers/network-connectivity-validator.js +6 -17
- package/lib/helpers/options-track-helper.js +6 -17
- package/lib/helpers/platform-command-helper.js +99 -120
- package/lib/key-commands/index.js +150 -200
- package/lib/nativescript-cli.js +5 -14
- package/lib/node-package-manager.js +81 -104
- package/lib/options.js +3 -12
- package/lib/package-installation-manager.js +130 -165
- package/lib/package-manager.js +63 -86
- package/lib/platform-command-param.js +4 -15
- package/lib/pnpm-package-manager.js +59 -78
- package/lib/project-data.js +1 -1
- package/lib/providers/project-files-provider.js +1 -1
- package/lib/services/analytics/analytics-broker-process.js +13 -22
- package/lib/services/analytics/analytics-broker.js +17 -30
- package/lib/services/analytics/analytics-service.js +163 -199
- package/lib/services/analytics/google-analytics-provider.js +41 -56
- package/lib/services/analytics-settings-service.js +15 -32
- package/lib/services/android/android-bundle-tool-service.js +43 -60
- package/lib/services/android/gradle-build-args-service.js +9 -20
- package/lib/services/android/gradle-build-service.js +22 -35
- package/lib/services/android/gradle-command-service.js +22 -35
- package/lib/services/android-device-debug-service.js +90 -117
- package/lib/services/android-plugin-build-service.js +205 -231
- package/lib/services/android-project-service.js +126 -171
- package/lib/services/android-resources-migration-service.js +51 -64
- package/lib/services/apple-portal/apple-portal-application-service.js +46 -63
- package/lib/services/apple-portal/apple-portal-session-service.js +195 -214
- package/lib/services/apple-portal/srp/srp-wrapper.js +43 -58
- package/lib/services/assets-generation/assets-generation-service.js +103 -117
- package/lib/services/build-artifacts-service.js +9 -20
- package/lib/services/build-info-file-service.js +20 -35
- package/lib/services/cleanup-service.js +47 -76
- package/lib/services/cocoapods-service.js +111 -132
- package/lib/services/device/device-install-app-service.js +54 -71
- package/lib/services/doctor-service.js +99 -118
- package/lib/services/extensibility-service.js +81 -100
- package/lib/services/files-hash-service.js +26 -43
- package/lib/services/hmr-status-service.js +1 -1
- package/lib/services/initialize-service.js +37 -50
- package/lib/services/ios/export-options-plist-service.js +38 -51
- package/lib/services/ios/ios-signing-service.js +168 -187
- package/lib/services/ios/spm-service.js +47 -51
- package/lib/services/ios/xcodebuild-args-service.js +77 -94
- package/lib/services/ios/xcodebuild-command-service.js +14 -25
- package/lib/services/ios/xcodebuild-service.js +52 -71
- package/lib/services/ios-debugger-port-service.js +24 -37
- package/lib/services/ios-device-debug-service.js +75 -102
- package/lib/services/ios-entitlements-service.js +31 -42
- package/lib/services/ios-extensions-service.js +18 -29
- package/lib/services/ios-project-service.js +419 -460
- package/lib/services/ios-provision-service.js +108 -129
- package/lib/services/ios-watch-app-service.js +21 -32
- package/lib/services/ip-service.js +38 -53
- package/lib/services/itmstransporter-service.js +129 -152
- package/lib/services/livesync/android-device-livesync-service-base.js +31 -48
- package/lib/services/livesync/android-device-livesync-service.js +120 -149
- package/lib/services/livesync/android-device-livesync-sockets-service.js +121 -152
- package/lib/services/livesync/android-livesync-service.js +14 -35
- package/lib/services/livesync/android-livesync-tool.js +90 -113
- package/lib/services/livesync/device-livesync-service-base.js +15 -28
- package/lib/services/livesync/ios-device-livesync-service.js +114 -143
- package/lib/services/livesync/ios-livesync-service.js +42 -58
- package/lib/services/livesync/platform-livesync-service-base.js +94 -119
- package/lib/services/log-parser-service.js +1 -1
- package/lib/services/log-source-map-service.js +30 -41
- package/lib/services/marking-mode-service.js +15 -28
- package/lib/services/npm-config-service.js +1 -1
- package/lib/services/pacote-service.js +49 -64
- package/lib/services/performance-service.js +1 -1
- package/lib/services/platform/add-platform-service.js +50 -71
- package/lib/services/platform/platform-validation-service.js +22 -33
- package/lib/services/platform/prepare-native-platform-service.js +49 -62
- package/lib/services/platform-environment-requirements.js +26 -37
- package/lib/services/plugins-service.js +122 -147
- package/lib/services/project-backup-service.js +1 -1
- package/lib/services/project-changes-service.js +124 -141
- package/lib/services/project-cleanup-service.js +64 -77
- package/lib/services/project-config-service.js +71 -80
- package/lib/services/project-data-service.js +101 -118
- package/lib/services/project-name-service.js +28 -43
- package/lib/services/project-service.js +84 -103
- package/lib/services/project-templates-service.js +52 -67
- package/lib/services/start-service.js +41 -59
- package/lib/services/temp-service.js +8 -21
- package/lib/services/terminal-spinner-service.js +15 -26
- package/lib/services/test-execution-service.js +59 -72
- package/lib/services/test-initialization-service.js +2 -2
- package/lib/services/timeline-profiler-service.js +1 -1
- package/lib/services/versions-service.js +119 -138
- package/lib/services/webpack/webpack-compiler-service.js +214 -234
- package/lib/services/xcconfig-service.js +8 -19
- package/lib/sys-info.js +45 -62
- package/lib/tools/node-modules/node-modules-builder.js +16 -27
- package/lib/yarn-package-manager.js +59 -78
- package/lib/yarn2-package-manager.js +60 -79
- package/package.json +66 -81
- package/node_modules/@npmcli/move-file/LICENSE.md +0 -22
- package/node_modules/@npmcli/move-file/README.md +0 -69
- package/node_modules/@npmcli/move-file/lib/index.js +0 -185
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/LICENSE +0 -21
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/bin/cmd.js +0 -68
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/index.js +0 -31
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/find-made.js +0 -29
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/mkdirp-manual.js +0 -64
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/mkdirp-native.js +0 -39
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/opts-arg.js +0 -23
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/path-arg.js +0 -29
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/use-native.js +0 -10
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/package.json +0 -44
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/readme.markdown +0 -266
- package/node_modules/@npmcli/move-file/package.json +0 -47
- package/node_modules/balanced-match/.github/FUNDING.yml +0 -2
- package/node_modules/balanced-match/LICENSE.md +0 -21
- package/node_modules/balanced-match/README.md +0 -97
- package/node_modules/balanced-match/index.js +0 -62
- package/node_modules/balanced-match/package.json +0 -48
- package/node_modules/concat-map/.travis.yml +0 -4
- package/node_modules/concat-map/LICENSE +0 -18
- package/node_modules/concat-map/README.markdown +0 -62
- package/node_modules/concat-map/example/map.js +0 -6
- package/node_modules/concat-map/index.js +0 -13
- package/node_modules/concat-map/package.json +0 -43
- package/node_modules/concat-map/test/map.js +0 -39
- package/node_modules/fs.realpath/LICENSE +0 -43
- package/node_modules/fs.realpath/README.md +0 -33
- package/node_modules/fs.realpath/index.js +0 -66
- package/node_modules/fs.realpath/old.js +0 -303
- package/node_modules/fs.realpath/package.json +0 -26
- package/node_modules/inflight/LICENSE +0 -15
- package/node_modules/inflight/README.md +0 -37
- package/node_modules/inflight/inflight.js +0 -54
- package/node_modules/inflight/package.json +0 -29
- package/node_modules/inherits/LICENSE +0 -16
- package/node_modules/inherits/README.md +0 -42
- package/node_modules/inherits/inherits.js +0 -9
- package/node_modules/inherits/inherits_browser.js +0 -27
- package/node_modules/inherits/package.json +0 -29
- package/node_modules/once/LICENSE +0 -15
- package/node_modules/once/README.md +0 -79
- package/node_modules/once/once.js +0 -42
- package/node_modules/once/package.json +0 -33
- package/node_modules/path-is-absolute/index.js +0 -20
- package/node_modules/path-is-absolute/license +0 -21
- package/node_modules/path-is-absolute/package.json +0 -43
- package/node_modules/path-is-absolute/readme.md +0 -59
- package/node_modules/rimraf/LICENSE +0 -15
- package/node_modules/rimraf/README.md +0 -101
- package/node_modules/rimraf/bin.js +0 -68
- package/node_modules/rimraf/node_modules/brace-expansion/LICENSE +0 -21
- package/node_modules/rimraf/node_modules/brace-expansion/README.md +0 -129
- package/node_modules/rimraf/node_modules/brace-expansion/index.js +0 -201
- package/node_modules/rimraf/node_modules/brace-expansion/package.json +0 -47
- package/node_modules/rimraf/node_modules/glob/LICENSE +0 -21
- package/node_modules/rimraf/node_modules/glob/README.md +0 -378
- package/node_modules/rimraf/node_modules/glob/common.js +0 -238
- package/node_modules/rimraf/node_modules/glob/glob.js +0 -790
- package/node_modules/rimraf/node_modules/glob/package.json +0 -55
- package/node_modules/rimraf/node_modules/glob/sync.js +0 -486
- package/node_modules/rimraf/node_modules/minimatch/LICENSE +0 -15
- package/node_modules/rimraf/node_modules/minimatch/README.md +0 -230
- package/node_modules/rimraf/node_modules/minimatch/minimatch.js +0 -947
- package/node_modules/rimraf/node_modules/minimatch/package.json +0 -33
- package/node_modules/rimraf/package.json +0 -32
- package/node_modules/rimraf/rimraf.js +0 -360
- package/node_modules/stringify-package/LICENSE +0 -13
- package/node_modules/stringify-package/README.md +0 -55
- package/node_modules/stringify-package/index.js +0 -18
- package/node_modules/stringify-package/package.json +0 -38
- package/node_modules/wrappy/LICENSE +0 -15
- package/node_modules/wrappy/README.md +0 -36
- package/node_modules/wrappy/package.json +0 -29
- package/node_modules/wrappy/wrappy.js +0 -33
|
@@ -5,15 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
5
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
9
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
10
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
11
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
12
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
13
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
14
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
15
|
-
});
|
|
16
|
-
};
|
|
17
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
9
|
exports.AndroidPluginBuildService = void 0;
|
|
19
10
|
const path = require("path");
|
|
@@ -60,25 +51,23 @@ class AndroidPluginBuildService {
|
|
|
60
51
|
const manifest = path.join(platformsDir, constants_1.MANIFEST_FILE_NAME);
|
|
61
52
|
return this.$fs.exists(manifest) ? manifest : null;
|
|
62
53
|
}
|
|
63
|
-
updateManifestContent(oldManifestContent, defaultPackageName) {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
if (xml["manifest"]) {
|
|
68
|
-
|
|
69
|
-
packageName = xml["manifest"]["$"]["package"];
|
|
70
|
-
}
|
|
71
|
-
xml = xml["manifest"];
|
|
72
|
-
}
|
|
73
|
-
const newManifest = { manifest: {} };
|
|
74
|
-
for (const prop in xml) {
|
|
75
|
-
newManifest.manifest[prop] = xml[prop];
|
|
54
|
+
async updateManifestContent(oldManifestContent, defaultPackageName) {
|
|
55
|
+
let xml = await this.getXml(oldManifestContent);
|
|
56
|
+
let packageName = defaultPackageName;
|
|
57
|
+
if (xml["manifest"]) {
|
|
58
|
+
if (xml["manifest"]["$"]["package"]) {
|
|
59
|
+
packageName = xml["manifest"]["$"]["package"];
|
|
76
60
|
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
61
|
+
xml = xml["manifest"];
|
|
62
|
+
}
|
|
63
|
+
const newManifest = { manifest: {} };
|
|
64
|
+
for (const prop in xml) {
|
|
65
|
+
newManifest.manifest[prop] = xml[prop];
|
|
66
|
+
}
|
|
67
|
+
newManifest.manifest["$"]["package"] = packageName;
|
|
68
|
+
const xmlBuilder = new xml2js_1.Builder();
|
|
69
|
+
const newManifestContent = xmlBuilder.buildObject(newManifest);
|
|
70
|
+
return newManifestContent;
|
|
82
71
|
}
|
|
83
72
|
createManifestContent(packageName) {
|
|
84
73
|
const newManifest = {
|
|
@@ -89,18 +78,16 @@ class AndroidPluginBuildService {
|
|
|
89
78
|
const newManifestContent = xmlBuilder.buildObject(newManifest);
|
|
90
79
|
return newManifestContent;
|
|
91
80
|
}
|
|
92
|
-
getXml(stringContent) {
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
return promise;
|
|
103
|
-
});
|
|
81
|
+
async getXml(stringContent) {
|
|
82
|
+
const promise = new Promise((resolve, reject) => (0, xml2js_1.parseString)(stringContent, (err, result) => {
|
|
83
|
+
if (err) {
|
|
84
|
+
reject(err);
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
resolve(result);
|
|
88
|
+
}
|
|
89
|
+
}));
|
|
90
|
+
return promise;
|
|
104
91
|
}
|
|
105
92
|
getIncludeGradleCompileDependenciesScope(includeGradleFileContent) {
|
|
106
93
|
const indexOfDependenciesScope = includeGradleFileContent.indexOf("dependencies");
|
|
@@ -145,41 +132,39 @@ class AndroidPluginBuildService {
|
|
|
145
132
|
}
|
|
146
133
|
return result;
|
|
147
134
|
}
|
|
148
|
-
buildAar(options) {
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
fileHashesInfo: pluginSourceFileHashesInfo,
|
|
163
|
-
});
|
|
164
|
-
if (shouldBuildAar) {
|
|
165
|
-
this.cleanPluginDir(pluginTempDir);
|
|
166
|
-
const pluginTempMainSrcDir = path.join(pluginTempDir, "src", "main");
|
|
167
|
-
yield this.updateManifest(manifestFilePath, pluginTempMainSrcDir, shortPluginName);
|
|
168
|
-
this.copySourceSetDirectories(androidSourceDirectories, pluginTempMainSrcDir);
|
|
169
|
-
yield this.setupGradle(pluginTempDir, options.platformsAndroidDirPath, options.projectDir, options.pluginName);
|
|
170
|
-
yield this.buildPlugin({
|
|
171
|
-
gradlePath: options.gradlePath,
|
|
172
|
-
gradleArgs: options.gradleArgs,
|
|
173
|
-
pluginDir: pluginTempDir,
|
|
174
|
-
pluginName: options.pluginName,
|
|
175
|
-
projectDir: options.projectDir,
|
|
176
|
-
});
|
|
177
|
-
this.$watchIgnoreListService.addFileToIgnoreList(path.join(options.aarOutputDir, `${shortPluginName}.aar`));
|
|
178
|
-
this.copyAar(shortPluginName, pluginTempDir, options.aarOutputDir);
|
|
179
|
-
this.writePluginHashInfo(pluginSourceFileHashesInfo, pluginTempDir);
|
|
180
|
-
}
|
|
181
|
-
return shouldBuildAar;
|
|
135
|
+
async buildAar(options) {
|
|
136
|
+
this.validateOptions(options);
|
|
137
|
+
const manifestFilePath = this.getManifest(options.platformsAndroidDirPath);
|
|
138
|
+
const androidSourceDirectories = this.getAndroidSourceDirectories(options.platformsAndroidDirPath);
|
|
139
|
+
const shortPluginName = (0, helpers_1.getShortPluginName)(options.pluginName);
|
|
140
|
+
const pluginTempDir = path.join(options.tempPluginDirPath, shortPluginName);
|
|
141
|
+
const pluginSourceFileHashesInfo = await this.getSourceFilesHashes(options.platformsAndroidDirPath, shortPluginName);
|
|
142
|
+
const shouldBuildAar = await this.shouldBuildAar({
|
|
143
|
+
manifestFilePath,
|
|
144
|
+
androidSourceDirectories,
|
|
145
|
+
pluginTempDir,
|
|
146
|
+
pluginSourceDir: options.platformsAndroidDirPath,
|
|
147
|
+
shortPluginName,
|
|
148
|
+
fileHashesInfo: pluginSourceFileHashesInfo,
|
|
182
149
|
});
|
|
150
|
+
if (shouldBuildAar) {
|
|
151
|
+
this.cleanPluginDir(pluginTempDir);
|
|
152
|
+
const pluginTempMainSrcDir = path.join(pluginTempDir, "src", "main");
|
|
153
|
+
await this.updateManifest(manifestFilePath, pluginTempMainSrcDir, shortPluginName);
|
|
154
|
+
this.copySourceSetDirectories(androidSourceDirectories, pluginTempMainSrcDir);
|
|
155
|
+
await this.setupGradle(pluginTempDir, options.platformsAndroidDirPath, options.projectDir, options.pluginName);
|
|
156
|
+
await this.buildPlugin({
|
|
157
|
+
gradlePath: options.gradlePath,
|
|
158
|
+
gradleArgs: options.gradleArgs,
|
|
159
|
+
pluginDir: pluginTempDir,
|
|
160
|
+
pluginName: options.pluginName,
|
|
161
|
+
projectDir: options.projectDir,
|
|
162
|
+
});
|
|
163
|
+
this.$watchIgnoreListService.addFileToIgnoreList(path.join(options.aarOutputDir, `${shortPluginName}.aar`));
|
|
164
|
+
this.copyAar(shortPluginName, pluginTempDir, options.aarOutputDir);
|
|
165
|
+
this.writePluginHashInfo(pluginSourceFileHashesInfo, pluginTempDir);
|
|
166
|
+
}
|
|
167
|
+
return shouldBuildAar;
|
|
183
168
|
}
|
|
184
169
|
cleanPluginDir(pluginTempDir) {
|
|
185
170
|
this.$fs.deleteDirectory(pluginTempDir);
|
|
@@ -194,50 +179,46 @@ class AndroidPluginBuildService {
|
|
|
194
179
|
const buildDataFile = this.getPathToPluginBuildDataFile(pluginTempDir);
|
|
195
180
|
this.$fs.writeJson(buildDataFile, fileHashesInfo);
|
|
196
181
|
}
|
|
197
|
-
shouldBuildAar(opts) {
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
shouldBuildAar = this.$filesHashService.hasChangesInShasums(oldHashes, opts.fileHashesInfo);
|
|
207
|
-
}
|
|
182
|
+
async shouldBuildAar(opts) {
|
|
183
|
+
let shouldBuildAar = !!opts.manifestFilePath || !!opts.androidSourceDirectories.length;
|
|
184
|
+
if (shouldBuildAar &&
|
|
185
|
+
this.$fs.exists(opts.pluginTempDir) &&
|
|
186
|
+
this.$fs.exists(path.join(opts.pluginSourceDir, `${opts.shortPluginName}.aar`))) {
|
|
187
|
+
const buildDataFile = this.getPathToPluginBuildDataFile(opts.pluginTempDir);
|
|
188
|
+
if (this.$fs.exists(buildDataFile)) {
|
|
189
|
+
const oldHashes = this.$fs.readJson(buildDataFile);
|
|
190
|
+
shouldBuildAar = this.$filesHashService.hasChangesInShasums(oldHashes, opts.fileHashesInfo);
|
|
208
191
|
}
|
|
209
|
-
|
|
210
|
-
|
|
192
|
+
}
|
|
193
|
+
return shouldBuildAar;
|
|
211
194
|
}
|
|
212
195
|
getPathToPluginBuildDataFile(pluginDir) {
|
|
213
196
|
return path.join(pluginDir, constants_1.PLUGIN_BUILD_DATA_FILENAME);
|
|
214
197
|
}
|
|
215
|
-
updateManifest(manifestFilePath, pluginTempMainSrcDir, shortPluginName) {
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
let androidManifestContent;
|
|
222
|
-
try {
|
|
223
|
-
androidManifestContent = this.$fs.readText(manifestFilePath);
|
|
224
|
-
}
|
|
225
|
-
catch (err) {
|
|
226
|
-
this.$errors.fail(`Failed to fs.readFileSync the manifest file located at ${manifestFilePath}. Error is: ${err.toString()}`);
|
|
227
|
-
}
|
|
228
|
-
updatedManifestContent = yield this.updateManifestContent(androidManifestContent, defaultPackageName);
|
|
229
|
-
}
|
|
230
|
-
else {
|
|
231
|
-
updatedManifestContent = this.createManifestContent(defaultPackageName);
|
|
232
|
-
}
|
|
233
|
-
const pathToTempAndroidManifest = path.join(pluginTempMainSrcDir, constants_1.MANIFEST_FILE_NAME);
|
|
198
|
+
async updateManifest(manifestFilePath, pluginTempMainSrcDir, shortPluginName) {
|
|
199
|
+
let updatedManifestContent;
|
|
200
|
+
this.$fs.ensureDirectoryExists(pluginTempMainSrcDir);
|
|
201
|
+
const defaultPackageName = "org.nativescript." + shortPluginName;
|
|
202
|
+
if (manifestFilePath) {
|
|
203
|
+
let androidManifestContent;
|
|
234
204
|
try {
|
|
235
|
-
this.$fs.
|
|
205
|
+
androidManifestContent = this.$fs.readText(manifestFilePath);
|
|
236
206
|
}
|
|
237
|
-
catch (
|
|
238
|
-
this.$errors.fail(`Failed to
|
|
207
|
+
catch (err) {
|
|
208
|
+
this.$errors.fail(`Failed to fs.readFileSync the manifest file located at ${manifestFilePath}. Error is: ${err.toString()}`);
|
|
239
209
|
}
|
|
240
|
-
|
|
210
|
+
updatedManifestContent = await this.updateManifestContent(androidManifestContent, defaultPackageName);
|
|
211
|
+
}
|
|
212
|
+
else {
|
|
213
|
+
updatedManifestContent = this.createManifestContent(defaultPackageName);
|
|
214
|
+
}
|
|
215
|
+
const pathToTempAndroidManifest = path.join(pluginTempMainSrcDir, constants_1.MANIFEST_FILE_NAME);
|
|
216
|
+
try {
|
|
217
|
+
this.$fs.writeFile(pathToTempAndroidManifest, updatedManifestContent);
|
|
218
|
+
}
|
|
219
|
+
catch (e) {
|
|
220
|
+
this.$errors.fail(`Failed to write the updated AndroidManifest in the new location - ${pathToTempAndroidManifest}. Error is: ${e.toString()}`);
|
|
221
|
+
}
|
|
241
222
|
}
|
|
242
223
|
copySourceSetDirectories(androidSourceSetDirectories, pluginTempMainSrcDir) {
|
|
243
224
|
for (const dir of androidSourceSetDirectories) {
|
|
@@ -247,68 +228,62 @@ class AndroidPluginBuildService {
|
|
|
247
228
|
this.$fs.copyFile(path.join(dir, "*"), destination);
|
|
248
229
|
}
|
|
249
230
|
}
|
|
250
|
-
setupGradle(pluginTempDir, platformsAndroidDirPath, projectDir, pluginName) {
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
if (xml["manifest"]) {
|
|
269
|
-
|
|
270
|
-
packageName = xml["manifest"]["$"]["package"];
|
|
271
|
-
}
|
|
272
|
-
}
|
|
273
|
-
this.replaceFileContent(buildGradlePath, "{{pluginNamespace}}", packageName);
|
|
274
|
-
});
|
|
275
|
-
}
|
|
276
|
-
getRuntimeGradleVersions(projectDir) {
|
|
277
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
278
|
-
let runtimeGradleVersions = null;
|
|
279
|
-
if (projectDir) {
|
|
280
|
-
const projectData = this.$projectDataService.getProjectData(projectDir);
|
|
281
|
-
const platformData = this.$platformsDataService.getPlatformData(this.$devicePlatformsConstants.Android, projectData);
|
|
282
|
-
const projectRuntimeVersion = platformData.platformProjectService.getFrameworkVersion(projectData);
|
|
283
|
-
runtimeGradleVersions = yield this.getGradleVersions(projectRuntimeVersion);
|
|
284
|
-
this.$logger.trace(`Got gradle versions ${JSON.stringify(runtimeGradleVersions)} from runtime v${projectRuntimeVersion}`);
|
|
231
|
+
async setupGradle(pluginTempDir, platformsAndroidDirPath, projectDir, pluginName) {
|
|
232
|
+
const gradleTemplatePath = path.resolve(path.join(__dirname, "../../vendor/gradle-plugin"));
|
|
233
|
+
const allGradleTemplateFiles = path.join(gradleTemplatePath, "*");
|
|
234
|
+
const buildGradlePath = path.join(pluginTempDir, "build.gradle");
|
|
235
|
+
const settingsGradlePath = path.join(pluginTempDir, "settings.gradle");
|
|
236
|
+
this.$fs.copyFile(allGradleTemplateFiles, pluginTempDir);
|
|
237
|
+
this.addCompileDependencies(platformsAndroidDirPath, buildGradlePath);
|
|
238
|
+
const runtimeGradleVersions = await this.getRuntimeGradleVersions(projectDir);
|
|
239
|
+
this.replaceGradleVersion(pluginTempDir, runtimeGradleVersions.gradleVersion);
|
|
240
|
+
this.replaceGradleAndroidPluginVersion(buildGradlePath, runtimeGradleVersions.gradleAndroidPluginVersion);
|
|
241
|
+
this.replaceFileContent(buildGradlePath, "{{pluginName}}", pluginName);
|
|
242
|
+
this.replaceFileContent(settingsGradlePath, "{{pluginName}}", pluginName);
|
|
243
|
+
const shortPluginName = (0, helpers_1.getShortPluginName)(pluginName);
|
|
244
|
+
const manifestPath = path.join(pluginTempDir, "src", "main", "AndroidManifest.xml");
|
|
245
|
+
const manifestContent = this.$fs.readText(manifestPath);
|
|
246
|
+
let packageName = `org.nativescript.${shortPluginName}`;
|
|
247
|
+
const xml = await this.getXml(manifestContent);
|
|
248
|
+
if (xml["manifest"]) {
|
|
249
|
+
if (xml["manifest"]["$"]["package"]) {
|
|
250
|
+
packageName = xml["manifest"]["$"]["package"];
|
|
285
251
|
}
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
252
|
+
}
|
|
253
|
+
this.replaceFileContent(buildGradlePath, "{{pluginNamespace}}", packageName);
|
|
254
|
+
}
|
|
255
|
+
async getRuntimeGradleVersions(projectDir) {
|
|
256
|
+
let runtimeGradleVersions = null;
|
|
257
|
+
if (projectDir) {
|
|
258
|
+
const projectData = this.$projectDataService.getProjectData(projectDir);
|
|
259
|
+
const platformData = this.$platformsDataService.getPlatformData(this.$devicePlatformsConstants.Android, projectData);
|
|
260
|
+
const projectRuntimeVersion = platformData.platformProjectService.getFrameworkVersion(projectData);
|
|
261
|
+
runtimeGradleVersions = await this.getGradleVersions(projectRuntimeVersion);
|
|
262
|
+
this.$logger.trace(`Got gradle versions ${JSON.stringify(runtimeGradleVersions)} from runtime v${projectRuntimeVersion}`);
|
|
263
|
+
}
|
|
264
|
+
if (!runtimeGradleVersions) {
|
|
265
|
+
const latestRuntimeVersion = await this.getLatestRuntimeVersion();
|
|
266
|
+
runtimeGradleVersions = await this.getGradleVersions(latestRuntimeVersion);
|
|
267
|
+
this.$logger.trace(`Got gradle versions ${JSON.stringify(runtimeGradleVersions)} from the latest runtime v${latestRuntimeVersion}`);
|
|
268
|
+
}
|
|
269
|
+
return runtimeGradleVersions || {};
|
|
293
270
|
}
|
|
294
|
-
getLatestRuntimeVersion() {
|
|
271
|
+
async getLatestRuntimeVersion() {
|
|
295
272
|
var _a;
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
return runtimeVersion;
|
|
311
|
-
});
|
|
273
|
+
let runtimeVersion = null;
|
|
274
|
+
try {
|
|
275
|
+
let result = await this.$packageManager.view(constants_1.SCOPED_ANDROID_RUNTIME_NAME, {
|
|
276
|
+
"dist-tags": true,
|
|
277
|
+
});
|
|
278
|
+
result = (_a = result === null || result === void 0 ? void 0 : result["dist-tags"]) !== null && _a !== void 0 ? _a : result;
|
|
279
|
+
runtimeVersion = result.latest;
|
|
280
|
+
}
|
|
281
|
+
catch (err) {
|
|
282
|
+
this.$logger.trace(`Error while getting latest android runtime version from view command: ${err}`);
|
|
283
|
+
const registryData = await this.$packageManager.getRegistryPackageData(constants_1.SCOPED_ANDROID_RUNTIME_NAME);
|
|
284
|
+
runtimeVersion = registryData["dist-tags"].latest;
|
|
285
|
+
}
|
|
286
|
+
return runtimeVersion;
|
|
312
287
|
}
|
|
313
288
|
getLocalGradleVersions() {
|
|
314
289
|
const installedRuntimePackageJSONPath = (0, resolve_package_path_1.resolvePackageJSONPath)(constants_1.SCOPED_ANDROID_RUNTIME_NAME, {
|
|
@@ -337,36 +312,34 @@ class AndroidPluginBuildService {
|
|
|
337
312
|
}
|
|
338
313
|
return null;
|
|
339
314
|
}
|
|
340
|
-
getGradleVersions(runtimeVersion) {
|
|
315
|
+
async getGradleVersions(runtimeVersion) {
|
|
341
316
|
var _a, _b;
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
};
|
|
359
|
-
}
|
|
360
|
-
runtimeGradleVersions = { versions: output };
|
|
361
|
-
}
|
|
362
|
-
catch (err) {
|
|
363
|
-
this.$logger.trace(`Error while getting gradle data for android runtime from view command: ${err}`);
|
|
364
|
-
const registryData = yield this.$packageManager.getRegistryPackageData(constants_1.SCOPED_ANDROID_RUNTIME_NAME);
|
|
365
|
-
runtimeGradleVersions = registryData.versions[runtimeVersion];
|
|
317
|
+
let runtimeGradleVersions = null;
|
|
318
|
+
const localVersionInfo = this.getLocalGradleVersions();
|
|
319
|
+
if (localVersionInfo) {
|
|
320
|
+
return localVersionInfo;
|
|
321
|
+
}
|
|
322
|
+
try {
|
|
323
|
+
let output = await this.$packageManager.view(`${constants_1.SCOPED_ANDROID_RUNTIME_NAME}@${runtimeVersion}`, { version_info: true });
|
|
324
|
+
output = (_a = output === null || output === void 0 ? void 0 : output["version_info"]) !== null && _a !== void 0 ? _a : output;
|
|
325
|
+
if (!output) {
|
|
326
|
+
output = await this.$packageManager.view(`${constants_1.SCOPED_ANDROID_RUNTIME_NAME}@${runtimeVersion}`, { gradle: true });
|
|
327
|
+
output = (_b = output === null || output === void 0 ? void 0 : output["gradle"]) !== null && _b !== void 0 ? _b : output;
|
|
328
|
+
const { version, android } = output;
|
|
329
|
+
output = {
|
|
330
|
+
gradle: version,
|
|
331
|
+
gradleAndroid: android,
|
|
332
|
+
};
|
|
366
333
|
}
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
334
|
+
runtimeGradleVersions = { versions: output };
|
|
335
|
+
}
|
|
336
|
+
catch (err) {
|
|
337
|
+
this.$logger.trace(`Error while getting gradle data for android runtime from view command: ${err}`);
|
|
338
|
+
const registryData = await this.$packageManager.getRegistryPackageData(constants_1.SCOPED_ANDROID_RUNTIME_NAME);
|
|
339
|
+
runtimeGradleVersions = registryData.versions[runtimeVersion];
|
|
340
|
+
}
|
|
341
|
+
const result = this.getGradleVersionsCore(runtimeGradleVersions);
|
|
342
|
+
return result;
|
|
370
343
|
}
|
|
371
344
|
getGradleVersionsCore(packageData) {
|
|
372
345
|
const packageJsonGradle = packageData && packageData.versions;
|
|
@@ -452,42 +425,43 @@ class AndroidPluginBuildService {
|
|
|
452
425
|
}
|
|
453
426
|
return false;
|
|
454
427
|
}
|
|
455
|
-
buildPlugin(pluginBuildSettings) {
|
|
428
|
+
async buildPlugin(pluginBuildSettings) {
|
|
456
429
|
var _a;
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
430
|
+
const gradlew = (_a = pluginBuildSettings.gradlePath) !== null && _a !== void 0 ? _a : (this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew");
|
|
431
|
+
const localArgs = [
|
|
432
|
+
"-p",
|
|
433
|
+
pluginBuildSettings.pluginDir,
|
|
434
|
+
"assembleRelease",
|
|
435
|
+
`-PtempBuild=true`,
|
|
436
|
+
`-PappPath=${this.$projectData.getAppDirectoryPath()}`,
|
|
437
|
+
`-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`,
|
|
438
|
+
];
|
|
439
|
+
if (pluginBuildSettings.gradleArgs) {
|
|
440
|
+
localArgs.push(pluginBuildSettings.gradleArgs);
|
|
441
|
+
}
|
|
442
|
+
if (this.$logger.getLevel() === "INFO") {
|
|
443
|
+
localArgs.push("--quiet");
|
|
444
|
+
}
|
|
445
|
+
const opts = {
|
|
446
|
+
cwd: pluginBuildSettings.pluginDir,
|
|
447
|
+
stdio: "inherit",
|
|
448
|
+
shell: this.$hostInfo.isWindows,
|
|
449
|
+
};
|
|
450
|
+
if (this.$options.hostProjectPath) {
|
|
451
|
+
opts.env = {
|
|
452
|
+
USER_PROJECT_PLATFORMS_ANDROID: path.resolve((0, process_1.cwd)(), this.$options.hostProjectPath),
|
|
453
|
+
...process.env,
|
|
477
454
|
};
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
}
|
|
487
|
-
|
|
488
|
-
this.$errors.fail(`Failed to build plugin ${pluginBuildSettings.pluginName} : \n${err}`);
|
|
489
|
-
}
|
|
490
|
-
});
|
|
455
|
+
}
|
|
456
|
+
try {
|
|
457
|
+
const sanitizedArgs = this.$hostInfo.isWindows
|
|
458
|
+
? localArgs.map((arg) => (0, helpers_1.quoteString)(arg))
|
|
459
|
+
: localArgs;
|
|
460
|
+
await this.$childProcess.spawnFromEvent(gradlew, sanitizedArgs, "close", opts);
|
|
461
|
+
}
|
|
462
|
+
catch (err) {
|
|
463
|
+
this.$errors.fail(`Failed to build plugin ${pluginBuildSettings.pluginName} : \n${err}`);
|
|
464
|
+
}
|
|
491
465
|
}
|
|
492
466
|
validateOptions(options) {
|
|
493
467
|
if (!options) {
|
|
@@ -513,6 +487,7 @@ class AndroidPluginBuildService {
|
|
|
513
487
|
}
|
|
514
488
|
}
|
|
515
489
|
}
|
|
490
|
+
exports.AndroidPluginBuildService = AndroidPluginBuildService;
|
|
516
491
|
AndroidPluginBuildService.MANIFEST_ROOT = {
|
|
517
492
|
$: {
|
|
518
493
|
"xmlns:android": "http://schemas.android.com/apk/res/android",
|
|
@@ -521,5 +496,4 @@ AndroidPluginBuildService.MANIFEST_ROOT = {
|
|
|
521
496
|
__decorate([
|
|
522
497
|
(0, helpers_1.hook)("buildAndroidPlugin")
|
|
523
498
|
], AndroidPluginBuildService.prototype, "buildPlugin", null);
|
|
524
|
-
exports.AndroidPluginBuildService = AndroidPluginBuildService;
|
|
525
499
|
yok_1.injector.register("androidPluginBuildService", AndroidPluginBuildService);
|