Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-26426] Remove hardcoded support for xcode >=6 #84

Merged
merged 2 commits into from
Oct 3, 2018
Merged

[TIMOB-26426] Remove hardcoded support for xcode >=6 #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1096172
[TIMOB-26426] Remove hardcoded support for xcode >=6
ewanharris Oct 1, 2018
9da7164
1.7.6
ewanharris Oct 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions lib/xcode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,6 @@ exports.detect = function detect(options, callback) {
globalSimRuntimes = findSimRuntimes('/Library/Developer/CoreSimulator/Profiles/Runtimes'),
xcodes = [];

// since we do not support Xcode 5 and below, weed them out
options.supportedVersions = (options.supportedVersions ? options.supportedVersions + '||' : '') + '>=6.0.0';
Copy link
Contributor

@cb1kenobi cb1kenobi Oct 1, 2018 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can't remove this. We actually use this: https://github.com/appcelerator/titanium_mobile/blob/7505a2937424157b38ad87744cfbb05e8424dba4/iphone/cli/commands/_build.js#L389.

The problem is the ||. We need the equivalent of a &&, but semver does not support &&.

However, there's an easy workaround. Just set a && in the options.supportedVersions, then where supportedVersions is referenced, call your own satisfies(<VERSION>, options.supportedVersions).

function satisfies(ver, ranges) {
    if (!ranges) {
        return true;
    }

    return ranges.split('&&').every(function (range) {
        return appc.version.satisfies(ver, range, true);
    });
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cb1kenobi I can't remember where we landed after chatting, are we fine with taking the risk of someone having xcode 5 installed on their machine?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Last we chatted, we were talking about bumping this to v1.8.0 and creating a 1_8_X branch being that this is a breaking change. I don't think this is a bad idea.

I also was thinking we should add a blockquote in the readme making note that ioslib only supports Xcode 6 or newer.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As rediscussed, this doesn't remove support for 6 but just removes the hardcoding of >=6 support (which was added to avoid blowing up on Xcode 5), the note was already added https://github.com/appcelerator/ioslib/blame/1_7_X/README.md#L7. It's ready whenever you are I guess :)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well then, rock n roll!


async.series([
// build the list of searchPaths
function detectOSXenv(next) {
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ioslib",
"version": "1.7.5",
"version": "1.7.6",
"description": "iOS Utility Library",
"keywords": [
"appcelerator",
Expand Down