Skip to content

Commit 8990aa0

Browse files
committed
ES6 & strict mode fixes
1 parent 26eaa3e commit 8990aa0

File tree

3 files changed

+73
-85
lines changed

3 files changed

+73
-85
lines changed

lib/services/android-project-service.ts

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
///<reference path="../.d.ts"/>
22
"use strict";
3-
import path = require("path");
4-
import shell = require("shelljs");
5-
import util = require("util");
3+
import * as path from "path";
4+
import * as shell from "shelljs";
65
import Future = require("fibers/future");
7-
import constants = require("../constants");
8-
import helpers = require("../common/helpers");
9-
import fs = require("fs");
10-
import os = require("os");
11-
import semver = require("semver");
12-
13-
import androidProjectPropertiesManagerLib = require("./android-project-properties-manager");
14-
import projectServiceBaseLib = require("./platform-project-service-base");
6+
import * as constants from "../constants";
7+
import * as semver from "semver";
8+
import * as androidProjectPropertiesManagerLib from "./android-project-properties-manager";
9+
import * as projectServiceBaseLib from "./platform-project-service-base";
1510

1611
class AndroidProjectService extends projectServiceBaseLib.PlatformProjectServiceBase implements IPlatformProjectService {
1712
private static MIN_SUPPORTED_VERSION = 17;
@@ -22,7 +17,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
2217
private static VALUES_VERSION_DIRNAME_PREFIX = AndroidProjectService.VALUES_DIRNAME + "-v";
2318
private static ANDROID_PLATFORM_NAME = "android";
2419
private static LIBS_FOLDER_NAME = "libs";
25-
private static MIN_JAVA_VERSION = "1.7.0";
20+
private static MIN_JAVA_VERSION = "1.7.0";
2621

2722
private targetApi: string;
2823
private _androidProjectPropertiesManagers: IDictionary<IAndroidProjectPropertiesManager>;
@@ -57,8 +52,8 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
5752
projectRoot: projectRoot,
5853
deviceBuildOutputPath: path.join(this.$projectData.platformsDir, "android", "bin"),
5954
validPackageNamesForDevice: [
60-
util.format("%s-%s.%s", this.$projectData.projectName, "debug", "apk"),
61-
util.format("%s-%s.%s", this.$projectData.projectName, "release", "apk")
55+
`${this.$projectData.projectName}-debug.apk`,
56+
`${this.$projectData.projectName}-release.apk`
6257
],
6358
frameworkFilesExtensions: [".jar", ".dat", ".so"],
6459
configurationFileName: "AndroidManifest.xml",

0 commit comments

Comments
 (0)