Skip to content

Commit eae31e3

Browse files
committed
Merge pull request #1715 from NativeScript/kerezov/osx-error-messaging
Remove semver validation for CocoaPods version string
2 parents 6c8ceef + d5af505 commit eae31e3

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ sudo ruby -e "$(curl -fsSL https://raw.githubusercontent.com/NativeScript/native
153153
* For iOS development
154154
* [Latest Xcode][12]
155155
* [Xcode command-line tools][12]
156-
* [xcodeproj ruby gem][13]
157-
* (Optional) [CocoaPods 0.38.2][CocoaPods 0.38.2]
158-
* (Optional) [Xcproj][Xcproj]
156+
* [xcodeproj ruby gem][13] - can be installed by running `$ [sudo] gem install xcodeproj` in the terminal
157+
* (Optional) [CocoaPods][CocoaPods]
158+
* (Optional) [xcproj][xcproj] - you only need this command line tool in case you have Xcode 7.3 or later installed and CocoaPods 0.39.0 or earlier. `xcproj` can either be installed by running `$ brew install xcproj` in the terminal, or by building it manually with xcodebuild
159159
* For Android development
160160
* [JDK 8][JDK 8] or a later stable official release
161161
* [Android SDK 22][Android SDK 22] or a later stable official release
@@ -608,8 +608,8 @@ This software is licensed under the Apache 2.0 license, quoted <a href="LICENSE"
608608
[JDK 8]: http://www.oracle.com/technetwork/java/javase/downloads/index.html
609609
[Android SDK 22]: http://developer.android.com/sdk/index.html
610610
[Genymotion]: https://www.genymotion.com/#!/
611-
[CocoaPods 0.38.2]: https://guides.cocoapods.org/using/getting-started.html#getting-started
612-
[Xcproj]: https://github.com/0xced/xcproj#installation
611+
[CocoaPods]: https://guides.cocoapods.org/using/getting-started.html#getting-started
612+
[xcproj]: https://github.com/0xced/xcproj#installation
613613
[Android SDK Build-tools 23.0.0]: http://developer.android.com/sdk/index.html
614614
[Local Maven repository for Support Libraries]: http://developer.android.com/sdk/index.html
615615
![](https://ga-beacon.appspot.com/UA-111455-24/nativescript/nativescript-cli?pixel)

lib/services/doctor-service.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,6 @@ class DoctorService implements IDoctorService {
8989
}
9090
}
9191

92-
if (sysInfo.cocoapodVer && semver.valid(sysInfo.cocoapodVer) === null) {
93-
this.$logger.warn(`WARNING: Your current CocoaPods version is not a valid semver string.`);
94-
this.$logger.out("You will not be able to build your projects for iOS if they contain plugin with CocoaPod file." + EOL
95-
+ `To be able to build such projects, verify that you have installed a CocoaPods version which is a valid semver string and is at least ${DoctorService.MIN_SUPPORTED_POD_VERSION}.`);
96-
result = true;
97-
}
98-
9992
if (sysInfo.cocoapodVer && semver.valid(sysInfo.cocoapodVer) && semver.lt(sysInfo.cocoapodVer, DoctorService.MIN_SUPPORTED_POD_VERSION)) {
10093
this.$logger.warn(`WARNING: Your current CocoaPods version is earlier than ${DoctorService.MIN_SUPPORTED_POD_VERSION}.`);
10194
this.$logger.out("You will not be able to build your projects for iOS if they contain plugin with CocoaPod file." + EOL

0 commit comments

Comments
 (0)