Skip to content

Commit 84f2f7a

Browse files
mdiepmdiep
authored
Merge pull request ReactiveCocoa#3154 from ReactiveCocoa/update-result3-alpha4
Update Result to 3.0.0-alpha.4
2 parents 574e131 + 4e8465b commit 84f2f7a

File tree

8 files changed

+24
-17
lines changed

8 files changed

+24
-17
lines changed

‎.gitmodules‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[submodule "Carthage/Checkouts/Nimble"]
22
path = Carthage/Checkouts/Nimble
3-
url = https://github.com/ikesyo/Nimble.git
3+
url = https://github.com/norio-nomura/Nimble.git
44
[submodule "Carthage/Checkouts/Quick"]
55
path = Carthage/Checkouts/Quick
6-
url = https://github.com/ikesyo/Quick.git
6+
url = https://github.com/norio-nomura/Quick.git
77
[submodule "Carthage/Checkouts/xcconfigs"]
88
path = Carthage/Checkouts/xcconfigs
99
url = https://github.com/jspahrsummers/xcconfigs.git

‎Cartfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "antitypical/Result" "3.0.0-alpha.3"
1+
github "antitypical/Result" "3.0.0-alpha.4"

‎Cartfile.private‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "jspahrsummers/xcconfigs" "1ef9763"
2-
github "ikesyo/Quick" "xcode8-beta6"
3-
github "ikesyo/Nimble" "swift3-beta-6"
2+
github "norio-nomura/Quick" "nn-swift-3-compatibility"
3+
github "norio-nomura/Nimble" "nn-swift-3-compatibility"

‎Cartfile.resolved‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
github "ikesyo/Nimble" "4f38620db52b81eef4298492fed057247308b5d6"
2-
github "ikesyo/Quick" "e14bf151a4c864e6f144559e7b7c09bca0fd38c1"
3-
github "antitypical/Result" "3.0.0-alpha.3"
1+
github "norio-nomura/Nimble" "3d82a185b49e8fc9f40e7b72feeb279c778f0935"
2+
github "norio-nomura/Quick" "4a7f1d0a7db637c3ca15b8f198a516fbc5581f87"
3+
github "antitypical/Result" "3.0.0-alpha.4"
44
github "jspahrsummers/xcconfigs" "1ef97639ffbe041da0b1392b2114fa19b922a7a1"

‎Carthage/Checkouts/Nimble‎

‎Carthage/Checkouts/Quick‎

Submodule Quick updated from e14bf15 to 4a7f1d0

‎Carthage/Checkouts/Result‎

‎ReactiveCocoa.xcodeproj/project.pbxproj‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -240,13 +240,13 @@
240240
7DFBED6D1CDB8F7D00EE435B /* SignalProducerNimbleMatchers.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFA6B94A1A76044800C846D1 /* SignalProducerNimbleMatchers.swift */; };
241241
7DFBED6E1CDB918900EE435B /* UIBarButtonItem+RACCommandSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = D03764C719EDA41200A782A9 /* UIBarButtonItem+RACCommandSupport.m */; };
242242
7DFBED6F1CDB926400EE435B /* UIBarButtonItem+RACCommandSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = D03764C619EDA41200A782A9 /* UIBarButtonItem+RACCommandSupport.h */; settings = {ATTRIBUTES = (Public, ); }; };
243+
9A1E72BA1D4DE96500CC20C3 /* KeyValueObservingSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A1E72B91D4DE96500CC20C3 /* KeyValueObservingSpec.swift */; };
244+
9A1E72BB1D4DE96500CC20C3 /* KeyValueObservingSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A1E72B91D4DE96500CC20C3 /* KeyValueObservingSpec.swift */; };
245+
9A1E72BC1D4DE96500CC20C3 /* KeyValueObservingSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A1E72B91D4DE96500CC20C3 /* KeyValueObservingSpec.swift */; };
243246
9ABCB1851D2A5B5A00BCA243 /* Deprecations+Removals.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9ABCB1841D2A5B5A00BCA243 /* Deprecations+Removals.swift */; };
244247
9ABCB1861D2A5B5A00BCA243 /* Deprecations+Removals.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9ABCB1841D2A5B5A00BCA243 /* Deprecations+Removals.swift */; };
245248
9ABCB1871D2A5B5A00BCA243 /* Deprecations+Removals.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9ABCB1841D2A5B5A00BCA243 /* Deprecations+Removals.swift */; };
246249
9ABCB1881D2A5B5A00BCA243 /* Deprecations+Removals.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9ABCB1841D2A5B5A00BCA243 /* Deprecations+Removals.swift */; };
247-
9A1E72BA1D4DE96500CC20C3 /* KeyValueObservingSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A1E72B91D4DE96500CC20C3 /* KeyValueObservingSpec.swift */; };
248-
9A1E72BB1D4DE96500CC20C3 /* KeyValueObservingSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A1E72B91D4DE96500CC20C3 /* KeyValueObservingSpec.swift */; };
249-
9A1E72BC1D4DE96500CC20C3 /* KeyValueObservingSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A1E72B91D4DE96500CC20C3 /* KeyValueObservingSpec.swift */; };
250250
9AD0F06A1D48BA4800ADFAB7 /* NSObject+KeyValueObserving.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AD0F0691D48BA4800ADFAB7 /* NSObject+KeyValueObserving.swift */; };
251251
9AD0F06B1D48BA4800ADFAB7 /* NSObject+KeyValueObserving.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AD0F0691D48BA4800ADFAB7 /* NSObject+KeyValueObserving.swift */; };
252252
9AD0F06C1D48BA4800ADFAB7 /* NSObject+KeyValueObserving.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AD0F0691D48BA4800ADFAB7 /* NSObject+KeyValueObserving.swift */; };
@@ -922,8 +922,8 @@
922922
7A70657E1A3F88B8001E8354 /* RACKVOProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RACKVOProxy.m; sourceTree = "<group>"; };
923923
7A7065831A3F8967001E8354 /* RACKVOProxySpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RACKVOProxySpec.m; sourceTree = "<group>"; };
924924
7DFBED031CDB8C9500EE435B /* ReactiveCocoaTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ReactiveCocoaTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
925-
9ABCB1841D2A5B5A00BCA243 /* Deprecations+Removals.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Deprecations+Removals.swift"; sourceTree = "<group>"; };
926925
9A1E72B91D4DE96500CC20C3 /* KeyValueObservingSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyValueObservingSpec.swift; sourceTree = "<group>"; };
926+
9ABCB1841D2A5B5A00BCA243 /* Deprecations+Removals.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Deprecations+Removals.swift"; sourceTree = "<group>"; };
927927
9AD0F0691D48BA4800ADFAB7 /* NSObject+KeyValueObserving.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSObject+KeyValueObserving.swift"; sourceTree = "<group>"; };
928928
A97451331B3A935E00F48E55 /* watchOS-Application.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "watchOS-Application.xcconfig"; sourceTree = "<group>"; };
929929
A97451341B3A935E00F48E55 /* watchOS-Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "watchOS-Base.xcconfig"; sourceTree = "<group>"; };
@@ -2223,7 +2223,7 @@
22232223
isa = PBXProject;
22242224
attributes = {
22252225
LastSwiftUpdateCheck = 0730;
2226-
LastUpgradeCheck = 0710;
2226+
LastUpgradeCheck = 0800;
22272227
ORGANIZATIONNAME = GitHub;
22282228
TargetAttributes = {
22292229
57A4D1AF1BA13D7A00F7D4B1 = {
@@ -2605,7 +2605,6 @@
26052605
A9B315A61B3940750001CB9C /* RACUnit.m in Sources */,
26062606
A9B315A71B3940750001CB9C /* RACValueTransformer.m in Sources */,
26072607
9AD0F06C1D48BA4800ADFAB7 /* NSObject+KeyValueObserving.swift in Sources */,
2608-
A9B315BB1B3940750001CB9C /* RACDynamicPropertySuperclass.m in Sources */,
26092608
);
26102609
runOnlyForDeploymentPostprocessing = 0;
26112610
};
@@ -3177,6 +3176,8 @@
31773176
baseConfigurationReference = D047262919E49FE8006002AA /* Debug.xcconfig */;
31783177
buildSettings = {
31793178
BITCODE_GENERATION_MODE = bitcode;
3179+
CLANG_WARN_INFINITE_RECURSION = YES;
3180+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
31803181
CODE_SIGNING_REQUIRED = NO;
31813182
CURRENT_PROJECT_VERSION = 1;
31823183
ENABLE_BITCODE = NO;
@@ -3199,6 +3200,8 @@
31993200
baseConfigurationReference = D047262B19E49FE8006002AA /* Release.xcconfig */;
32003201
buildSettings = {
32013202
BITCODE_GENERATION_MODE = bitcode;
3203+
CLANG_WARN_INFINITE_RECURSION = YES;
3204+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
32023205
CODE_SIGNING_REQUIRED = NO;
32033206
CURRENT_PROJECT_VERSION = 1;
32043207
ENABLE_BITCODE = NO;
@@ -3328,6 +3331,8 @@
33283331
baseConfigurationReference = D047262A19E49FE8006002AA /* Profile.xcconfig */;
33293332
buildSettings = {
33303333
BITCODE_GENERATION_MODE = bitcode;
3334+
CLANG_WARN_INFINITE_RECURSION = YES;
3335+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
33313336
CODE_SIGNING_REQUIRED = NO;
33323337
CURRENT_PROJECT_VERSION = 1;
33333338
ENABLE_BITCODE = NO;
@@ -3402,6 +3407,8 @@
34023407
baseConfigurationReference = D047262C19E49FE8006002AA /* Test.xcconfig */;
34033408
buildSettings = {
34043409
BITCODE_GENERATION_MODE = bitcode;
3410+
CLANG_WARN_INFINITE_RECURSION = YES;
3411+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
34053412
CODE_SIGNING_REQUIRED = NO;
34063413
CURRENT_PROJECT_VERSION = 1;
34073414
ENABLE_BITCODE = NO;

0 commit comments

Comments
 (0)