Merge pull request #207 from feons/TIMOB-18351

[TIMOB-18351] Deprecate iOS and Android modules in node-appc Backport
tidev · Apr 8, 2015 · b82a909 · b82a909
2 parents ab4418a + 35a4022
commit b82a909
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/hooks/tisdk3fixes.js b/hooks/tisdk3fixes.js
@@ -64,6 +64,12 @@ exports.init = function (logger, config, cli, appc) {
 					data.command.platform.options['deploy-type'].values = ['production'];
 			}
 		}
+		if (appc.version.lt(sdk, '3.2.0')) {
+			logger.log('');
+			logger.warn(__('Titanium ' + sdk + ' has been deprecated and will not work with future releases.'));
+			logger.warn(__('Please use Titanium 3.2 or newer.'));
+
+		}
 	});
 
 	// Titanium SDK 3.3.x and older does not support Xcode 6, so we try to remove it as if it never existed

diff --git a/lib/commands/info.js b/lib/commands/info.js
@@ -361,9 +361,9 @@ exports.run = function (logger, config, cli, finished) {
 					// legacy warning
 					logger.log(
 						appc.string.wrap(
-							__('NOTE: The following Android information has been detected using the old environment detection logic. To display more accurate information, install and select a Titanium SDK 3.2 or newer.'),
+							__('NOTE: The following Android information has been determined using deprecated detection logic. To display more accurate information, install and select a Titanium SDK 3.2 or newer.'),
 							config.get('cli.width', 100)
-						).magenta + '\n'
+						).yellow + '\n'
 					);
 
 					logger.log(styleHeading(__('Android SDK')) + '\n' +
@@ -479,9 +479,9 @@ exports.run = function (logger, config, cli, finished) {
 
 					logger.log(
 						appc.string.wrap(
-							__('NOTE: The following Xcode and iOS information has been detected using the old environment detection logic. To display more accurate information, install and select a Titanium SDK 3.2 or newer.'),
+							__('NOTE: The following Xcode and iOS information has been determined using deprecated detection logic. To display more accurate information, install and select a Titanium SDK 3.2 or newer.'),
 							config.get('cli.width', 100)
-						).magenta + '\n'
+						).yellow + '\n'
 					);
 
 					// Xcode

diff --git a/lib/commands/sdk.js b/lib/commands/sdk.js
@@ -446,6 +446,11 @@ SdkSubcommands.select = {
 					logger.error(__('Invalid Titanium SDK "%s"', value));
 					return false;
 				}
+				if (appc.version.lt(value, '3.2.0')) {
+					logger.log('');
+					logger.warn(__('Titanium SDK ' + value + ' has been deprecated and will not work with future releases.'));
+					logger.warn(__('Please use Titanium SDK 3.2 or newer.'));
+				}
 				return true;
 			}
 		}).prompt(function (err, value) {