Skip to content

Commit 735a76a

Browse files
Remove lodash from global object
When CLI require's ios-sim-portable, it already had added lodash in the global object. So ios-sim-portable resets it to the version specified in its own package.json, so CLI's code will no longer work. Do not use the _ from the global object - require it in each file instead.
1 parent 4506d63 commit 735a76a

10 files changed

+15
-1
lines changed

lib/ios-sim.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
///<reference path="./.d.ts"/>
22
"use strict";
3-
global._ = require("lodash");
3+
4+
import * as _ from "lodash";
45

56
import Fiber = require("fibers");
67
import Future = require("fibers/future");

lib/iphone-interop-simulator-base.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import * as os from "os";
1010
import * as path from "path";
1111
import * as util from "util";
1212
import * as utils from "./utils";
13+
import * as _ from "lodash";
14+
1315
let $ = require("nodobjc");
1416
import {IPhoneSimulatorNameGetter} from "./iphone-simulator-name-getter";
1517

lib/iphone-simulator-common.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import * as fs from "fs";
77
import * as path from "path";
88
import * as os from "os";
99
import xcode = require("./xcode");
10+
import * as _ from "lodash";
11+
1012
let bplistParser = require("bplist-parser");
1113
let plist = require("plist");
1214
let osenv = require("osenv");

lib/iphone-simulator-xcode-5.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import Future = require("fibers/future");
66
import options = require("./options");
77
import utils = require("./utils");
88
import util = require("util");
9+
import * as _ from "lodash";
910

1011
var $ = require("nodobjc");
1112

lib/iphone-simulator-xcode-6.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import * as fs from "fs";
1010
import * as path from "path";
1111
import * as util from "util";
1212
import * as os from "os";
13+
import * as _ from "lodash";
14+
1315
import common = require("./iphone-simulator-common");
1416
import { Simctl } from "./simctl";
1517
let $ = require("nodobjc");

lib/iphone-simulator-xcode-7.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { Simctl } from "./simctl";
1111
import util = require("util");
1212
import utils = require("./utils");
1313
import xcode = require("./xcode");
14+
import * as _ from "lodash";
1415

1516
import {IPhoneSimulatorNameGetter} from "./iphone-simulator-name-getter";
1617

lib/iphone-simulator.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import xcode7SimulatorLib = require("./iphone-simulator-xcode-7");
1616
import xcode6SimulatorLib = require("./iphone-simulator-xcode-6");
1717
import xcode5SimulatorLib = require("./iphone-simulator-xcode-5");
1818

19+
import * as _ from "lodash";
20+
1921
var $ = require("nodobjc");
2022

2123
export class iPhoneSimulator implements IiPhoneSimulator {

lib/options.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/options.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"use strict";
33

44
var yargs = require("yargs");
5+
import * as _ from "lodash";
56

67
class OptionType {
78
public static String = "string";

lib/simctl.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import childProcess = require("./child-process");
55
import future = require("fibers/future");
66
import errors = require("./errors");
77
import options = require("./options");
8+
import * as _ from "lodash";
89

910
export class Simctl implements ISimctl {
1011

0 commit comments

Comments
 (0)