diff --git a/Cartfile.private b/Cartfile.private index da3abe3..350bcb2 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,4 +1,4 @@ -github "jspahrsummers/xcconfigs" ~> 0.12 +github "jspahrsummers/xcconfigs" ~> 1.0 github "Quick/Quick" ~> 2.0 github "Quick/Nimble" ~> 8.0 github "ZipArchive/ZipArchive" ~> 2.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 6df61af..f85cfe8 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -2,4 +2,4 @@ github "Quick/Nimble" "v8.0.1" github "Quick/Quick" "v2.0.0" github "ZipArchive/ZipArchive" "v2.1.5" github "antitypical/Result" "4.1.0" -github "jspahrsummers/xcconfigs" "0.12" +github "jspahrsummers/xcconfigs" "1.0" diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs index bb79555..d0f8992 160000 --- a/Carthage/Checkouts/xcconfigs +++ b/Carthage/Checkouts/xcconfigs @@ -1 +1 @@ -Subproject commit bb795558a76e5daf3688500055bbcfe243bffa8d +Subproject commit d0f8992afad45262cfe3a3cf512e7127fdcf296c diff --git a/SwiftGit2.xcodeproj/project.pbxproj b/SwiftGit2.xcodeproj/project.pbxproj index 609cbc3..1a48d4b 100644 --- a/SwiftGit2.xcodeproj/project.pbxproj +++ b/SwiftGit2.xcodeproj/project.pbxproj @@ -177,11 +177,11 @@ BEB31F4F1A0D75EE00F525B9 /* iOS-Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "iOS-Base.xcconfig"; sourceTree = ""; }; BEB31F501A0D75EE00F525B9 /* iOS-Framework.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "iOS-Framework.xcconfig"; sourceTree = ""; }; BEB31F511A0D75EE00F525B9 /* iOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "iOS-StaticLibrary.xcconfig"; sourceTree = ""; }; - BEB31F531A0D75EE00F525B9 /* Mac-Application.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Mac-Application.xcconfig"; sourceTree = ""; }; - BEB31F541A0D75EE00F525B9 /* Mac-Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Mac-Base.xcconfig"; sourceTree = ""; }; - BEB31F551A0D75EE00F525B9 /* Mac-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Mac-DynamicLibrary.xcconfig"; sourceTree = ""; }; - BEB31F561A0D75EE00F525B9 /* Mac-Framework.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Mac-Framework.xcconfig"; sourceTree = ""; }; - BEB31F571A0D75EE00F525B9 /* Mac-StaticLibrary.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Mac-StaticLibrary.xcconfig"; sourceTree = ""; }; + BEB31F531A0D75EE00F525B9 /* macOS-Application.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "macOS-Application.xcconfig"; sourceTree = ""; }; + BEB31F541A0D75EE00F525B9 /* macOS-Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "macOS-Base.xcconfig"; sourceTree = ""; }; + BEB31F551A0D75EE00F525B9 /* macOS-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "macOS-DynamicLibrary.xcconfig"; sourceTree = ""; }; + BEB31F561A0D75EE00F525B9 /* macOS-Framework.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "macOS-Framework.xcconfig"; sourceTree = ""; }; + BEB31F571A0D75EE00F525B9 /* macOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "macOS-StaticLibrary.xcconfig"; sourceTree = ""; }; BEB31F581A0D75EE00F525B9 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; BEB31F6C1A0D78F300F525B9 /* Repository.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Repository.swift; sourceTree = ""; }; BEB31F8F1A0E563900F525B9 /* libgit2.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libgit2.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -364,7 +364,7 @@ children = ( BEB31F421A0D75EE00F525B9 /* Base */, BEB31F4D1A0D75EE00F525B9 /* iOS */, - BEB31F521A0D75EE00F525B9 /* Mac OS X */, + BEB31F521A0D75EE00F525B9 /* macOS */, BEB31F581A0D75EE00F525B9 /* README.md */, ); name = Configuration; @@ -413,16 +413,16 @@ path = iOS; sourceTree = ""; }; - BEB31F521A0D75EE00F525B9 /* Mac OS X */ = { + BEB31F521A0D75EE00F525B9 /* macOS */ = { isa = PBXGroup; children = ( - BEB31F531A0D75EE00F525B9 /* Mac-Application.xcconfig */, - BEB31F541A0D75EE00F525B9 /* Mac-Base.xcconfig */, - BEB31F551A0D75EE00F525B9 /* Mac-DynamicLibrary.xcconfig */, - BEB31F561A0D75EE00F525B9 /* Mac-Framework.xcconfig */, - BEB31F571A0D75EE00F525B9 /* Mac-StaticLibrary.xcconfig */, + BEB31F531A0D75EE00F525B9 /* macOS-Application.xcconfig */, + BEB31F541A0D75EE00F525B9 /* macOS-Base.xcconfig */, + BEB31F551A0D75EE00F525B9 /* macOS-DynamicLibrary.xcconfig */, + BEB31F561A0D75EE00F525B9 /* macOS-Framework.xcconfig */, + BEB31F571A0D75EE00F525B9 /* macOS-StaticLibrary.xcconfig */, ); - path = "Mac OS X"; + path = macOS; sourceTree = ""; }; BEB31FA11A0E63C100F525B9 /* Libraries */ = { @@ -1005,7 +1005,7 @@ }; BEB31F3A1A0D6F7A00F525B9 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BEB31F561A0D75EE00F525B9 /* Mac-Framework.xcconfig */; + baseConfigurationReference = BEB31F561A0D75EE00F525B9 /* macOS-Framework.xcconfig */; buildSettings = { HEADER_SEARCH_PATHS = ( "$(SRCROOT)/External/libgit2/include", @@ -1033,7 +1033,7 @@ }; BEB31F3B1A0D6F7A00F525B9 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BEB31F561A0D75EE00F525B9 /* Mac-Framework.xcconfig */; + baseConfigurationReference = BEB31F561A0D75EE00F525B9 /* macOS-Framework.xcconfig */; buildSettings = { HEADER_SEARCH_PATHS = ( "$(SRCROOT)/External/libgit2/include", @@ -1061,7 +1061,7 @@ }; BEB31F3D1A0D6F7A00F525B9 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BEB31F531A0D75EE00F525B9 /* Mac-Application.xcconfig */; + baseConfigurationReference = BEB31F531A0D75EE00F525B9 /* macOS-Application.xcconfig */; buildSettings = { INFOPLIST_FILE = SwiftGit2Tests/Info.plist; MACOSX_DEPLOYMENT_TARGET = 10.10; @@ -1072,7 +1072,7 @@ }; BEB31F3E1A0D6F7A00F525B9 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BEB31F531A0D75EE00F525B9 /* Mac-Application.xcconfig */; + baseConfigurationReference = BEB31F531A0D75EE00F525B9 /* macOS-Application.xcconfig */; buildSettings = { INFOPLIST_FILE = SwiftGit2Tests/Info.plist; MACOSX_DEPLOYMENT_TARGET = 10.10; @@ -1083,7 +1083,7 @@ }; BEB31F911A0E563900F525B9 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BEB31F571A0D75EE00F525B9 /* Mac-StaticLibrary.xcconfig */; + baseConfigurationReference = BEB31F571A0D75EE00F525B9 /* macOS-StaticLibrary.xcconfig */; buildSettings = { PRODUCT_NAME = git2; }; @@ -1091,7 +1091,7 @@ }; BEB31F921A0E563900F525B9 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BEB31F571A0D75EE00F525B9 /* Mac-StaticLibrary.xcconfig */; + baseConfigurationReference = BEB31F571A0D75EE00F525B9 /* macOS-StaticLibrary.xcconfig */; buildSettings = { PRODUCT_NAME = git2; };