From 1f5e1b0450410a01da022bed21c7ad0908228109 Mon Sep 17 00:00:00 2001 From: Lucas Bento Date: Tue, 19 Nov 2019 08:35:59 -0300 Subject: [PATCH 1/3] Update Xcode version and change wording of supported --- packages/cli/src/commands/doctor/doctor.ts | 6 ++---- packages/cli/src/commands/doctor/versionRanges.ts | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/cli/src/commands/doctor/doctor.ts b/packages/cli/src/commands/doctor/doctor.ts index e1bbde0fe..94c22c20e 100644 --- a/packages/cli/src/commands/doctor/doctor.ts +++ b/packages/cli/src/commands/doctor/doctor.ts @@ -36,7 +36,7 @@ const printIssue = ({ : chalk.yellow('●') : chalk.green('✓'); - const descriptionToShow = description ? `- ${description}` : ''; + const descriptionToShow = description ? ` - ${description}` : ''; logger.log(` ${symbol} ${label}${descriptionToShow}`); @@ -46,9 +46,7 @@ const printIssue = ({ if (cleanedVersionRange) { logMessage(`- Version found: ${chalk.red(versionToShow)}`); - logMessage( - `- Minimum version required: ${chalk.green(cleanedVersionRange)}`, - ); + logMessage(`- Version supported: ${chalk.green(cleanedVersionRange)}`); return; } diff --git a/packages/cli/src/commands/doctor/versionRanges.ts b/packages/cli/src/commands/doctor/versionRanges.ts index d67496bd6..183438eb4 100644 --- a/packages/cli/src/commands/doctor/versionRanges.ts +++ b/packages/cli/src/commands/doctor/versionRanges.ts @@ -8,5 +8,5 @@ export default { ANDROID_SDK: '>= 26.x', ANDROID_NDK: '>= 19.x', // iOS - XCODE: '10.x', + XCODE: '11.x', }; From f7e28b684b68f0243c38c45e8b2697dffb0710bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Tue, 19 Nov 2019 13:15:31 +0100 Subject: [PATCH 2/3] set supported range to >= 10 --- packages/cli/src/commands/doctor/versionRanges.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/src/commands/doctor/versionRanges.ts b/packages/cli/src/commands/doctor/versionRanges.ts index 183438eb4..dbcfa6017 100644 --- a/packages/cli/src/commands/doctor/versionRanges.ts +++ b/packages/cli/src/commands/doctor/versionRanges.ts @@ -8,5 +8,5 @@ export default { ANDROID_SDK: '>= 26.x', ANDROID_NDK: '>= 19.x', // iOS - XCODE: '11.x', + XCODE: '>= 10.x', }; From d94f43620d7590296b878c621a2dd7f01a579e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Tue, 19 Nov 2019 13:21:16 +0100 Subject: [PATCH 3/3] adjust message --- packages/cli/src/commands/doctor/doctor.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/cli/src/commands/doctor/doctor.ts b/packages/cli/src/commands/doctor/doctor.ts index 94c22c20e..79638a161 100644 --- a/packages/cli/src/commands/doctor/doctor.ts +++ b/packages/cli/src/commands/doctor/doctor.ts @@ -1,6 +1,5 @@ import chalk from 'chalk'; import {logger} from '@react-native-community/cli-tools'; -import semver from 'semver'; import {getHealthchecks, HEALTHCHECK_TYPES} from './healthchecks'; import {getLoader} from '../../tools/loader'; import printFixOptions, {KEYS} from './printFixOptions'; @@ -42,14 +41,11 @@ const printIssue = ({ if (needsToBeFixed && versionRange) { const versionToShow = version && version !== 'Not Found' ? version : 'N/A'; - const cleanedVersionRange = semver.valid(semver.coerce(versionRange)!); - if (cleanedVersionRange) { - logMessage(`- Version found: ${chalk.red(versionToShow)}`); - logMessage(`- Version supported: ${chalk.green(cleanedVersionRange)}`); + logMessage(`- Version found: ${chalk.red(versionToShow)}`); + logMessage(`- Version supported: ${chalk.green(versionRange)}`); - return; - } + return; } };