Skip to content

Commit 9ad55ca

Browse files
authoredAug 28, 2017
Merge pull request kodecocodes#605 from remlostime/quick-sort-fail-fix
[Bug] Fix build error
2 parents 1eb05ba + da7b056 commit 9ad55ca

File tree

6 files changed

+24
-18
lines changed

6 files changed

+24
-18
lines changed
 

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ script:
3232
- xcodebuild test -project ./Minimum\ Spanning\ Tree\ \(Unweighted\)/Tests/Tests.xcodeproj -scheme Tests
3333
- xcodebuild test -project ./Priority\ Queue/Tests/Tests.xcodeproj -scheme Tests
3434
- xcodebuild test -project ./Queue/Tests/Tests.xcodeproj -scheme Tests
35-
- xcodebuild test -project ./Quicksort/Tests/Tests(quicksort).xcodeproj -scheme Tests(quicksort)
35+
- xcodebuild test -project ./Quicksort/Tests/Tests-Quicksort.xcodeproj -scheme Tests-Quicksort
3636
- xcodebuild test -project ./Radix\ Sort/Tests/Tests.xcodeproj -scheme Tests
3737
- xcodebuild test -project ./Rootish\ Array\ Stack/Tests/Tests.xcodeproj -scheme Tests
3838
- xcodebuild test -project ./Select\ Minimum\ Maximum/Tests/Tests.xcodeproj -scheme Tests

‎Quicksort/Tests/QuicksortTests.swift

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
import XCTest
22

33
class QuicksortTests: XCTestCase {
4+
func testSwift4() {
5+
// last checked with Xcode 9.0b4
6+
#if swift(>=4.0)
7+
print("Hello, Swift 4!")
8+
#endif
9+
}
10+
411
func testQuicksort() {
512
checkSortAlgorithm(quicksort)
613
}

‎Quicksort/Tests/Tests(quicksort).xcodeproj/project.pbxproj ‎Quicksort/Tests/Tests-Quicksort.xcodeproj/project.pbxproj

+12-10
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
/* End PBXBuildFile section */
1414

1515
/* Begin PBXFileReference section */
16-
7B2BBC801C779D720067B71D /* Tests(quicksort).xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests(quicksort).xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
16+
7B2BBC801C779D720067B71D /* Tests-Quicksort.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests-Quicksort.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
1717
7B2BBC941C779E7B0067B71D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; };
1818
7B80C3E51C77A4CA003CECC7 /* Quicksort.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Quicksort.swift; path = ../Quicksort.swift; sourceTree = SOURCE_ROOT; };
1919
7B80C3E71C77A4D0003CECC7 /* QuicksortTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QuicksortTests.swift; sourceTree = SOURCE_ROOT; };
@@ -42,7 +42,7 @@
4242
7B2BBC721C779D710067B71D /* Products */ = {
4343
isa = PBXGroup;
4444
children = (
45-
7B2BBC801C779D720067B71D /* Tests(quicksort).xctest */,
45+
7B2BBC801C779D720067B71D /* Tests-Quicksort.xctest */,
4646
);
4747
name = Products;
4848
sourceTree = "<group>";
@@ -62,9 +62,9 @@
6262
/* End PBXGroup section */
6363

6464
/* Begin PBXNativeTarget section */
65-
7B2BBC7F1C779D720067B71D /* Tests(quicksort) */ = {
65+
7B2BBC7F1C779D720067B71D /* Tests-Quicksort */ = {
6666
isa = PBXNativeTarget;
67-
buildConfigurationList = 7B2BBC8C1C779D720067B71D /* Build configuration list for PBXNativeTarget "Tests(quicksort)" */;
67+
buildConfigurationList = 7B2BBC8C1C779D720067B71D /* Build configuration list for PBXNativeTarget "Tests-Quicksort" */;
6868
buildPhases = (
6969
7B2BBC7C1C779D720067B71D /* Sources */,
7070
7B2BBC7D1C779D720067B71D /* Frameworks */,
@@ -74,9 +74,9 @@
7474
);
7575
dependencies = (
7676
);
77-
name = "Tests(quicksort)";
77+
name = "Tests-Quicksort";
7878
productName = TestsTests;
79-
productReference = 7B2BBC801C779D720067B71D /* Tests(quicksort).xctest */;
79+
productReference = 7B2BBC801C779D720067B71D /* Tests-Quicksort.xctest */;
8080
productType = "com.apple.product-type.bundle.unit-test";
8181
};
8282
/* End PBXNativeTarget section */
@@ -95,7 +95,7 @@
9595
};
9696
};
9797
};
98-
buildConfigurationList = 7B2BBC6C1C779D710067B71D /* Build configuration list for PBXProject "Tests(quicksort)" */;
98+
buildConfigurationList = 7B2BBC6C1C779D710067B71D /* Build configuration list for PBXProject "Tests-Quicksort" */;
9999
compatibilityVersion = "Xcode 3.2";
100100
developmentRegion = English;
101101
hasScannedForEncodings = 0;
@@ -108,7 +108,7 @@
108108
projectDirPath = "";
109109
projectRoot = "";
110110
targets = (
111-
7B2BBC7F1C779D720067B71D /* Tests(quicksort) */,
111+
7B2BBC7F1C779D720067B71D /* Tests-Quicksort */,
112112
);
113113
};
114114
/* End PBXProject section */
@@ -187,6 +187,7 @@
187187
SDKROOT = macosx;
188188
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
189189
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
190+
SWIFT_VERSION = 4.0;
190191
};
191192
name = Debug;
192193
};
@@ -233,6 +234,7 @@
233234
SDKROOT = macosx;
234235
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
235236
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
237+
SWIFT_VERSION = 4.0;
236238
};
237239
name = Release;
238240
};
@@ -265,7 +267,7 @@
265267
/* End XCBuildConfiguration section */
266268

267269
/* Begin XCConfigurationList section */
268-
7B2BBC6C1C779D710067B71D /* Build configuration list for PBXProject "Tests(quicksort)" */ = {
270+
7B2BBC6C1C779D710067B71D /* Build configuration list for PBXProject "Tests-Quicksort" */ = {
269271
isa = XCConfigurationList;
270272
buildConfigurations = (
271273
7B2BBC871C779D720067B71D /* Debug */,
@@ -274,7 +276,7 @@
274276
defaultConfigurationIsVisible = 0;
275277
defaultConfigurationName = Release;
276278
};
277-
7B2BBC8C1C779D720067B71D /* Build configuration list for PBXNativeTarget "Tests(quicksort)" */ = {
279+
7B2BBC8C1C779D720067B71D /* Build configuration list for PBXNativeTarget "Tests-Quicksort" */ = {
278280
isa = XCConfigurationList;
279281
buildConfigurations = (
280282
7B2BBC8D1C779D720067B71D /* Debug */,

‎Quicksort/Tests/Tests(quicksort).xcodeproj/project.xcworkspace/contents.xcworkspacedata ‎Quicksort/Tests/Tests-Quicksort.xcodeproj/project.xcworkspace/contents.xcworkspacedata

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Quicksort/Tests/Tests(quicksort).xcodeproj/xcshareddata/xcschemes/Tests(quicksort).xcscheme ‎Quicksort/Tests/Tests-Quicksort.xcodeproj/xcshareddata/xcschemes/Tests-Quicksort.xcscheme

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<BuildableReference
1919
BuildableIdentifier = "primary"
2020
BlueprintIdentifier = "7B2BBC7F1C779D720067B71D"
21-
BuildableName = "Tests(quicksort).xctest"
22-
BlueprintName = "Tests(quicksort)"
23-
ReferencedContainer = "container:Tests(quicksort).xcodeproj">
21+
BuildableName = "Tests-Quicksort.xctest"
22+
BlueprintName = "Tests-Quicksort"
23+
ReferencedContainer = "container:Tests-Quicksort.xcodeproj">
2424
</BuildableReference>
2525
</TestableReference>
2626
</Testables>

‎swift-algorithm-club.xcworkspace/contents.xcworkspacedata

-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Please sign in to comment.