Skip to content

Commit 7ad29bd

Browse files
author
Daniel Dahan
committed
development: updated to Xcode beta 6
1 parent 839250c commit 7ad29bd

15 files changed

+240
-188
lines changed

‎Algorithm.xcodeproj/project.pbxproj

+24-17
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
65744CB91C554DDC0011C977 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
116116
65744CBE1C554DED0011C977 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
117117
65744CC61C554E370011C977 /* Algorithm.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Algorithm.framework; sourceTree = BUILT_PRODUCTS_DIR; };
118-
65744CCF1C554E380011C977 /* Algorithm OSX Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Algorithm OSX Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
118+
65744CCF1C554E380011C977 /* Algorithm macOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Algorithm macOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
119119
65744CDD1C554EDA0011C977 /* Algorithm+Array.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Algorithm+Array.swift"; sourceTree = "<group>"; };
120120
65744CDE1C554EDA0011C977 /* Algorithm+Set.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Algorithm+Set.swift"; sourceTree = "<group>"; };
121121
65744CDF1C554EDA0011C977 /* Deque.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deque.swift; sourceTree = "<group>"; };
@@ -192,7 +192,7 @@
192192
65744C9C1C554BA50011C977 /* Algorithm.framework */,
193193
65744CA61C554BA50011C977 /* Algorithm iOS Tests.xctest */,
194194
65744CC61C554E370011C977 /* Algorithm.framework */,
195-
65744CCF1C554E380011C977 /* Algorithm OSX Tests.xctest */,
195+
65744CCF1C554E380011C977 /* Algorithm macOS Tests.xctest */,
196196
);
197197
name = Products;
198198
sourceTree = "<group>";
@@ -325,9 +325,9 @@
325325
productReference = 65744CA61C554BA50011C977 /* Algorithm iOS Tests.xctest */;
326326
productType = "com.apple.product-type.bundle.unit-test";
327327
};
328-
65744CC51C554E370011C977 /* Algorithm OSX */ = {
328+
65744CC51C554E370011C977 /* Algorithm macOS */ = {
329329
isa = PBXNativeTarget;
330-
buildConfigurationList = 65744CD71C554E380011C977 /* Build configuration list for PBXNativeTarget "Algorithm OSX" */;
330+
buildConfigurationList = 65744CD71C554E380011C977 /* Build configuration list for PBXNativeTarget "Algorithm macOS" */;
331331
buildPhases = (
332332
65744CC11C554E370011C977 /* Sources */,
333333
65744CC21C554E370011C977 /* Frameworks */,
@@ -338,14 +338,14 @@
338338
);
339339
dependencies = (
340340
);
341-
name = "Algorithm OSX";
341+
name = "Algorithm macOS";
342342
productName = "Algorithm OSX";
343343
productReference = 65744CC61C554E370011C977 /* Algorithm.framework */;
344344
productType = "com.apple.product-type.framework";
345345
};
346-
65744CCE1C554E380011C977 /* Algorithm OSX Tests */ = {
346+
65744CCE1C554E380011C977 /* Algorithm macOS Tests */ = {
347347
isa = PBXNativeTarget;
348-
buildConfigurationList = 65744CDA1C554E380011C977 /* Build configuration list for PBXNativeTarget "Algorithm OSX Tests" */;
348+
buildConfigurationList = 65744CDA1C554E380011C977 /* Build configuration list for PBXNativeTarget "Algorithm macOS Tests" */;
349349
buildPhases = (
350350
65744CCB1C554E380011C977 /* Sources */,
351351
65744CCC1C554E380011C977 /* Frameworks */,
@@ -356,9 +356,9 @@
356356
dependencies = (
357357
65744CD21C554E380011C977 /* PBXTargetDependency */,
358358
);
359-
name = "Algorithm OSX Tests";
359+
name = "Algorithm macOS Tests";
360360
productName = "Algorithm OSXTests";
361-
productReference = 65744CCF1C554E380011C977 /* Algorithm OSX Tests.xctest */;
361+
productReference = 65744CCF1C554E380011C977 /* Algorithm macOS Tests.xctest */;
362362
productType = "com.apple.product-type.bundle.unit-test";
363363
};
364364
/* End PBXNativeTarget section */
@@ -368,7 +368,7 @@
368368
isa = PBXProject;
369369
attributes = {
370370
LastSwiftUpdateCheck = 0720;
371-
LastUpgradeCheck = 0720;
371+
LastUpgradeCheck = 0800;
372372
ORGANIZATIONNAME = "CosmicMind, Inc.";
373373
TargetAttributes = {
374374
65744C9B1C554BA50011C977 = {
@@ -400,9 +400,9 @@
400400
projectRoot = "";
401401
targets = (
402402
65744C9B1C554BA50011C977 /* Algorithm iOS */,
403-
65744CC51C554E370011C977 /* Algorithm OSX */,
403+
65744CC51C554E370011C977 /* Algorithm macOS */,
404404
65744CA51C554BA50011C977 /* Algorithm iOS Tests */,
405-
65744CCE1C554E380011C977 /* Algorithm OSX Tests */,
405+
65744CCE1C554E380011C977 /* Algorithm macOS Tests */,
406406
);
407407
};
408408
/* End PBXProject section */
@@ -527,7 +527,7 @@
527527
};
528528
65744CD21C554E380011C977 /* PBXTargetDependency */ = {
529529
isa = PBXTargetDependency;
530-
target = 65744CC51C554E370011C977 /* Algorithm OSX */;
530+
target = 65744CC51C554E370011C977 /* Algorithm macOS */;
531531
targetProxy = 65744CD11C554E380011C977 /* PBXContainerItemProxy */;
532532
};
533533
/* End PBXTargetDependency section */
@@ -546,8 +546,10 @@
546546
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
547547
CLANG_WARN_EMPTY_BODY = YES;
548548
CLANG_WARN_ENUM_CONVERSION = YES;
549+
CLANG_WARN_INFINITE_RECURSION = YES;
549550
CLANG_WARN_INT_CONVERSION = YES;
550551
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
552+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
551553
CLANG_WARN_UNREACHABLE_CODE = YES;
552554
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
553555
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -596,8 +598,10 @@
596598
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
597599
CLANG_WARN_EMPTY_BODY = YES;
598600
CLANG_WARN_ENUM_CONVERSION = YES;
601+
CLANG_WARN_INFINITE_RECURSION = YES;
599602
CLANG_WARN_INT_CONVERSION = YES;
600603
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
604+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
601605
CLANG_WARN_UNREACHABLE_CODE = YES;
602606
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
603607
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -618,6 +622,7 @@
618622
MACOSX_DEPLOYMENT_TARGET = 10.9;
619623
MTL_ENABLE_DEBUG_INFO = NO;
620624
SDKROOT = iphoneos;
625+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
621626
SWIFT_VERSION = 3.0;
622627
TARGETED_DEVICE_FAMILY = "1,2";
623628
VALIDATE_PRODUCT = YES;
@@ -630,6 +635,7 @@
630635
isa = XCBuildConfiguration;
631636
buildSettings = {
632637
CLANG_ENABLE_MODULES = YES;
638+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
633639
DEFINES_MODULE = YES;
634640
DYLIB_COMPATIBILITY_VERSION = 1;
635641
DYLIB_CURRENT_VERSION = 1;
@@ -649,6 +655,7 @@
649655
isa = XCBuildConfiguration;
650656
buildSettings = {
651657
CLANG_ENABLE_MODULES = YES;
658+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
652659
DEFINES_MODULE = YES;
653660
DYLIB_COMPATIBILITY_VERSION = 1;
654661
DYLIB_CURRENT_VERSION = 1;
@@ -692,7 +699,7 @@
692699
isa = XCBuildConfiguration;
693700
buildSettings = {
694701
CLANG_ENABLE_MODULES = YES;
695-
CODE_SIGN_IDENTITY = "-";
702+
CODE_SIGN_IDENTITY = "";
696703
COMBINE_HIDPI_IMAGES = YES;
697704
DEFINES_MODULE = YES;
698705
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -714,7 +721,7 @@
714721
isa = XCBuildConfiguration;
715722
buildSettings = {
716723
CLANG_ENABLE_MODULES = YES;
717-
CODE_SIGN_IDENTITY = "-";
724+
CODE_SIGN_IDENTITY = "";
718725
COMBINE_HIDPI_IMAGES = YES;
719726
DEFINES_MODULE = YES;
720727
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -792,7 +799,7 @@
792799
defaultConfigurationIsVisible = 0;
793800
defaultConfigurationName = Release;
794801
};
795-
65744CD71C554E380011C977 /* Build configuration list for PBXNativeTarget "Algorithm OSX" */ = {
802+
65744CD71C554E380011C977 /* Build configuration list for PBXNativeTarget "Algorithm macOS" */ = {
796803
isa = XCConfigurationList;
797804
buildConfigurations = (
798805
65744CD81C554E380011C977 /* Debug */,
@@ -801,7 +808,7 @@
801808
defaultConfigurationIsVisible = 0;
802809
defaultConfigurationName = Release;
803810
};
804-
65744CDA1C554E380011C977 /* Build configuration list for PBXNativeTarget "Algorithm OSX Tests" */ = {
811+
65744CDA1C554E380011C977 /* Build configuration list for PBXNativeTarget "Algorithm macOS Tests" */ = {
805812
isa = XCConfigurationList;
806813
buildConfigurations = (
807814
65744CDB1C554E380011C977 /* Debug */,

‎Algorithm.xcodeproj/xcshareddata/xcschemes/Algorithm macOS.xcscheme

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "65744CC51C554E370011C977"
1818
BuildableName = "Algorithm.framework"
19-
BlueprintName = "Algorithm OSX"
19+
BlueprintName = "Algorithm macOS"
2020
ReferencedContainer = "container:Algorithm.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -33,8 +33,8 @@
3333
<BuildableReference
3434
BuildableIdentifier = "primary"
3535
BlueprintIdentifier = "65744CCE1C554E380011C977"
36-
BuildableName = "Algorithm OSX Tests.xctest"
37-
BlueprintName = "Algorithm OSX Tests"
36+
BuildableName = "Algorithm macOS Tests.xctest"
37+
BlueprintName = "Algorithm macOS Tests"
3838
ReferencedContainer = "container:Algorithm.xcodeproj">
3939
</BuildableReference>
4040
</TestableReference>
@@ -44,7 +44,7 @@
4444
BuildableIdentifier = "primary"
4545
BlueprintIdentifier = "65744CC51C554E370011C977"
4646
BuildableName = "Algorithm.framework"
47-
BlueprintName = "Algorithm OSX"
47+
BlueprintName = "Algorithm macOS"
4848
ReferencedContainer = "container:Algorithm.xcodeproj">
4949
</BuildableReference>
5050
</MacroExpansion>
@@ -66,7 +66,7 @@
6666
BuildableIdentifier = "primary"
6767
BlueprintIdentifier = "65744CC51C554E370011C977"
6868
BuildableName = "Algorithm.framework"
69-
BlueprintName = "Algorithm OSX"
69+
BlueprintName = "Algorithm macOS"
7070
ReferencedContainer = "container:Algorithm.xcodeproj">
7171
</BuildableReference>
7272
</MacroExpansion>
@@ -84,7 +84,7 @@
8484
BuildableIdentifier = "primary"
8585
BlueprintIdentifier = "65744CC51C554E370011C977"
8686
BuildableName = "Algorithm.framework"
87-
BlueprintName = "Algorithm OSX"
87+
BlueprintName = "Algorithm macOS"
8888
ReferencedContainer = "container:Algorithm.xcodeproj">
8989
</BuildableReference>
9090
</MacroExpansion>

‎Sources/Algorithm+Array.swift

+6-6
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ extension Array where Element: Equatable {
3737
}
3838

3939
mutating func remove(objects: Element...) {
40-
removeObjects(objects)
40+
remove(objects: objects)
4141
}
4242

4343
mutating func remove(objects: [Element]) {
44-
for x in objects {
45-
removeObject(x)
46-
}
44+
for x in objects {
45+
_ = remove(object: x)
46+
}
4747
}
4848
}
4949

@@ -101,14 +101,14 @@ extension Array: ProbableType {
101101
- Parameter of elements: A list of Elements.
102102
- Returns: A Double.
103103
*/
104-
public func probability(of block: (element: Element) -> Bool) -> Double {
104+
public func probability(of block: (Element) -> Bool) -> Double {
105105
guard 0 < count else {
106106
return 0
107107
}
108108

109109
var c: Int = 0
110110
for x in self {
111-
if block(element: x) {
111+
if block(x) {
112112
c += 1
113113
}
114114
}

‎Sources/Algorithm+Set.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@ extension Set: ProbableType {
8282
- Parameter of elements: A list of Elements.
8383
- Returns: A Double.
8484
*/
85-
public func probability(of block: (element: Element) -> Bool) -> Double {
85+
public func probability(of block: (Element) -> Bool) -> Double {
8686
guard 0 < count else {
8787
return 0
8888
}
8989

9090
var c: Int = 0
9191
for x in self {
92-
if block(element: x) {
92+
if block(x) {
9393
c += 1
9494
}
9595
}

‎Sources/DoublyLinkedList.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public class DoublyLinkedList<Element>: CustomStringConvertible, Sequence {
191191
return AnyIterator {
192192
if !self.isCursorAtBack {
193193
let element: Element? = self.cursor
194-
self.next
194+
_ = self.next
195195
return element
196196
}
197197
return nil
@@ -204,7 +204,7 @@ public class DoublyLinkedList<Element>: CustomStringConvertible, Sequence {
204204
*/
205205
public func removeAll() {
206206
while !isEmpty {
207-
removeAtFront()
207+
_ = removeAtFront()
208208
}
209209
}
210210

‎Sources/ProbableType.swift

+15-15
Original file line numberDiff line numberDiff line change
@@ -30,52 +30,52 @@
3030

3131
internal protocol ProbableType {
3232
/**
33-
:name: countOf
33+
:name: count
3434
:description: The instance count of elements.
35-
- parameter elements: Element... The element values to count.
35+
- parameter of elements: Element... The element values to count.
3636
- returns: Int
3737
*/
38-
func countOf<Element: Equatable>(_ elements: Element...) -> Int
38+
func count<Element: Equatable>(of elements: Element...) -> Int
3939

4040
/**
41-
:name: countOf
41+
:name: count
4242
:description: The instance count of elements.
43-
- parameter elements: Array<Element> An array of element values to count.
43+
- parameter of elements: Array<Element> An array of element values to count.
4444
- returns: Int
4545
*/
46-
func countOf<Element: Equatable>(_ elements: Array<Element>) -> Int
46+
func count<Element: Equatable>(of elements: Array<Element>) -> Int
4747

4848
/**
49-
:name: probabilityOf
49+
:name: probability
5050
:description: The probability of elements.
51-
- parameter elements: Element... The element values to determine the probability of.
51+
- parameter of elements: Element... The element values to determine the probability of.
5252
- returns: Double
5353
*/
54-
func probabilityOf<Element: Equatable>(_ elements: Element...) -> Double
54+
func probability<Element: Equatable>(of elements: Element...) -> Double
5555

5656
/**
57-
:name: probabilityOf
57+
:name: probability
5858
:description: The probability of elements.
5959
- parameter elements: Array<Element> An array of element values to determine the probability of.
6060
- returns: Double
6161
*/
62-
func probabilityOf<Element: Equatable>(_ elements: Array<Element>) -> Double
62+
func probability<Element: Equatable>(of elements: Array<Element>) -> Double
6363

6464
/**
65-
:name: expectedValueOf
65+
:name: expectedValue
6666
:description: The expected value of elements.
6767
- parameter trials: Int The number of trials to execute.
6868
- parameter elements: Element... The element values to determine the expected value of.
6969
- returns: Double
7070
*/
71-
func expectedValueOf<Element: Equatable>(_ trials: Int, elements: Element...) -> Double
71+
func expectedValue<Element: Equatable>(trials: Int, elements: Element...) -> Double
7272

7373
/**
74-
:name: expectedValueOf
74+
:name: expectedValue
7575
:description: The expected value of elements.
7676
- parameter trials: Int The number of trials to execute.
7777
- parameter elements: Array<Element> An array of element values to determine the expected value of.
7878
- returns: Double
7979
*/
80-
func expectedValueOf<Element: Equatable>(_ trials: Int, elements: Array<Element>) -> Double
80+
func expectedValue<Element: Equatable>(trials: Int, elements: Array<Element>) -> Double
8181
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy