Skip to content

chore: merge release-patch in release #4479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 28, 2019
Merged

chore: merge release-patch in release #4479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ed7b5b
chore: set version to 5.3.1
rosen-vladimirov Mar 22, 2019
f0e77df
feat: add ability to pass schema and keys to preview app from public …
Fatme Mar 22, 2019
69442c9
test: add unit tests
Fatme Mar 22, 2019
43fda3b
fix: respect the schema only from nsconfig file
Fatme Mar 22, 2019
d50b5d4
fix: add support for android 'Q'
Fatme Mar 25, 2019
b720651
fix: livesync should stop when all devices are disconnected
rosen-vladimirov Mar 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/commands/preview.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@ export class PreviewCommand implements ICommand {
env: this.$options.env
});

await this.$previewQrCodeService.printLiveSyncQrCode({ useHotModuleReload: this.$options.hmr, link: this.$options.link });
await this.$previewQrCodeService.printLiveSyncQrCode({
projectDir: this.$projectData.projectDir,
useHotModuleReload: this.$options.hmr,
link: this.$options.link
});
}

public async canExecute(args: string[]): Promise<boolean> {
Expand Down
3 changes: 2 additions & 1 deletion lib/common/declarations.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,8 @@ declare const enum ErrorCodes {
KARMA_FAIL = 130,
UNHANDLED_REJECTION_FAILURE = 131,
DELETED_KILL_FILE = 132,
TESTS_INIT_REQUIRED = 133
TESTS_INIT_REQUIRED = 133,
ALL_DEVICES_DISCONNECTED = 134
}

interface IFutureDispatcher {
Expand Down
7 changes: 6 additions & 1 deletion lib/common/mobile/android/android-device.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,16 @@ export class AndroidDevice implements Mobile.IAndroidDevice {
const adbStatusInfo = AndroidDevice.ADB_DEVICE_STATUS_INFO[this.status];
const type = await this.getType();

let version = details.release;
if (version && version.toLowerCase() === 'q') {
version = '10.0.0';
}

this.deviceInfo = {
identifier: this.identifier,
displayName: details.name,
model: details.model,
version: details.release,
version,
vendor: details.brand,
platform: this.$devicePlatformsConstants.Android,
status: adbStatusInfo ? adbStatusInfo.deviceStatus : this.status,
Expand Down
11 changes: 11 additions & 0 deletions lib/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require("colors");
import { PreviewAppLiveSyncEvents } from "./services/livesync/playground/preview-app-constants";

export const APP_FOLDER_NAME = "app";
export const APP_RESOURCES_FOLDER_NAME = "App_Resources";
Expand Down Expand Up @@ -269,3 +270,13 @@ export class AndroidAppBundleMessages {
public static ANDROID_APP_BUNDLE_DOCS_MESSAGE = "What is Android App Bundle: https://docs.nativescript.org/tooling/publishing/android-app-bundle";
public static ANDROID_APP_BUNDLE_PUBLISH_DOCS_MESSAGE = "How to use Android App Bundle for publishing: https://docs.nativescript.org/tooling/publishing/publishing-android-apps#android-app-bundle";
}

export const LiveSyncEvents = {
liveSyncStopped: "liveSyncStopped",
// In case we name it error, EventEmitter expects instance of Error to be raised and will also raise uncaught exception in case there's no handler
liveSyncError: "liveSyncError",
previewAppLiveSyncError: PreviewAppLiveSyncEvents.PREVIEW_APP_LIVE_SYNC_ERROR,
liveSyncExecuted: "liveSyncExecuted",
liveSyncStarted: "liveSyncStarted",
liveSyncNotification: "notify"
};
Loading