Skip to content

Commit c0be28f

Browse files
Merge pull request #2783 from NativeScript/vladimirov/merge-rel-master
Merge release in master
2 parents b1aeca3 + 1c64e4b commit c0be28f

File tree

3 files changed

+21
-2
lines changed

3 files changed

+21
-2
lines changed

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
NativeScript CLI Changelog
22
================
33

4+
3.0.0 (2017, May 3)
5+
==
6+
7+
### Fixed
8+
9+
* [Fixed #2500](https://github.com/NativeScript/nativescript-cli/issues/2500): Debug on device does not sync file changes
10+
* [Fixed #2639](https://github.com/NativeScript/nativescript-cli/issues/2639): Build continues after gradle build fails
11+
* [Fixed #1882](https://github.com/NativeScript/nativescript-cli/issues/1882): Run/debug commands should not try to deploy on connected but not paired devices
12+
* [Fixed #2673](https://github.com/NativeScript/nativescript-cli/issues/2673): `tns device ios` does not list real devices if simulator is running.
13+
* [Fixed #2685](https://github.com/NativeScript/nativescript-cli/issues/2685): `tns run ios` starts iOS Simulator even if physical iOS device is attached
14+
* [Fixed #2661](https://github.com/NativeScript/nativescript-cli/issues/2661): Adding new files during livesync doesn't succeed on iOS Devices
15+
* [Fixed #2650](https://github.com/NativeScript/nativescript-cli/issues/2650): Release Build Android error: gradlew.bat failed with exit code 1 When Path contains Space
16+
* [Fixed #2125](https://github.com/NativeScript/nativescript-cli/issues/2125): NativeScript setup script fails on Mac
17+
* [Fixed #2697](https://github.com/NativeScript/nativescript-cli/issues/2697): App_Resources being copied into app RAW
18+
419
3.0.0-RC.1 (2017, March 29)
520
==
621

lib/commands/debug.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,11 @@ export class DebugIOSCommand extends DebugPlatformCommand {
103103
$platformsData: IPlatformsData,
104104
$iosDeviceOperations: IIOSDeviceOperations) {
105105
super($iOSDebugService, $devicesService, $injector, $devicePlatformsConstants, $config, $usbLiveSyncService, $debugDataService, $platformService, $projectData, $options, $platformsData, $logger);
106-
$iosDeviceOperations.setShouldDispose(this.$options.justlaunch);
106+
// Do not dispose ios-device-lib, so the process will remain alive and the debug application (NativeScript Inspector or Chrome DevTools) will be able to connect to the socket.
107+
// In case we dispose ios-device-lib, the socket will be closed and the code will fail when the debug application tries to read/send data to device socket.
108+
// That's why the `$ tns debug ios --justlaunch` command will not release the terminal.
109+
// In case we do not set it to false, the dispose will be called once the command finishes its execution, which will prevent the debugging.
110+
$iosDeviceOperations.setShouldDispose(false);
107111
}
108112

109113
public async canExecute(args: string[]): Promise<boolean> {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"glob": "^7.0.3",
4343
"iconv-lite": "0.4.11",
4444
"inquirer": "0.9.0",
45-
"ios-device-lib": "0.4.0",
45+
"ios-device-lib": "0.4.1",
4646
"ios-mobileprovision-finder": "1.0.9",
4747
"ios-sim-portable": "~2.0.0",
4848
"lockfile": "1.0.1",

0 commit comments

Comments
 (0)