Skip to content

Commit e887716

Browse files
authored
Use official xcconfigs repository (#832)
* Use official xcconfigs repository * Use macOS-XCTest configuration over macOS-Application for test targets
1 parent 8a65fd5 commit e887716

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
url = https://github.com/Quick/Quick.git
77
[submodule "Carthage/Checkouts/xcconfigs"]
88
path = Carthage/Checkouts/xcconfigs
9-
url = https://github.com/jspahrsummers/xcconfigs.git
9+
url = https://github.com/xcconfigs/xcconfigs.git

Cartfile.private

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "jspahrsummers/xcconfigs" ~> 1.1
1+
github "xcconfigs/xcconfigs" ~> 1.1
22
github "Quick/Quick" ~> 3.0.0
33
github "Quick/Nimble" ~> 9.0.0

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "Quick/Nimble" "v9.0.0"
22
github "Quick/Quick" "v3.0.0"
3-
github "jspahrsummers/xcconfigs" "1.1"
3+
github "xcconfigs/xcconfigs" "1.1"

ReactiveSwift.xcodeproj/project.pbxproj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,7 @@
418418
D8170FC01B100EBC004192AD /* FoundationExtensionsSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FoundationExtensionsSpec.swift; sourceTree = "<group>"; };
419419
D85C65291C0D84C7005A77AD /* Flatten.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Flatten.swift; sourceTree = "<group>"; };
420420
D871D69E1B3B29A40070F16C /* Optional.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Optional.swift; sourceTree = "<group>"; };
421+
E6124BA9267DF505005A3490 /* macOS-XCTest.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-XCTest.xcconfig"; sourceTree = "<group>"; };
421422
EBCC7DBB1BBF010C00A2AE92 /* Signal.Observer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = Signal.Observer.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
422423
/* End PBXFileReference section */
423424

@@ -719,6 +720,7 @@
719720
D047263919E49FE8006002AA /* macOS-DynamicLibrary.xcconfig */,
720721
D047263A19E49FE8006002AA /* macOS-Framework.xcconfig */,
721722
D047263B19E49FE8006002AA /* macOS-StaticLibrary.xcconfig */,
723+
E6124BA9267DF505005A3490 /* macOS-XCTest.xcconfig */,
722724
);
723725
path = macOS;
724726
sourceTree = "<group>";
@@ -1561,7 +1563,7 @@
15611563
};
15621564
D047260419E49ED7006002AA /* Debug */ = {
15631565
isa = XCBuildConfiguration;
1564-
baseConfigurationReference = D047263719E49FE8006002AA /* macOS-Application.xcconfig */;
1566+
baseConfigurationReference = E6124BA9267DF505005A3490 /* macOS-XCTest.xcconfig */;
15651567
buildSettings = {
15661568
INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist;
15671569
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
@@ -1572,7 +1574,7 @@
15721574
};
15731575
D047260519E49ED7006002AA /* Release */ = {
15741576
isa = XCBuildConfiguration;
1575-
baseConfigurationReference = D047263719E49FE8006002AA /* macOS-Application.xcconfig */;
1577+
baseConfigurationReference = E6124BA9267DF505005A3490 /* macOS-XCTest.xcconfig */;
15761578
buildSettings = {
15771579
INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist;
15781580
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
@@ -1661,7 +1663,7 @@
16611663
};
16621664
D047263F19E4A008006002AA /* Profile */ = {
16631665
isa = XCBuildConfiguration;
1664-
baseConfigurationReference = D047263719E49FE8006002AA /* macOS-Application.xcconfig */;
1666+
baseConfigurationReference = E6124BA9267DF505005A3490 /* macOS-XCTest.xcconfig */;
16651667
buildSettings = {
16661668
INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist;
16671669
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
@@ -1727,7 +1729,7 @@
17271729
};
17281730
D047264419E4A00B006002AA /* Test */ = {
17291731
isa = XCBuildConfiguration;
1730-
baseConfigurationReference = D047263719E49FE8006002AA /* macOS-Application.xcconfig */;
1732+
baseConfigurationReference = E6124BA9267DF505005A3490 /* macOS-XCTest.xcconfig */;
17311733
buildSettings = {
17321734
INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist;
17331735
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";

0 commit comments

Comments
 (0)