Skip to content

Commit 3bcd165

Browse files
committed
Merge branch 'master' into reactive-swift
# Conflicts: # ReactiveCocoa.xcodeproj/project.pbxproj
2 parents 0d23a15 + 84f2f7a commit 3bcd165

File tree

5 files changed

+18
-9
lines changed

5 files changed

+18
-9
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"

ReactiveCocoa.xcodeproj/project.pbxproj

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -825,6 +825,7 @@
825825
7A7065831A3F8967001E8354 /* RACKVOProxySpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RACKVOProxySpec.m; sourceTree = "<group>"; };
826826
7DFBED031CDB8C9500EE435B /* ReactiveCocoaTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ReactiveCocoaTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
827827
9A1E72B91D4DE96500CC20C3 /* KeyValueObservingSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyValueObservingSpec.swift; sourceTree = "<group>"; };
828+
9ABCB1841D2A5B5A00BCA243 /* Deprecations+Removals.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Deprecations+Removals.swift"; sourceTree = "<group>"; };
828829
9AD0F0691D48BA4800ADFAB7 /* NSObject+KeyValueObserving.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSObject+KeyValueObserving.swift"; sourceTree = "<group>"; };
829830
A97451331B3A935E00F48E55 /* watchOS-Application.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "watchOS-Application.xcconfig"; sourceTree = "<group>"; };
830831
A97451341B3A935E00F48E55 /* watchOS-Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "watchOS-Base.xcconfig"; sourceTree = "<group>"; };
@@ -2090,7 +2091,7 @@
20902091
isa = PBXProject;
20912092
attributes = {
20922093
LastSwiftUpdateCheck = 0730;
2093-
LastUpgradeCheck = 0710;
2094+
LastUpgradeCheck = 0800;
20942095
ORGANIZATIONNAME = GitHub;
20952096
TargetAttributes = {
20962097
57A4D1AF1BA13D7A00F7D4B1 = {
@@ -2940,6 +2941,8 @@
29402941
baseConfigurationReference = D047262919E49FE8006002AA /* Debug.xcconfig */;
29412942
buildSettings = {
29422943
BITCODE_GENERATION_MODE = bitcode;
2944+
CLANG_WARN_INFINITE_RECURSION = YES;
2945+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
29432946
CODE_SIGNING_REQUIRED = NO;
29442947
CURRENT_PROJECT_VERSION = 1;
29452948
ENABLE_BITCODE = NO;
@@ -2962,6 +2965,8 @@
29622965
baseConfigurationReference = D047262B19E49FE8006002AA /* Release.xcconfig */;
29632966
buildSettings = {
29642967
BITCODE_GENERATION_MODE = bitcode;
2968+
CLANG_WARN_INFINITE_RECURSION = YES;
2969+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
29652970
CODE_SIGNING_REQUIRED = NO;
29662971
CURRENT_PROJECT_VERSION = 1;
29672972
ENABLE_BITCODE = NO;
@@ -3091,6 +3096,8 @@
30913096
baseConfigurationReference = D047262A19E49FE8006002AA /* Profile.xcconfig */;
30923097
buildSettings = {
30933098
BITCODE_GENERATION_MODE = bitcode;
3099+
CLANG_WARN_INFINITE_RECURSION = YES;
3100+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
30943101
CODE_SIGNING_REQUIRED = NO;
30953102
CURRENT_PROJECT_VERSION = 1;
30963103
ENABLE_BITCODE = NO;
@@ -3165,6 +3172,8 @@
31653172
baseConfigurationReference = D047262C19E49FE8006002AA /* Test.xcconfig */;
31663173
buildSettings = {
31673174
BITCODE_GENERATION_MODE = bitcode;
3175+
CLANG_WARN_INFINITE_RECURSION = YES;
3176+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
31683177
CODE_SIGNING_REQUIRED = NO;
31693178
CURRENT_PROJECT_VERSION = 1;
31703179
ENABLE_BITCODE = NO;

0 commit comments

Comments
 (0)