Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 314BA17ABD for ; Thu, 25 Jun 2015 01:08:53 +0000 (UTC) Received: (qmail 9297 invoked by uid 500); 25 Jun 2015 01:08:50 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 9257 invoked by uid 500); 25 Jun 2015 01:08:50 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 8079 invoked by uid 99); 25 Jun 2015 01:08:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Jun 2015 01:08:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5F7CAE364D; Thu, 25 Jun 2015 01:08:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shazron@apache.org To: commits@cordova.apache.org Date: Thu, 25 Jun 2015 01:09:36 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [48/50] ios commit: Merge branch 'master' into 4.0.x Merge branch 'master' into 4.0.x Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/4096f2d4 Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/4096f2d4 Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/4096f2d4 Branch: refs/heads/master Commit: 4096f2d425fa4302e97f996758505dbd283472f0 Parents: 9f24951 5198edb Author: Shazron Abdullah Authored: Wed Jun 17 15:05:19 2015 -0700 Committer: Shazron Abdullah Committed: Wed Jun 17 15:05:19 2015 -0700 ---------------------------------------------------------------------- .ratignore | 6 +++ bin/lib/check_reqs.js | 108 ++++++++++++++++++++++++++++++++++++--------- bin/lib/create.js | 2 +- 3 files changed, 94 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4096f2d4/bin/lib/check_reqs.js ---------------------------------------------------------------------- diff --cc bin/lib/check_reqs.js index 04d7ef9,d1f6333..fe2088c --- a/bin/lib/check_reqs.js +++ b/bin/lib/check_reqs.js @@@ -26,18 -21,19 +21,19 @@@ var Q = require('q') shell = require('shelljs'), versions = require('./versions'); -var XCODEBUILD_MIN_VERSION = '4.6.0'; +var XCODEBUILD_MIN_VERSION = '6.0.0'; + var XCODEBUILD_NOT_FOUND_MESSAGE = + 'Please install version ' + XCODEBUILD_MIN_VERSION + ' or greater from App Store'; -var IOS_SIM_MIN_VERSION = '3.0.0'; +var IOS_SIM_MIN_VERSION = '4.0.0'; - var IOS_SIM_NOT_FOUND_MESSAGE = 'ios-sim was not found. Please download, build and install version ' + IOS_SIM_MIN_VERSION + - ' or greater from https://github.com/phonegap/ios-sim into your path.' + - ' Or \'npm install -g ios-sim\' using node.js: http://nodejs.org'; + var IOS_SIM_NOT_FOUND_MESSAGE = + 'Please download, build and install version ' + IOS_SIM_MIN_VERSION + ' or greater' + + ' from https://github.com/phonegap/ios-sim into your path, or do \'npm install -g ios-sim\''; -var IOS_DEPLOY_MIN_VERSION = '1.4.0'; +var IOS_DEPLOY_MIN_VERSION = '1.7.0'; - var IOS_DEPLOY_NOT_FOUND_MESSAGE = 'ios-deploy was not found. Please download, build and install version ' + IOS_DEPLOY_MIN_VERSION + - ' or greater from https://github.com/phonegap/ios-deploy into your path.' + - ' Or \'npm install -g ios-deploy\' using node.js: http://nodejs.org'; + var IOS_DEPLOY_NOT_FOUND_MESSAGE = + 'Please download, build and install version ' + IOS_DEPLOY_MIN_VERSION + ' or greater' + + ' from https://github.com/phonegap/ios-deploy into your path, or do \'npm install -g ios-deploy\''; /** * Checks if xcode util is available --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org