Skip to content

Commit da51930

Browse files
authored
Merge pull request kodecocodes#779 from SpacyRicochet/migration/swift4-2_dining-philosophers
[Swift 4.2] Dining Philosophers
2 parents 23fc221 + f2c04f7 commit da51930

File tree

3 files changed

+20
-13
lines changed

3 files changed

+20
-13
lines changed

DiningPhilosophers/DiningPhilosophers.xcodeproj/project.pbxproj

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
/* End PBXBuildFile section */
1212

1313
/* Begin PBXFileReference section */
14+
232D7939216F76F700831A74 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
1415
OBJ_12 /* DiningPhilosophers */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; path = DiningPhilosophers; sourceTree = BUILT_PRODUCTS_DIR; };
1516
OBJ_6 /* Package.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
1617
OBJ_9 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
@@ -27,13 +28,6 @@
2728
/* End PBXFrameworksBuildPhase section */
2829

2930
/* Begin PBXGroup section */
30-
OBJ_10 /* Tests */ = {
31-
isa = PBXGroup;
32-
children = (
33-
);
34-
path = Tests;
35-
sourceTree = "<group>";
36-
};
3731
OBJ_11 /* Products */ = {
3832
isa = PBXGroup;
3933
children = (
@@ -42,15 +36,14 @@
4236
name = Products;
4337
sourceTree = BUILT_PRODUCTS_DIR;
4438
};
45-
OBJ_5 /* */ = {
39+
OBJ_5 = {
4640
isa = PBXGroup;
4741
children = (
42+
232D7939216F76F700831A74 /* README.md */,
4843
OBJ_6 /* Package.swift */,
4944
OBJ_7 /* Sources */,
50-
OBJ_10 /* Tests */,
5145
OBJ_11 /* Products */,
5246
);
53-
name = "";
5447
sourceTree = "<group>";
5548
};
5649
OBJ_7 /* Sources */ = {
@@ -96,6 +89,11 @@
9689
isa = PBXProject;
9790
attributes = {
9891
LastUpgradeCheck = 9999;
92+
TargetAttributes = {
93+
OBJ_13 = {
94+
LastSwiftMigration = 1000;
95+
};
96+
};
9997
};
10098
buildConfigurationList = OBJ_2 /* Build configuration list for PBXProject "DiningPhilosophers" */;
10199
compatibilityVersion = "Xcode 3.2";
@@ -104,7 +102,7 @@
104102
knownRegions = (
105103
en,
106104
);
107-
mainGroup = OBJ_5 /* */;
105+
mainGroup = OBJ_5;
108106
productRefGroup = OBJ_11 /* Products */;
109107
projectDirPath = "";
110108
projectRoot = "";
@@ -139,7 +137,7 @@
139137
SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE;
140138
SWIFT_FORCE_DYNAMIC_LINK_STDLIB = YES;
141139
SWIFT_FORCE_STATIC_LINK_STDLIB = NO;
142-
SWIFT_VERSION = 4.0;
140+
SWIFT_VERSION = 4.2;
143141
TARGET_NAME = DiningPhilosophers;
144142
};
145143
name = Debug;
@@ -157,7 +155,7 @@
157155
SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE;
158156
SWIFT_FORCE_DYNAMIC_LINK_STDLIB = YES;
159157
SWIFT_FORCE_STATIC_LINK_STDLIB = NO;
160-
SWIFT_VERSION = 4.0;
158+
SWIFT_VERSION = 4.2;
161159
TARGET_NAME = DiningPhilosophers;
162160
};
163161
name = Release;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

DiningPhilosophers/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,4 @@ A background DispatchQueue is then used to let any Philosopher run asyncrounosly
5757
Dining Philosophers on Wikipedia https://en.wikipedia.org/wiki/Dining_philosophers_problem
5858

5959
Written for Swift Algorithm Club by Jacopo Mangiavacchi
60+
Swift 4.2 check by Bruno Scheele

0 commit comments

Comments
 (0)