Skip to content

Commit 7ff966b

Browse files
CodaFiCodaFi
committed
Install the new STM
Implementation basically stolen wholesale from FsharpX. Not entirely sure if there isn’t some edge case around the inner casting conversions with reference types. It will need tests later. For now I’m satisfied with this.
1 parent 55004a1 commit 7ff966b

File tree

11 files changed

+148
-67
lines changed

11 files changed

+148
-67
lines changed

‎Carthage/Checkouts/SwiftCheck‎

Submodule SwiftCheck updated 63 files

‎Concurrent.xcodeproj/project.pbxproj‎

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,20 @@
6868
/* End PBXBuildFile section */
6969

7070
/* Begin PBXContainerItemProxy section */
71+
82AA03F31D7B08CB00DD3037 /* PBXContainerItemProxy */ = {
72+
isa = PBXContainerItemProxy;
73+
containerPortal = 84A53DF51B1A9F1800E8A107 /* SwiftCheck.xcodeproj */;
74+
proxyType = 2;
75+
remoteGlobalIDString = 8240CCB11C3A123600EF4D29;
76+
remoteInfo = "SwiftCheck-tvOS";
77+
};
78+
82AA03F51D7B08CB00DD3037 /* PBXContainerItemProxy */ = {
79+
isa = PBXContainerItemProxy;
80+
containerPortal = 84A53DF51B1A9F1800E8A107 /* SwiftCheck.xcodeproj */;
81+
proxyType = 2;
82+
remoteGlobalIDString = 8240CCBA1C3A123700EF4D29;
83+
remoteInfo = "SwiftCheck-tvOSTests";
84+
};
7185
841022491B1A9F8E00E799A0 /* PBXContainerItemProxy */ = {
7286
isa = PBXContainerItemProxy;
7387
containerPortal = 84A53DF51B1A9F1800E8A107 /* SwiftCheck.xcodeproj */;
@@ -307,6 +321,8 @@
307321
84A53DFF1B1A9F1900E8A107 /* SwiftCheckTests.xctest */,
308322
84A53E011B1A9F1900E8A107 /* SwiftCheck.framework */,
309323
84A53E031B1A9F1900E8A107 /* SwiftCheck-iOSTests.xctest */,
324+
82AA03F41D7B08CB00DD3037 /* SwiftCheck.framework */,
325+
82AA03F61D7B08CB00DD3037 /* SwiftCheck-tvOSTests.xctest */,
310326
);
311327
name = Products;
312328
sourceTree = "<group>";
@@ -420,14 +436,16 @@
420436
isa = PBXProject;
421437
attributes = {
422438
LastSwiftUpdateCheck = 0700;
423-
LastUpgradeCheck = 0700;
439+
LastUpgradeCheck = 0800;
424440
ORGANIZATIONNAME = TypeLift;
425441
TargetAttributes = {
426442
8434F97F19E9CD76008D9909 = {
427443
CreatedOnToolsVersion = 6.1;
444+
LastSwiftMigration = 0800;
428445
};
429446
8434F98A19E9CD76008D9909 = {
430447
CreatedOnToolsVersion = 6.1;
448+
LastSwiftMigration = 0800;
431449
};
432450
84A53D391B1A8F1800E8A107 = {
433451
CreatedOnToolsVersion = 6.3.2;
@@ -464,6 +482,20 @@
464482
/* End PBXProject section */
465483

466484
/* Begin PBXReferenceProxy section */
485+
82AA03F41D7B08CB00DD3037 /* SwiftCheck.framework */ = {
486+
isa = PBXReferenceProxy;
487+
fileType = wrapper.framework;
488+
path = SwiftCheck.framework;
489+
remoteRef = 82AA03F31D7B08CB00DD3037 /* PBXContainerItemProxy */;
490+
sourceTree = BUILT_PRODUCTS_DIR;
491+
};
492+
82AA03F61D7B08CB00DD3037 /* SwiftCheck-tvOSTests.xctest */ = {
493+
isa = PBXReferenceProxy;
494+
fileType = wrapper.cfbundle;
495+
path = "SwiftCheck-tvOSTests.xctest";
496+
remoteRef = 82AA03F51D7B08CB00DD3037 /* PBXContainerItemProxy */;
497+
sourceTree = BUILT_PRODUCTS_DIR;
498+
};
467499
84A53DFD1B1A9F1900E8A107 /* SwiftCheck.framework */ = {
468500
isa = PBXReferenceProxy;
469501
fileType = wrapper.framework;
@@ -638,8 +670,10 @@
638670
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
639671
CLANG_WARN_EMPTY_BODY = YES;
640672
CLANG_WARN_ENUM_CONVERSION = YES;
673+
CLANG_WARN_INFINITE_RECURSION = YES;
641674
CLANG_WARN_INT_CONVERSION = YES;
642675
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
676+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
643677
CLANG_WARN_UNREACHABLE_CODE = YES;
644678
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
645679
COPY_PHASE_STRIP = NO;
@@ -648,6 +682,7 @@
648682
ENABLE_TESTABILITY = YES;
649683
GCC_C_LANGUAGE_STANDARD = gnu99;
650684
GCC_DYNAMIC_NO_PIC = NO;
685+
GCC_NO_COMMON_BLOCKS = YES;
651686
GCC_OPTIMIZATION_LEVEL = 0;
652687
GCC_PREPROCESSOR_DEFINITIONS = (
653688
"DEBUG=1",
@@ -684,8 +719,10 @@
684719
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
685720
CLANG_WARN_EMPTY_BODY = YES;
686721
CLANG_WARN_ENUM_CONVERSION = YES;
722+
CLANG_WARN_INFINITE_RECURSION = YES;
687723
CLANG_WARN_INT_CONVERSION = YES;
688724
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
725+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
689726
CLANG_WARN_UNREACHABLE_CODE = YES;
690727
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
691728
COPY_PHASE_STRIP = YES;
@@ -694,6 +731,7 @@
694731
ENABLE_NS_ASSERTIONS = NO;
695732
ENABLE_STRICT_OBJC_MSGSEND = YES;
696733
GCC_C_LANGUAGE_STANDARD = gnu99;
734+
GCC_NO_COMMON_BLOCKS = YES;
697735
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
698736
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
699737
GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -703,6 +741,7 @@
703741
MACOSX_DEPLOYMENT_TARGET = 10.10;
704742
MTL_ENABLE_DEBUG_INFO = NO;
705743
SDKROOT = macosx;
744+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
706745
VERSIONING_SYSTEM = "apple-generic";
707746
VERSION_INFO_PREFIX = "";
708747
};
@@ -727,6 +766,7 @@
727766
SWIFT_INSTALL_OBJC_HEADER = NO;
728767
SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
729768
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
769+
SWIFT_VERSION = 2.3;
730770
};
731771
name = Debug;
732772
};
@@ -748,6 +788,7 @@
748788
SKIP_INSTALL = YES;
749789
SWIFT_INSTALL_OBJC_HEADER = NO;
750790
SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
791+
SWIFT_VERSION = 2.3;
751792
};
752793
name = Release;
753794
};
@@ -768,6 +809,7 @@
768809
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
769810
PRODUCT_BUNDLE_IDENTIFIER = "com.typelift.$(PRODUCT_NAME:rfc1034identifier)";
770811
PRODUCT_NAME = "$(TARGET_NAME)";
812+
SWIFT_VERSION = 2.3;
771813
};
772814
name = Debug;
773815
};
@@ -784,13 +826,14 @@
784826
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
785827
PRODUCT_BUNDLE_IDENTIFIER = "com.typelift.$(PRODUCT_NAME:rfc1034identifier)";
786828
PRODUCT_NAME = "$(TARGET_NAME)";
829+
SWIFT_VERSION = 2.3;
787830
};
788831
name = Release;
789832
};
790833
84A53D4D1B1A8F1800E8A107 /* Debug */ = {
791834
isa = XCBuildConfiguration;
792835
buildSettings = {
793-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
836+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
794837
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
795838
DEFINES_MODULE = YES;
796839
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -812,14 +855,15 @@
812855
SKIP_INSTALL = YES;
813856
SWIFT_INSTALL_OBJC_HEADER = NO;
814857
SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
858+
SWIFT_VERSION = 2.3;
815859
TARGETED_DEVICE_FAMILY = "1,2";
816860
};
817861
name = Debug;
818862
};
819863
84A53D4E1B1A8F1800E8A107 /* Release */ = {
820864
isa = XCBuildConfiguration;
821865
buildSettings = {
822-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
866+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
823867
COPY_PHASE_STRIP = NO;
824868
DEFINES_MODULE = YES;
825869
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -837,6 +881,7 @@
837881
SKIP_INSTALL = YES;
838882
SWIFT_INSTALL_OBJC_HEADER = NO;
839883
SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
884+
SWIFT_VERSION = 2.3;
840885
TARGETED_DEVICE_FAMILY = "1,2";
841886
VALIDATE_PRODUCT = YES;
842887
};
@@ -863,6 +908,7 @@
863908
PRODUCT_BUNDLE_IDENTIFIER = "com.typelift.$(PRODUCT_NAME:rfc1034identifier)";
864909
PRODUCT_NAME = "$(TARGET_NAME)";
865910
SDKROOT = iphoneos;
911+
SWIFT_VERSION = 2.3;
866912
};
867913
name = Debug;
868914
};
@@ -883,6 +929,7 @@
883929
PRODUCT_BUNDLE_IDENTIFIER = "com.typelift.$(PRODUCT_NAME:rfc1034identifier)";
884930
PRODUCT_NAME = "$(TARGET_NAME)";
885931
SDKROOT = iphoneos;
932+
SWIFT_VERSION = 2.3;
886933
VALIDATE_PRODUCT = YES;
887934
};
888935
name = Release;

‎Concurrent.xcodeproj/xcshareddata/xcschemes/Concurrent-iOS.xcscheme‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0700"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
3737
</BuildActionEntries>
3838
</BuildAction>
3939
<TestAction
40+
buildConfiguration = "Debug"
4041
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4142
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
42-
shouldUseLaunchSchemeArgsEnv = "YES"
43-
buildConfiguration = "Debug">
43+
shouldUseLaunchSchemeArgsEnv = "YES">
4444
<Testables>
4545
<TestableReference
4646
skipped = "NO">
@@ -66,11 +66,11 @@
6666
</AdditionalOptions>
6767
</TestAction>
6868
<LaunchAction
69+
buildConfiguration = "Debug"
6970
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7071
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
7172
launchStyle = "0"
7273
useCustomWorkingDirectory = "NO"
73-
buildConfiguration = "Debug"
7474
ignoresPersistentStateOnLaunch = "NO"
7575
debugDocumentVersioning = "YES"
7676
debugServiceExtension = "internal"
@@ -88,10 +88,10 @@
8888
</AdditionalOptions>
8989
</LaunchAction>
9090
<ProfileAction
91+
buildConfiguration = "Release"
9192
shouldUseLaunchSchemeArgsEnv = "YES"
9293
savedToolIdentifier = ""
9394
useCustomWorkingDirectory = "NO"
94-
buildConfiguration = "Release"
9595
debugDocumentVersioning = "YES">
9696
<MacroExpansion>
9797
<BuildableReference

‎Concurrent.xcodeproj/xcshareddata/xcschemes/Concurrent.xcscheme‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0700"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
3737
</BuildActionEntries>
3838
</BuildAction>
3939
<TestAction
40+
buildConfiguration = "Debug"
4041
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4142
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
42-
shouldUseLaunchSchemeArgsEnv = "YES"
43-
buildConfiguration = "Debug">
43+
shouldUseLaunchSchemeArgsEnv = "YES">
4444
<Testables>
4545
<TestableReference
4646
skipped = "NO">
@@ -66,11 +66,11 @@
6666
</AdditionalOptions>
6767
</TestAction>
6868
<LaunchAction
69+
buildConfiguration = "Debug"
6970
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7071
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
7172
launchStyle = "0"
7273
useCustomWorkingDirectory = "NO"
73-
buildConfiguration = "Debug"
7474
ignoresPersistentStateOnLaunch = "NO"
7575
debugDocumentVersioning = "YES"
7676
debugServiceExtension = "internal"
@@ -88,10 +88,10 @@
8888
</AdditionalOptions>
8989
</LaunchAction>
9090
<ProfileAction
91+
buildConfiguration = "Release"
9192
shouldUseLaunchSchemeArgsEnv = "YES"
9293
savedToolIdentifier = ""
9394
useCustomWorkingDirectory = "NO"
94-
buildConfiguration = "Release"
9595
debugDocumentVersioning = "YES">
9696
<MacroExpansion>
9797
<BuildableReference

0 commit comments

Comments
 (0)