Skip to content

Fixed: Livesync+Debug on Android not working when there are changes in tns-core-modules #1985

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
tzraikov merged 1 commit into from
Aug 11, 2016
Merged

Fixed: Livesync+Debug on Android not working when there are changes in tns-core-modules #1985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 11 additions & 8 deletions lib/services/android-project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
private $projectTemplatesService: IProjectTemplatesService,
private $xmlValidator: IXmlValidator,
private $config: IConfiguration,
private $npm: INodePackageManager) {
super($fs, $projectData, $projectDataService);
this._androidProjectPropertiesManagers = Object.create(null);
Expand Down Expand Up @@ -405,16 +406,18 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
}

public beforePrepareAllPlugins(): IFuture<void> {
let buildOptions = this.getBuildOptions();
buildOptions.unshift("clean");
if (!this.$config.debugLivesync) {
let buildOptions = this.getBuildOptions();

let projectRoot = this.platformData.projectRoot;
let gradleBin = this.useGradleWrapper(projectRoot) ? path.join(projectRoot, "gradlew") : "gradle";
if (this.$hostInfo.isWindows) {
gradleBin += ".bat";
}
this.spawn(gradleBin, buildOptions, { stdio: "inherit", cwd: this.platformData.projectRoot }).wait();
buildOptions.unshift("clean");

let projectRoot = this.platformData.projectRoot;
let gradleBin = this.useGradleWrapper(projectRoot) ? path.join(projectRoot, "gradlew") : "gradle";
if (this.$hostInfo.isWindows) {
gradleBin += ".bat";
}
this.spawn(gradleBin, buildOptions, { stdio: "inherit", cwd: this.platformData.projectRoot }).wait();
}
return Future.fromResult();
}

Expand Down
1 change: 1 addition & 0 deletions test/npm-support.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ function createTestInjector(): IInjector {
testInjector.register("mobilePlatformsCapabilities", MobilePlatformsCapabilities);
testInjector.register("devicePlatformsConstants", DevicePlatformsConstants);
testInjector.register("xmlValidator", XmlValidator);
testInjector.register("config", StaticConfigLib.Configuration);

return testInjector;
}
Expand Down
2 changes: 2 additions & 0 deletions test/plugins-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import {DeviceAppDataProvider} from "../lib/providers/device-app-data-provider";
import {MobilePlatformsCapabilities} from "../lib/mobile-platforms-capabilities";
import {DevicePlatformsConstants} from "../lib/common/mobile/device-platforms-constants";
import { XmlValidator } from "../lib/xml-validator";
import StaticConfigLib = require("../lib/config");
import * as path from "path";
import * as temp from "temp";
temp.track();
Expand Down Expand Up @@ -99,6 +100,7 @@ function createTestInjector() {
defaultTemplate: future.fromResult("")
});
testInjector.register("xmlValidator", XmlValidator);
testInjector.register("config", StaticConfigLib.Configuration);

return testInjector;
}
Expand Down