Skip to content
This repository was archived by the owner on Feb 2, 2021. It is now read-only.

Commit e251fdb

Browse files
Merge pull request #289 from telerik/vladimirov/merge-rel-in-master-pre0.10
Merge release in master (for 0.10.0)
2 parents 9be0d8c + 92eec8c commit e251fdb

File tree

3 files changed

+46
-4
lines changed

3 files changed

+46
-4
lines changed

definitions/minimatch.d.ts

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
///<reference path="./node.d.ts"/>
2+
3+
declare module minimatch {
4+
export interface Options {
5+
debug?: boolean;
6+
nobrace?: boolean;
7+
noglobstar?: boolean;
8+
dot?: boolean;
9+
noext?: boolean;
10+
nonull?: boolean;
11+
nocase?: boolean;
12+
matchBase?: boolean;
13+
nocomment?: boolean;
14+
nonegate?: boolean;
15+
flipNegate?: boolean;
16+
}
17+
18+
export interface Minimatch {
19+
constructor(pattern: string, options: Options): Minimatch;
20+
pattern: string;
21+
options: Options;
22+
regexp: RegExp;
23+
set: any[][];
24+
negate: boolean;
25+
comment: boolean;
26+
empty: boolean;
27+
makeRe(): RegExp;
28+
match(path: string): boolean;
29+
}
30+
31+
export interface IMinimatch {
32+
(path: string, pattern: string, options?: Options): boolean;
33+
filter(pattern: string, options?: Options): (path: string) => boolean;
34+
match(fileList: string[], pattern: string, options?: Options): string[];
35+
makeRe(pattern: string, options?: Options): RegExp;
36+
37+
Minimatch: minimatch.Minimatch;
38+
}
39+
}
40+
41+
declare var minimatch: minimatch.IMinimatch;
42+
43+
declare module "minimatch" {
44+
export = minimatch;
45+
}

helpers.ts

-3
Original file line numberDiff line numberDiff line change
@@ -116,16 +116,13 @@ export function getPathToAdb(injector: IInjector): IFuture<string> {
116116
var logger: ILogger = injector.resolve("logger");
117117
var staticConfig: Config.IStaticConfig = injector.resolve("staticConfig");
118118

119-
var warningMessage = util.format("Unable to find adb in PATH. Default one from %s resources will be used.", staticConfig.CLIENT_NAME.toLowerCase());
120119
var proc = childProcess.spawnFromEvent("adb", ["version"], "exit", undefined, { throwError: false }).wait();
121120

122121
if(proc.stderr) {
123-
logger.warn(warningMessage);
124122
return staticConfig.adbFilePath;
125123
}
126124
} catch(e) {
127125
if(e.code === "ENOENT") {
128-
logger.warn(warningMessage);
129126
return staticConfig.adbFilePath;
130127
}
131128
}

mobile/android/android-device.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export class AndroidDevice implements Mobile.IAndroidDevice {
3838
private static REFRESH_WEB_VIEW_INTENT_NAME = "com.telerik.RefreshWebView";
3939
private static CHANGE_LIVESYNC_URL_INTENT_NAME = "com.telerik.ChangeLiveSyncUrl";
4040
private static LIVESYNC_BROADCAST_NAME = "com.telerik.LiveSync";
41-
private static CHECK_LIVESYNC_INTENT_NAME = "com.telerik.IsLiveSyncSupported"
41+
private static CHECK_LIVESYNC_INTENT_NAME = "com.telerik.IsLiveSyncSupported";
4242

4343
private static ENV_DEBUG_IN_FILENAME = "envDebug.in";
4444
private static ENV_DEBUG_OUT_FILENAME = "envDebug.out";

0 commit comments

Comments
 (0)