Skip to content

Allow updating target android sdk during "platform add" #183

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
teobugslayer merged 1 commit into from
Jan 16, 2015
Merged

Allow updating target android sdk during "platform add" #183

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
64 changes: 57 additions & 7 deletions lib/services/android-project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
import path = require("path");
import shell = require("shelljs");
import util = require("util");
import Future = require("fibers/future");
import options = require("./../options");
import constants = require("./../constants");
import hostInfo = require("../common/host-info");
import helpers = require("./../common/helpers");

class AndroidProjectService implements IPlatformProjectService {
private SUPPORTED_TARGETS = ["android-17", "android-18", "android-19", "android-21"];
private targetApi: string;

constructor(private $androidEmulatorServices: Mobile.IEmulatorPlatformServices,
Expand Down Expand Up @@ -50,7 +52,7 @@ class AndroidProjectService implements IPlatformProjectService {
return (() => {
this.$fs.ensureDirectoryExists(projectRoot).wait();

this.validateAndroidTarget(frameworkDir); // We need framework to be installed to validate android target so we can't call this method in validate()
var newTarget = this.validateAndroidTarget(frameworkDir); // We need framework to be installed to validate android target so we can't call this method in validate()

if(options.symlink) {
this.copy(projectRoot, frameworkDir, "res", "-R").wait();
Expand All @@ -63,6 +65,10 @@ class AndroidProjectService implements IPlatformProjectService {
this.copy(projectRoot, frameworkDir, ".project AndroidManifest.xml project.properties", "-f").wait();
}

if(newTarget) {
this.updateTarget(projectRoot, newTarget).wait();
}

// Create src folder
var packageName = this.$projectData.projectId;
var packageAsPath = packageName.replace(/\./g, path.sep);
Expand All @@ -78,7 +84,6 @@ class AndroidProjectService implements IPlatformProjectService {
var manifestPath = path.join(projectRoot, "AndroidManifest.xml");
var safeActivityName = this.$projectData.projectName.replace(/\W/g, '');
shell.sed('-i', /__PACKAGE__/, this.$projectData.projectId, manifestPath);
shell.sed('-i', /__ACTIVITY__/, safeActivityName, manifestPath);
shell.sed('-i', /__APILEVEL__/, this.getTarget(projectRoot).wait().split('-')[1], manifestPath);

var stringsFilePath = path.join(projectRoot, 'res', 'values', 'strings.xml');
Expand Down Expand Up @@ -196,13 +201,58 @@ class AndroidProjectService implements IPlatformProjectService {
}
}

private validateAndroidTarget(frameworkDir: string) {
private validateAndroidTarget(frameworkDir: string): string {
var validTarget = this.getTarget(frameworkDir).wait();
var output = this.$childProcess.exec('android list targets').wait();
if (!output.match(validTarget)) {
this.$errors.fail("Please install Android target %s the Android newest SDK). Make sure you have the latest Android tools installed as well. Run \"android\" from your command-line to install/update any missing SDKs or tools.",
validTarget.split('-')[1]);
var installedTargets = this.getInstalledTargets().wait();
var newTarget: string = undefined;
var match = _.contains(installedTargets, validTarget);
if (!match) {
// adjust to the latest available version
newTarget = this.getCompatibleTarget();
if (!newTarget) {
this.$errors.fail("Please install Android target %s. Make sure you have the latest Android tools installed as well." +
" Run \"android\" from your command-line to install/update any missing SDKs or tools.",
validTarget.split('-')[1]);
}
}

return newTarget;
}

private getCompatibleTarget(): string {
Copy link
Copy Markdown
Contributor

@rosen-vladimirov rosen-vladimirov Jan 15, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The return type must be IFuture as you have .wait() in its body.

Copy link
Copy Markdown
Contributor Author

@teobugslayer teobugslayer Jan 16, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shall wait and see (pun intended).

var installedTargets = this.getInstalledTargets().wait();
var compatibleTarget = _(this.SUPPORTED_TARGETS).sort().findLast(supportedTarget => _.contains(installedTargets, supportedTarget));
return compatibleTarget;
}

private updateTarget(projectRoot: string, newTarget: string): IFuture<void> {
return (() => {
var file = path.join(projectRoot, "project.properties");
var editor = this.$propertiesParser.createEditor(file).wait();
editor.set("target", newTarget);
var future = new Future<void>();
editor.save((err:any) => {
if (err) {
future.throw(err);
} else {
this.targetApi = null; // so that later we can repopulate the cache
future.return();
}
});
future.wait();
}).future<void>()();
}

private installedTargetsCache: string[] = null;
private getInstalledTargets(): IFuture<string[]> {
return (() => {
if (!this.installedTargetsCache) {
this.installedTargetsCache = [];
var output = this.$childProcess.exec('android list targets').wait();
output.replace(/id: \d+ or "(.+)"/g, (m:string, p1:string) => (this.installedTargetsCache.push(p1), m));
}
return this.installedTargetsCache;
}).future<string[]>()();
}

private getTarget(projectRoot: string): IFuture<string> {
Expand Down