Skip to content

Commit 5f4b66e

Browse files
ikesyoikesyo
authored
Merge pull request #61 from ReactiveCocoa/cartfile-reactiveswift-6.1
Explicitly require ReactiveSwift 6.1 in Cartfile
2 parents f9a1c12 + cdbdf4d commit 5f4b66e

File tree

5 files changed

+37
-31
lines changed

5 files changed

+37
-31
lines changed

‎Cartfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
github "ReactiveCocoa/ReactiveObjC" ~> 3.1.1
2-
github "ReactiveCocoa/ReactiveSwift" ~> 6.0.0
2+
github "ReactiveCocoa/ReactiveSwift" ~> 6.1

‎Cartfile.resolved‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github "Quick/Nimble" "v8.0.1"
1+
github "Quick/Nimble" "v8.0.2"
22
github "Quick/Quick" "v2.1.0"
33
github "ReactiveCocoa/ReactiveObjC" "3.1.1"
44
github "ReactiveCocoa/ReactiveSwift" "6.1.0"
5-
github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
5+
github "jspahrsummers/xcconfigs" "d0f8992afad45262cfe3a3cf512e7127fdcf296c"

‎Carthage/Checkouts/Nimble‎

Submodule Nimble updated 44 files

‎Carthage/Checkouts/xcconfigs‎

‎ReactiveObjCBridge.xcodeproj/project.pbxproj‎

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,12 @@
142142
BEA5E5E21D864DED00A1F0F2 /* ReactiveObjC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReactiveObjC.framework; path = "build/Debug-appletvos/ReactiveObjC.framework"; sourceTree = "<group>"; };
143143
BEA5E5E41D864DF400A1F0F2 /* ReactiveObjC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReactiveObjC.framework; path = "build/Debug-appletvos/ReactiveObjC.framework"; sourceTree = "<group>"; };
144144
BEA5E5E61D864E7200A1F0F2 /* TestError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestError.swift; sourceTree = "<group>"; };
145+
CD8D21C12322E4BE00C3996F /* macOS-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-Application.xcconfig"; sourceTree = "<group>"; };
146+
CD8D21C22322E4BE00C3996F /* macOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-Framework.xcconfig"; sourceTree = "<group>"; };
147+
CD8D21C32322E4BE00C3996F /* macOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
148+
CD8D21C42322E4BE00C3996F /* macOS-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-Base.xcconfig"; sourceTree = "<group>"; };
149+
CD8D21C52322E4BE00C3996F /* macOS-XCTest.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-XCTest.xcconfig"; sourceTree = "<group>"; };
150+
CD8D21C62322E4BE00C3996F /* macOS-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-DynamicLibrary.xcconfig"; sourceTree = "<group>"; };
145151
CDC42E2E1AE7AB8B00965373 /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Result.framework; sourceTree = BUILT_PRODUCTS_DIR; };
146152
D037672B19EDA75D00A782A9 /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Quick.framework; sourceTree = BUILT_PRODUCTS_DIR; };
147153
D04725EA19E49ED7006002AA /* ReactiveObjCBridge.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ReactiveObjCBridge.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -163,11 +169,6 @@
163169
D047263319E49FE8006002AA /* iOS-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Base.xcconfig"; sourceTree = "<group>"; };
164170
D047263419E49FE8006002AA /* iOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Framework.xcconfig"; sourceTree = "<group>"; };
165171
D047263519E49FE8006002AA /* iOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
166-
D047263719E49FE8006002AA /* Mac-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Application.xcconfig"; sourceTree = "<group>"; };
167-
D047263819E49FE8006002AA /* Mac-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Base.xcconfig"; sourceTree = "<group>"; };
168-
D047263919E49FE8006002AA /* Mac-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-DynamicLibrary.xcconfig"; sourceTree = "<group>"; };
169-
D047263A19E49FE8006002AA /* Mac-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Framework.xcconfig"; sourceTree = "<group>"; };
170-
D047263B19E49FE8006002AA /* Mac-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
171172
D047263C19E49FE8006002AA /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
172173
D05E662419EDD82000904ACA /* Nimble.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Nimble.framework; sourceTree = BUILT_PRODUCTS_DIR; };
173174
D0A226101A72F30B00D33B74 /* ObjectiveCBridgingSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = ObjectiveCBridgingSpec.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
@@ -293,6 +294,19 @@
293294
name = Frameworks;
294295
sourceTree = "<group>";
295296
};
297+
CD8D21C02322E4BE00C3996F /* macOS */ = {
298+
isa = PBXGroup;
299+
children = (
300+
CD8D21C12322E4BE00C3996F /* macOS-Application.xcconfig */,
301+
CD8D21C22322E4BE00C3996F /* macOS-Framework.xcconfig */,
302+
CD8D21C32322E4BE00C3996F /* macOS-StaticLibrary.xcconfig */,
303+
CD8D21C42322E4BE00C3996F /* macOS-Base.xcconfig */,
304+
CD8D21C52322E4BE00C3996F /* macOS-XCTest.xcconfig */,
305+
CD8D21C62322E4BE00C3996F /* macOS-DynamicLibrary.xcconfig */,
306+
);
307+
path = macOS;
308+
sourceTree = "<group>";
309+
};
296310
D04725E019E49ED7006002AA = {
297311
isa = PBXGroup;
298312
children = (
@@ -365,7 +379,7 @@
365379
children = (
366380
D047262619E49FE8006002AA /* Base */,
367381
D047263119E49FE8006002AA /* iOS */,
368-
D047263619E49FE8006002AA /* Mac OS X */,
382+
CD8D21C02322E4BE00C3996F /* macOS */,
369383
A97451321B3A935E00F48E55 /* watchOS */,
370384
57A4D2431BA13F9700F7D4B1 /* tvOS */,
371385
D047263C19E49FE8006002AA /* README.md */,
@@ -416,18 +430,6 @@
416430
path = iOS;
417431
sourceTree = "<group>";
418432
};
419-
D047263619E49FE8006002AA /* Mac OS X */ = {
420-
isa = PBXGroup;
421-
children = (
422-
D047263719E49FE8006002AA /* Mac-Application.xcconfig */,
423-
D047263819E49FE8006002AA /* Mac-Base.xcconfig */,
424-
D047263919E49FE8006002AA /* Mac-DynamicLibrary.xcconfig */,
425-
D047263A19E49FE8006002AA /* Mac-Framework.xcconfig */,
426-
D047263B19E49FE8006002AA /* Mac-StaticLibrary.xcconfig */,
427-
);
428-
path = "Mac OS X";
429-
sourceTree = "<group>";
430-
};
431433
/* End PBXGroup section */
432434

433435
/* Begin PBXHeadersBuildPhase section */
@@ -1038,6 +1040,7 @@
10381040
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
10391041
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
10401042
CLANG_WARN_COMMA = YES;
1043+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
10411044
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
10421045
CLANG_WARN_STRICT_PROTOTYPES = YES;
10431046
CODE_SIGNING_REQUIRED = NO;
@@ -1063,6 +1066,7 @@
10631066
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
10641067
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
10651068
CLANG_WARN_COMMA = YES;
1069+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
10661070
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
10671071
CLANG_WARN_STRICT_PROTOTYPES = YES;
10681072
CODE_SIGNING_REQUIRED = NO;
@@ -1083,7 +1087,7 @@
10831087
};
10841088
D047260119E49ED7006002AA /* Debug */ = {
10851089
isa = XCBuildConfiguration;
1086-
baseConfigurationReference = D047263A19E49FE8006002AA /* Mac-Framework.xcconfig */;
1090+
baseConfigurationReference = CD8D21C22322E4BE00C3996F /* macOS-Framework.xcconfig */;
10871091
buildSettings = {
10881092
DYLIB_COMPATIBILITY_VERSION = 1;
10891093
DYLIB_CURRENT_VERSION = 1;
@@ -1100,7 +1104,7 @@
11001104
};
11011105
D047260219E49ED7006002AA /* Release */ = {
11021106
isa = XCBuildConfiguration;
1103-
baseConfigurationReference = D047263A19E49FE8006002AA /* Mac-Framework.xcconfig */;
1107+
baseConfigurationReference = CD8D21C22322E4BE00C3996F /* macOS-Framework.xcconfig */;
11041108
buildSettings = {
11051109
DYLIB_COMPATIBILITY_VERSION = 1;
11061110
DYLIB_CURRENT_VERSION = 1;
@@ -1117,7 +1121,7 @@
11171121
};
11181122
D047260419E49ED7006002AA /* Debug */ = {
11191123
isa = XCBuildConfiguration;
1120-
baseConfigurationReference = D047263719E49FE8006002AA /* Mac-Application.xcconfig */;
1124+
baseConfigurationReference = CD8D21C12322E4BE00C3996F /* macOS-Application.xcconfig */;
11211125
buildSettings = {
11221126
FRAMEWORK_SEARCH_PATHS = (
11231127
"$(DEVELOPER_FRAMEWORKS_DIR)",
@@ -1133,7 +1137,7 @@
11331137
};
11341138
D047260519E49ED7006002AA /* Release */ = {
11351139
isa = XCBuildConfiguration;
1136-
baseConfigurationReference = D047263719E49FE8006002AA /* Mac-Application.xcconfig */;
1140+
baseConfigurationReference = CD8D21C12322E4BE00C3996F /* macOS-Application.xcconfig */;
11371141
buildSettings = {
11381142
FRAMEWORK_SEARCH_PATHS = (
11391143
"$(DEVELOPER_FRAMEWORKS_DIR)",
@@ -1219,6 +1223,7 @@
12191223
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
12201224
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
12211225
CLANG_WARN_COMMA = YES;
1226+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
12221227
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
12231228
CLANG_WARN_STRICT_PROTOTYPES = YES;
12241229
CODE_SIGNING_REQUIRED = NO;
@@ -1237,7 +1242,7 @@
12371242
};
12381243
D047263E19E4A008006002AA /* Profile */ = {
12391244
isa = XCBuildConfiguration;
1240-
baseConfigurationReference = D047263A19E49FE8006002AA /* Mac-Framework.xcconfig */;
1245+
baseConfigurationReference = CD8D21C22322E4BE00C3996F /* macOS-Framework.xcconfig */;
12411246
buildSettings = {
12421247
DYLIB_COMPATIBILITY_VERSION = 1;
12431248
DYLIB_CURRENT_VERSION = 1;
@@ -1254,7 +1259,7 @@
12541259
};
12551260
D047263F19E4A008006002AA /* Profile */ = {
12561261
isa = XCBuildConfiguration;
1257-
baseConfigurationReference = D047263719E49FE8006002AA /* Mac-Application.xcconfig */;
1262+
baseConfigurationReference = CD8D21C12322E4BE00C3996F /* macOS-Application.xcconfig */;
12581263
buildSettings = {
12591264
FRAMEWORK_SEARCH_PATHS = (
12601265
"$(DEVELOPER_FRAMEWORKS_DIR)",
@@ -1308,6 +1313,7 @@
13081313
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
13091314
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
13101315
CLANG_WARN_COMMA = YES;
1316+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
13111317
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
13121318
CLANG_WARN_STRICT_PROTOTYPES = YES;
13131319
CODE_SIGNING_REQUIRED = NO;
@@ -1326,7 +1332,7 @@
13261332
};
13271333
D047264319E4A00B006002AA /* Test */ = {
13281334
isa = XCBuildConfiguration;
1329-
baseConfigurationReference = D047263A19E49FE8006002AA /* Mac-Framework.xcconfig */;
1335+
baseConfigurationReference = CD8D21C22322E4BE00C3996F /* macOS-Framework.xcconfig */;
13301336
buildSettings = {
13311337
DYLIB_COMPATIBILITY_VERSION = 1;
13321338
DYLIB_CURRENT_VERSION = 1;
@@ -1343,7 +1349,7 @@
13431349
};
13441350
D047264419E4A00B006002AA /* Test */ = {
13451351
isa = XCBuildConfiguration;
1346-
baseConfigurationReference = D047263719E49FE8006002AA /* Mac-Application.xcconfig */;
1352+
baseConfigurationReference = CD8D21C12322E4BE00C3996F /* macOS-Application.xcconfig */;
13471353
buildSettings = {
13481354
FRAMEWORK_SEARCH_PATHS = (
13491355
"$(DEVELOPER_FRAMEWORKS_DIR)",

0 commit comments

Comments
 (0)