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

Update for Xcode 9 / Swift 4 #2

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update for Xcode 9 / Swift 4 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
affc996
update for Swift 4 and XCode 9 compatibility
Jan 10, 2018
15670b7
update for Xcode 9/Swift 4
CaleyD Jan 10, 2018
5a8def0
Add readme to project so its visible in xcode
Jan 10, 2018
803d90b
Merge branch 'master' of https://github.com/CaleyD/gilded-rose-swift
Jan 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions GildedRose.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
177585EB20069D7C0057D202 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
E2F4C30B1B956315003632EA /* GildedRose.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GildedRose.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E2F4C3101B956315003632EA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
E2F4C3151B956316003632EA /* GildedRoseTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GildedRoseTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -55,6 +56,7 @@
E2F4C3011B956315003632EA = {
isa = PBXGroup;
children = (
177585EB20069D7C0057D202 /* README.md */,
E2F4C30D1B956315003632EA /* GildedRose */,
E2F4C3191B956316003632EA /* GildedRoseTests */,
E2F4C30C1B956315003632EA /* Products */,
Expand Down Expand Up @@ -321,6 +323,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -340,6 +343,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.tomheinan.GildedRose;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand All @@ -351,6 +355,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.tomheinan.GildedRoseTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -362,6 +367,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.tomheinan.GildedRoseTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand All @@ -384,6 +390,7 @@
E2F4C3211B956316003632EA /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
E2F4C3221B956316003632EA /* Build configuration list for PBXNativeTarget "GildedRoseTests" */ = {
isa = XCConfigurationList;
Expand All @@ -392,6 +399,7 @@
E2F4C3241B956316003632EA /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
Expand Down
2 changes: 1 addition & 1 deletion GildedRose/GildedRose.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

public class GildedRose {

public static func updateQuality(items: Array<Item>) -> [Item] {
public static func updateQuality(_ items: [Item]) -> [Item] {
var items = items
for i in 0 ..< items.count {
if items[i].name != "Aged Brie" && items[i].name != "Backstage passes to a TAFKAL80ETC concert" {
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cd gilded-rose-swift
open GildedRose.xcodeproj/
```

The master branch contains the starting point for the exercise. You'll need Xcode 7 to run the tests (and you can run them with the **&#x2318;U** shortcut by default).
The master branch contains the starting point for the exercise. You'll need Xcode 9 to run the tests (and you can run them with the **&#x2318;U** shortcut by default).

## Original Text

Expand Down