You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2016/11/09 21:24:14 UTC
[1/2] ios commit: CB-12125 - Unable to emulate on iPad pro iOS 10
Repository: cordova-ios
Updated Branches:
refs/heads/4.3.x 905620c5c -> 6f39bee86
CB-12125 - Unable to emulate on iPad pro iOS 10
Updated ios-sim to 5.0.11
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/6f39bee8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/6f39bee8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/6f39bee8
Branch: refs/heads/4.3.x
Commit: 6f39bee868351fa943f98011b42ddb7b1b64ba39
Parents: 52f046d
Author: Shazron Abdullah <sh...@apache.org>
Authored: Wed Nov 9 13:18:02 2016 -0800
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Wed Nov 9 13:24:09 2016 -0800
----------------------------------------------------------------------
node_modules/ios-sim/package.json | 27 +++++++++++-----------
node_modules/ios-sim/src/lib.js | 42 +++++++++-------------------------
2 files changed, 24 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/6f39bee8/node_modules/ios-sim/package.json
----------------------------------------------------------------------
diff --git a/node_modules/ios-sim/package.json b/node_modules/ios-sim/package.json
index ee4eff9..4698561 100644
--- a/node_modules/ios-sim/package.json
+++ b/node_modules/ios-sim/package.json
@@ -10,24 +10,23 @@
"spec": ">=5.0.9 <6.0.0",
"type": "range"
},
- "/Users/shaz/Documents/git/apache/cordova-ios"
+ "/Users/shazron/Documents/git/apache/cordova-ios"
]
],
"_from": "ios-sim@>=5.0.9 <6.0.0",
- "_id": "ios-sim@5.0.10",
+ "_id": "ios-sim@5.0.11",
"_inCache": true,
- "_installable": true,
"_location": "/ios-sim",
- "_nodeVersion": "6.4.0",
+ "_nodeVersion": "6.7.0",
"_npmOperationalInternal": {
- "host": "packages-12-west.internal.npmjs.com",
- "tmp": "tmp/ios-sim-5.0.10.tgz_1477689260971_0.715323437936604"
+ "host": "packages-18-east.internal.npmjs.com",
+ "tmp": "tmp/ios-sim-5.0.11.tgz_1478726052548_0.9803785821422935"
},
"_npmUser": {
"name": "shazron",
"email": "shazron@gmail.com"
},
- "_npmVersion": "3.10.3",
+ "_npmVersion": "3.10.8",
"_phantomChildren": {
"abbrev": "1.0.9"
},
@@ -44,11 +43,11 @@
"#USER",
"/"
],
- "_resolved": "https://registry.npmjs.org/ios-sim/-/ios-sim-5.0.10.tgz",
- "_shasum": "73e59d5438ee3b7303b4d85c0c7fdc0ddf89b491",
+ "_resolved": "https://registry.npmjs.org/ios-sim/-/ios-sim-5.0.11.tgz",
+ "_shasum": "e2371fcd34f7c7a1fb3512ed8d55f92324ae83dd",
"_shrinkwrap": null,
"_spec": "ios-sim@^5.0.9",
- "_where": "/Users/shaz/Documents/git/apache/cordova-ios",
+ "_where": "/Users/shazron/Documents/git/apache/cordova-ios",
"author": {
"name": "Shazron Abdullah"
},
@@ -72,13 +71,13 @@
},
"directories": {},
"dist": {
- "shasum": "73e59d5438ee3b7303b4d85c0c7fdc0ddf89b491",
- "tarball": "https://registry.npmjs.org/ios-sim/-/ios-sim-5.0.10.tgz"
+ "shasum": "e2371fcd34f7c7a1fb3512ed8d55f92324ae83dd",
+ "tarball": "https://registry.npmjs.org/ios-sim/-/ios-sim-5.0.11.tgz"
},
"engines": {
"node": ">=0.10.0"
},
- "gitHead": "4ba9e430c3440625aa0aa26d7227e01c54e8f499",
+ "gitHead": "2a42ca18280aeb9919fda3983f1bb7065541afd9",
"homepage": "https://github.com/phonegap/ios-sim#readme",
"keywords": [
"ios-sim",
@@ -120,5 +119,5 @@
"posttest": "npm run jshint",
"test": "npm run jasmine"
},
- "version": "5.0.10"
+ "version": "5.0.11"
}
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/6f39bee8/node_modules/ios-sim/src/lib.js
----------------------------------------------------------------------
diff --git a/node_modules/ios-sim/src/lib.js b/node_modules/ios-sim/src/lib.js
index 28efdf7..499003c 100644
--- a/node_modules/ios-sim/src/lib.js
+++ b/node_modules/ios-sim/src/lib.js
@@ -264,36 +264,6 @@ var lib = {
var name_id_map = {};
list.devicetypes.forEach(function(device) {
- name_id_map[ device.name ] = device.id;
- });
-
- list = [];
- var remove = function(runtime) {
- // remove "iOS" prefix in runtime, remove prefix "com.apple.CoreSimulator.SimDeviceType." in id
- list.push(util.format('%s, %s', name_id_map[ deviceName ].replace(/^com.apple.CoreSimulator.SimDeviceType./, ''), runtime.replace(/^iOS /, '')));
- };
-
- for (var deviceName in druntimes) {
- var runtimes = druntimes[ deviceName ];
-
- if (!(deviceName in name_id_map)) {
- continue;
- }
- runtimes.forEach(remove);
- }
- return list;
- },
- //jscs:enable disallowUnusedParams
-
- //jscs:disable disallowUnusedParams
- showdevicetypes: function(args) {
- var options = { silent: true };
- var list = simctl.list(options).json;
-
- var druntimes = findRuntimesGroupByDeviceProperty(list, 'name', true);
- var name_id_map = {};
-
- list.devicetypes.forEach(function(device) {
// replace hyphens in iPad Pro name which differ in 'Device Types' and 'Devices'
if (device.name.indexOf('iPad Pro') === 0) {
device.name = device.name.replace(/\-/g, ' ').trim();
@@ -301,9 +271,10 @@ var lib = {
name_id_map[ device.name ] = device.id;
});
+ list = [];
var remove = function(runtime) {
// remove "iOS" prefix in runtime, remove prefix "com.apple.CoreSimulator.SimDeviceType." in id
- console.log(util.format('%s, %s', name_id_map[ deviceName ].replace(/^com.apple.CoreSimulator.SimDeviceType./, ''), runtime.replace(/^iOS /, '')));
+ list.push(util.format('%s, %s', name_id_map[ deviceName ].replace(/^com.apple.CoreSimulator.SimDeviceType./, ''), runtime.replace(/^iOS /, '')));
};
for (var deviceName in druntimes) {
@@ -319,6 +290,15 @@ var lib = {
}
runtimes.forEach(remove);
}
+ return list;
+ },
+ //jscs:enable disallowUnusedParams
+
+ //jscs:disable disallowUnusedParams
+ showdevicetypes: function(args) {
+ this.getdevicetypes().forEach(function(device){
+ console.log(device);
+ });
},
//jscs:enable disallowUnusedParams
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] ios commit: Updated ios-sim to version 5.0.10
Posted by sh...@apache.org.
Updated ios-sim to version 5.0.10
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/52f046da
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/52f046da
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/52f046da
Branch: refs/heads/4.3.x
Commit: 52f046da7ffa555d48e8b0c52653c8ed4d542b36
Parents: 905620c
Author: Shazron Abdullah <sh...@apache.org>
Authored: Fri Oct 28 14:36:57 2016 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Wed Nov 9 13:24:09 2016 -0800
----------------------------------------------------------------------
node_modules/ios-sim/.travis.yml | 15 +++++----
node_modules/ios-sim/appveyor.yml | 7 ++++
node_modules/ios-sim/package.json | 60 +++++++++++++++++++++++++++++++---
node_modules/ios-sim/src/lib.js | 9 +++++
4 files changed, 80 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/52f046da/node_modules/ios-sim/.travis.yml
----------------------------------------------------------------------
diff --git a/node_modules/ios-sim/.travis.yml b/node_modules/ios-sim/.travis.yml
index 16c4f1b..30150ba 100644
--- a/node_modules/ios-sim/.travis.yml
+++ b/node_modules/ios-sim/.travis.yml
@@ -3,11 +3,14 @@ sudo: false
git:
depth: 10
node_js:
- - "0.10"
- - "0.12"
- - "4.2"
+- '0.10'
+- '0.12'
+- '4'
+- '6'
install:
- - npm install
-
+- npm install
script:
- - "npm test"
\ No newline at end of file
+- npm test
+notifications:
+ slack:
+ secure: gn0YH0MCFOYR3Dd8Vsx3K/J9G0aazhnRjQVfqbeRKN3f6vToKif1CxhiDLXI6cxEB5DBiAtpK58jkoDYrXoNLGuSbiTHBJ+ankU8aG3s0OTIHa/8I0TjRKjBRc0PrMV7n7EiLC6LQxNe0x0mMSE1gdOUeS1UrZ5ZiVrS1u0eHHs=
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/52f046da/node_modules/ios-sim/appveyor.yml
----------------------------------------------------------------------
diff --git a/node_modules/ios-sim/appveyor.yml b/node_modules/ios-sim/appveyor.yml
index c9b8cf9..14b9f99 100644
--- a/node_modules/ios-sim/appveyor.yml
+++ b/node_modules/ios-sim/appveyor.yml
@@ -1,7 +1,14 @@
# appveyor file
# http://www.appveyor.com/docs/appveyor-yml
+environment:
+ matrix:
+ - nodejs_version: "0.10"
+ - nodejs_version: "0.12"
+ - nodejs_version: "4"
+ - nodejs_version: "6"
install:
+ - ps: Install-Product node $env:nodejs_version
- npm install
build: off
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/52f046da/node_modules/ios-sim/package.json
----------------------------------------------------------------------
diff --git a/node_modules/ios-sim/package.json b/node_modules/ios-sim/package.json
index b70f2cc..ee4eff9 100644
--- a/node_modules/ios-sim/package.json
+++ b/node_modules/ios-sim/package.json
@@ -1,4 +1,54 @@
{
+ "_args": [
+ [
+ {
+ "raw": "ios-sim@^5.0.9",
+ "scope": null,
+ "escapedName": "ios-sim",
+ "name": "ios-sim",
+ "rawSpec": "^5.0.9",
+ "spec": ">=5.0.9 <6.0.0",
+ "type": "range"
+ },
+ "/Users/shaz/Documents/git/apache/cordova-ios"
+ ]
+ ],
+ "_from": "ios-sim@>=5.0.9 <6.0.0",
+ "_id": "ios-sim@5.0.10",
+ "_inCache": true,
+ "_installable": true,
+ "_location": "/ios-sim",
+ "_nodeVersion": "6.4.0",
+ "_npmOperationalInternal": {
+ "host": "packages-12-west.internal.npmjs.com",
+ "tmp": "tmp/ios-sim-5.0.10.tgz_1477689260971_0.715323437936604"
+ },
+ "_npmUser": {
+ "name": "shazron",
+ "email": "shazron@gmail.com"
+ },
+ "_npmVersion": "3.10.3",
+ "_phantomChildren": {
+ "abbrev": "1.0.9"
+ },
+ "_requested": {
+ "raw": "ios-sim@^5.0.9",
+ "scope": null,
+ "escapedName": "ios-sim",
+ "name": "ios-sim",
+ "rawSpec": "^5.0.9",
+ "spec": ">=5.0.9 <6.0.0",
+ "type": "range"
+ },
+ "_requiredBy": [
+ "#USER",
+ "/"
+ ],
+ "_resolved": "https://registry.npmjs.org/ios-sim/-/ios-sim-5.0.10.tgz",
+ "_shasum": "73e59d5438ee3b7303b4d85c0c7fdc0ddf89b491",
+ "_shrinkwrap": null,
+ "_spec": "ios-sim@^5.0.9",
+ "_where": "/Users/shaz/Documents/git/apache/cordova-ios",
"author": {
"name": "Shazron Abdullah"
},
@@ -22,13 +72,13 @@
},
"directories": {},
"dist": {
- "shasum": "c5f111f0776f0077bec7f9cba724aa97db0abf8d",
- "tarball": "https://registry.npmjs.org/ios-sim/-/ios-sim-5.0.9.tgz"
+ "shasum": "73e59d5438ee3b7303b4d85c0c7fdc0ddf89b491",
+ "tarball": "https://registry.npmjs.org/ios-sim/-/ios-sim-5.0.10.tgz"
},
"engines": {
"node": ">=0.10.0"
},
- "gitHead": "0617a824b9f1cf590fc8683952fac20aa0c30dce",
+ "gitHead": "4ba9e430c3440625aa0aa26d7227e01c54e8f499",
"homepage": "https://github.com/phonegap/ios-sim#readme",
"keywords": [
"ios-sim",
@@ -70,5 +120,5 @@
"posttest": "npm run jshint",
"test": "npm run jasmine"
},
- "version": "5.0.9"
-}
\ No newline at end of file
+ "version": "5.0.10"
+}
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/52f046da/node_modules/ios-sim/src/lib.js
----------------------------------------------------------------------
diff --git a/node_modules/ios-sim/src/lib.js b/node_modules/ios-sim/src/lib.js
index 53c537a..28efdf7 100644
--- a/node_modules/ios-sim/src/lib.js
+++ b/node_modules/ios-sim/src/lib.js
@@ -294,6 +294,10 @@ var lib = {
var name_id_map = {};
list.devicetypes.forEach(function(device) {
+ // replace hyphens in iPad Pro name which differ in 'Device Types' and 'Devices'
+ if (device.name.indexOf('iPad Pro') === 0) {
+ device.name = device.name.replace(/\-/g, ' ').trim();
+ }
name_id_map[ device.name ] = device.id;
});
@@ -305,6 +309,11 @@ var lib = {
for (var deviceName in druntimes) {
var runtimes = druntimes[ deviceName ];
+ // replace hyphens in iPad Pro name which differ in 'Device Types' and 'Devices'
+ if (deviceName.indexOf('iPad Pro') === 0) {
+ deviceName = deviceName.replace(/\-/g, ' ').trim();
+ }
+
if (!(deviceName in name_id_map)) {
continue;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org