Skip to content

Commit 314b611

Browse files
authored
Merge branch 'master' into feature/inject-environment-variables
2 parents c61fc53 + 25a6142 commit 314b611

File tree

7 files changed

+590
-66
lines changed

7 files changed

+590
-66
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ Don't forget to check out the [README](https://github.com/phonegap/ios-sim/blob/
1717

1818
Please run the commands below in your Terminal.app and include it in the issue. Check when done and include results below.
1919

20-
- [ ] 1. sw_vers -productVersion
20+
- [ ] 1. system_profiler SPSoftwareDataType
2121
- [ ] 2. ios-sim --version
2222
- [ ] 3. xcodebuild -version
2323
- [ ] 4. xcode-select --print-path
24-
- [ ] 5. gcc --version
24+
- [ ] 5. node --version

.travis.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@ sudo: false
33
git:
44
depth: 10
55
node_js:
6-
- "0.10"
7-
- "0.12"
8-
- "4.2"
6+
- '0.10'
7+
- '0.12'
8+
- '4'
9+
- '6'
910
install:
10-
- npm install
11-
11+
- npm install
1212
script:
13-
- "npm test"
13+
- npm test
14+
notifications:
15+
slack:
16+
secure: gn0YH0MCFOYR3Dd8Vsx3K/J9G0aazhnRjQVfqbeRKN3f6vToKif1CxhiDLXI6cxEB5DBiAtpK58jkoDYrXoNLGuSbiTHBJ+ankU8aG3s0OTIHa/8I0TjRKjBRc0PrMV7n7EiLC6LQxNe0x0mMSE1gdOUeS1UrZ5ZiVrS1u0eHHs=

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
ios-sim
55
=======
66

7-
Supports Xcode 6 only since version 3.x.
7+
Supports Xcode 8 and greater only since version 5.x.
88

99
The ios-sim tool is a command-line utility that launches an iOS application on the iOS Simulator. This allows for niceties such as automated testing without having to open Xcode.
1010

appveyor.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
# appveyor file
22
# http://www.appveyor.com/docs/appveyor-yml
3+
environment:
4+
matrix:
5+
- nodejs_version: "0.10"
6+
- nodejs_version: "0.12"
7+
- nodejs_version: "4"
8+
- nodejs_version: "6"
39

410
install:
11+
- ps: Install-Product node $env:nodejs_version
512
- npm install
613

714
build: off

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "ios-sim",
3-
"version": "5.0.8",
3+
"version": "5.1.0",
44
"preferGlobal": "true",
5-
"description": "launch iOS apps into the iOS Simulator from the command line (Xcode 6.0+)",
5+
"description": "launch iOS apps into the iOS Simulator from the command line (Xcode 7.0+)",
66
"main": "ios-sim.js",
77
"repository": {
88
"type": "git",
@@ -25,7 +25,7 @@
2525
"license": "MIT",
2626
"dependencies": {
2727
"plist": "^1.2.0",
28-
"simctl": "^0.0.9",
28+
"simctl": "^1.0.0",
2929
"nopt": "1.0.9",
3030
"bplist-parser": "^0.0.6"
3131
},

0 commit comments

Comments
 (0)