Skip to content

refactored code and passed buildOptions to prepare command #1861

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 2 commits into from
Jun 21, 2016
Merged

refactored code and passed buildOptions to prepare command #1861

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
deeec83
refactored code and passed buildOptions to prepare android plugin com…
Plamen5kov Jun 20, 2016
f22f176
fixed lint
Plamen5kov Jun 20, 2016
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
60 changes: 34 additions & 26 deletions lib/services/android-project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,30 +275,8 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
});
}

this.$androidToolsInfo.validateInfo({ showWarningsAsErrors: true, validateTargetSdk: true }).wait();
let androidToolsInfo = this.$androidToolsInfo.getToolsInfo().wait();
let compileSdk = androidToolsInfo.compileSdkVersion;
let targetSdk = this.getTargetFromAndroidManifest().wait() || compileSdk;
let buildToolsVersion = androidToolsInfo.buildToolsVersion;
let appCompatVersion = androidToolsInfo.supportRepositoryVersion;
let buildOptions = ["buildapk",
`-PcompileSdk=android-${compileSdk}`,
`-PtargetSdk=${targetSdk}`,
`-PbuildToolsVersion=${buildToolsVersion}`,
`-PsupportVersion=${appCompatVersion}`,
];

if (this.$options.release) {
buildOptions.push("-Prelease");
buildOptions.push(`-PksPath=${path.resolve(this.$options.keyStorePath)}`);
buildOptions.push(`-Palias=${this.$options.keyStoreAlias}`);
buildOptions.push(`-Ppassword=${this.$options.keyStoreAliasPassword}`);
buildOptions.push(`-PksPassword=${this.$options.keyStorePassword}`);
}

if (!this.canUseStaticBindingGenerator()) {
buildOptions.push("-PdontRunSbg");
}
let buildOptions = this.getBuildOptions();
buildOptions.unshift("buildapk");

let gradleBin = this.useGradleWrapper(projectRoot) ? path.join(projectRoot, "gradlew") : "gradle";
if (this.$hostInfo.isWindows) {
Expand All @@ -312,6 +290,35 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
}).future<void>()();
}

public getBuildOptions(): Array<string> {
this.$androidToolsInfo.validateInfo({ showWarningsAsErrors: true, validateTargetSdk: true }).wait();
let androidToolsInfo = this.$androidToolsInfo.getToolsInfo().wait();
let compileSdk = androidToolsInfo.compileSdkVersion;
let targetSdk = this.getTargetFromAndroidManifest().wait() || compileSdk;
let buildToolsVersion = androidToolsInfo.buildToolsVersion;
let appCompatVersion = androidToolsInfo.supportRepositoryVersion;
let buildOptions = [
`-PcompileSdk=android-${compileSdk}`,
`-PtargetSdk=${targetSdk}`,
`-PbuildToolsVersion=${buildToolsVersion}`,
`-PsupportVersion=${appCompatVersion}`,
];

if (this.$options.release) {
buildOptions.push("-Prelease");
buildOptions.push(`-PksPath=${path.resolve(this.$options.keyStorePath)}`);
buildOptions.push(`-Palias=${this.$options.keyStoreAlias}`);
buildOptions.push(`-Ppassword=${this.$options.keyStoreAliasPassword}`);
buildOptions.push(`-PksPassword=${this.$options.keyStorePassword}`);
}

if (!this.canUseStaticBindingGenerator()) {
buildOptions.push("-PdontRunSbg");
}

return buildOptions;
}

public buildForDeploy(projectRoot: string, buildConfig?: IBuildConfig): IFuture<void> {
return this.buildProject(projectRoot, buildConfig);
}
Expand Down Expand Up @@ -423,14 +430,15 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
}

public afterPrepareAllPlugins(): IFuture<void> {
let buildOptions = this.getBuildOptions();
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, ["clean"], { stdio: "inherit", cwd: this.platformData.projectRoot }).wait();
this.spawn(gradleBin, buildOptions, { stdio: "inherit", cwd: this.platformData.projectRoot }).wait();

return Future.fromResult();
}
Expand Down