From 9537a66158a33568ea0f841b5c38e9f86d9f5f07 Mon Sep 17 00:00:00 2001 From: vvveiii Date: Sat, 21 Mar 2020 22:16:00 +0800 Subject: [PATCH 1/3] Update Carthage dependencies --- Cartfile.resolved | 6 +-- Carthage/Checkouts/Nimble | 2 +- Carthage/Checkouts/ZipArchive | 2 +- Carthage/Checkouts/xcconfigs | 2 +- .../project.pbxproj | 44 ++++++++++++++----- 5 files changed, 38 insertions(+), 18 deletions(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index 36c5288e0..5fe843334 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ -github "Quick/Nimble" "v7.3.3" +github "Quick/Nimble" "v7.3.4" github "Quick/Quick" "v1.3.4" -github "ZipArchive/ZipArchive" "v2.1.4" -github "jspahrsummers/xcconfigs" "bb795558a76e5daf3688500055bbcfe243bffa8d" +github "ZipArchive/ZipArchive" "v2.2.2" +github "jspahrsummers/xcconfigs" "81e1c552847883c15d5cbfda2adca6ec78044ead" diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble index 9a281b1cf..e9d769113 160000 --- a/Carthage/Checkouts/Nimble +++ b/Carthage/Checkouts/Nimble @@ -1 +1 @@ -Subproject commit 9a281b1cfa1c53d1e8bd92e1798e4e473af8d263 +Subproject commit e9d769113660769a4d9dd3afb855562c0b7ae7b0 diff --git a/Carthage/Checkouts/ZipArchive b/Carthage/Checkouts/ZipArchive index e8b08ceb6..582949eaf 160000 --- a/Carthage/Checkouts/ZipArchive +++ b/Carthage/Checkouts/ZipArchive @@ -1 +1 @@ -Subproject commit e8b08ceb6ab9ff56e0826913b13680a129a92828 +Subproject commit 582949eaf50e988305bc9e76302ab020ca3d900b diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs index bb795558a..81e1c5528 160000 --- a/Carthage/Checkouts/xcconfigs +++ b/Carthage/Checkouts/xcconfigs @@ -1 +1 @@ -Subproject commit bb795558a76e5daf3688500055bbcfe243bffa8d +Subproject commit 81e1c552847883c15d5cbfda2adca6ec78044ead diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index 3edf16bdf..4c42c3c81 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -453,6 +453,12 @@ /* Begin PBXFileReference section */ 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; + 15CDDA5E2426568C00FC081A /* macOS-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-Application.xcconfig"; sourceTree = ""; }; + 15CDDA5F2426568C00FC081A /* macOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-Framework.xcconfig"; sourceTree = ""; }; + 15CDDA602426568C00FC081A /* macOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-StaticLibrary.xcconfig"; sourceTree = ""; }; + 15CDDA612426568C00FC081A /* macOS-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-Base.xcconfig"; sourceTree = ""; }; + 15CDDA622426568C00FC081A /* macOS-XCTest.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-XCTest.xcconfig"; sourceTree = ""; }; + 15CDDA632426568C00FC081A /* macOS-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-DynamicLibrary.xcconfig"; sourceTree = ""; }; 200578C418932A82001C06C3 /* GTBlameSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTBlameSpec.m; sourceTree = ""; }; 2089E43B17D9A58000F451DA /* GTTagSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTTagSpec.m; sourceTree = ""; }; 20F43DE118A2F667007D3621 /* GTRepository+Blame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+Blame.h"; sourceTree = ""; }; @@ -782,6 +788,19 @@ name = Resources; sourceTree = ""; }; + 15CDDA5D2426568C00FC081A /* macOS */ = { + isa = PBXGroup; + children = ( + 15CDDA5E2426568C00FC081A /* macOS-Application.xcconfig */, + 15CDDA5F2426568C00FC081A /* macOS-Framework.xcconfig */, + 15CDDA602426568C00FC081A /* macOS-StaticLibrary.xcconfig */, + 15CDDA612426568C00FC081A /* macOS-Base.xcconfig */, + 15CDDA622426568C00FC081A /* macOS-XCTest.xcconfig */, + 15CDDA632426568C00FC081A /* macOS-DynamicLibrary.xcconfig */, + ); + path = macOS; + sourceTree = ""; + }; 306123A817EA5261006591D4 /* extobjc */ = { isa = PBXGroup; children = ( @@ -1035,6 +1054,7 @@ D0A463D517E57C45000F5021 /* Base */, D0D81862174421EB00995A2E /* iOS */, D0D81866174421EB00995A2E /* Mac OS X */, + 15CDDA5D2426568C00FC081A /* macOS */, D0D8186C174421EB00995A2E /* README.md */, ); name = Configuration; @@ -1694,7 +1714,7 @@ /* Begin XCBuildConfiguration section */ 1DEB91AE08733DA50010E9CD /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */; + baseConfigurationReference = 15CDDA5F2426568C00FC081A /* macOS-Framework.xcconfig */; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1723,7 +1743,7 @@ }; 1DEB91AF08733DA50010E9CD /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */; + baseConfigurationReference = 15CDDA5F2426568C00FC081A /* macOS-Framework.xcconfig */; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1878,7 +1898,7 @@ }; 88F05A8016011E5400B7AD1D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F81B6B54207B0A9F00AB0836 /* Mac-XCTest.xcconfig */; + baseConfigurationReference = 15CDDA622426568C00FC081A /* macOS-XCTest.xcconfig */; buildSettings = { CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -1904,7 +1924,7 @@ }; 88F05A8116011E5400B7AD1D /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0D81867174421EB00995A2E /* Mac-Application.xcconfig */; + baseConfigurationReference = 15CDDA5E2426568C00FC081A /* macOS-Application.xcconfig */; buildSettings = { CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -1963,7 +1983,7 @@ }; D019778E19F830F500F523DA /* Test */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */; + baseConfigurationReference = 15CDDA5F2426568C00FC081A /* macOS-Framework.xcconfig */; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1992,7 +2012,7 @@ }; D019778F19F830F500F523DA /* Test */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F81B6B54207B0A9F00AB0836 /* Mac-XCTest.xcconfig */; + baseConfigurationReference = 15CDDA622426568C00FC081A /* macOS-XCTest.xcconfig */; buildSettings = { CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -2038,7 +2058,7 @@ }; D019779219F830F500F523DA /* Test */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */; + baseConfigurationReference = 15CDDA602426568C00FC081A /* macOS-StaticLibrary.xcconfig */; buildSettings = { PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -2183,7 +2203,7 @@ }; D03FC3D81602E97F00BCFA73 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */; + baseConfigurationReference = 15CDDA5F2426568C00FC081A /* macOS-Framework.xcconfig */; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -2212,7 +2232,7 @@ }; D03FC3DA1602E97F00BCFA73 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0D81867174421EB00995A2E /* Mac-Application.xcconfig */; + baseConfigurationReference = 15CDDA5E2426568C00FC081A /* macOS-Application.xcconfig */; buildSettings = { CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -2233,7 +2253,7 @@ }; D03FC3DB1602E97F00BCFA73 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */; + baseConfigurationReference = 15CDDA602426568C00FC081A /* macOS-StaticLibrary.xcconfig */; buildSettings = { PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -2249,7 +2269,7 @@ }; D0A330EF16027F1E00A616FA /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */; + baseConfigurationReference = 15CDDA602426568C00FC081A /* macOS-StaticLibrary.xcconfig */; buildSettings = { PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -2257,7 +2277,7 @@ }; D0A330F016027F1E00A616FA /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */; + baseConfigurationReference = 15CDDA602426568C00FC081A /* macOS-StaticLibrary.xcconfig */; buildSettings = { PRODUCT_NAME = "$(TARGET_NAME)"; }; From 9cf137736c522e3edb737bd980804811dbee36cb Mon Sep 17 00:00:00 2001 From: vvveiii Date: Sat, 21 Mar 2020 22:18:41 +0800 Subject: [PATCH 2/3] Remove deprecated xcconfigs --- .../project.pbxproj | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index 4c42c3c81..8dfde6e72 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -634,11 +634,6 @@ D0D81863174421EB00995A2E /* iOS-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Application.xcconfig"; sourceTree = ""; }; D0D81864174421EB00995A2E /* iOS-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Base.xcconfig"; sourceTree = ""; }; D0D81865174421EB00995A2E /* iOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-StaticLibrary.xcconfig"; sourceTree = ""; }; - D0D81867174421EB00995A2E /* Mac-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Application.xcconfig"; sourceTree = ""; }; - D0D81868174421EB00995A2E /* Mac-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Base.xcconfig"; sourceTree = ""; }; - D0D81869174421EB00995A2E /* Mac-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-DynamicLibrary.xcconfig"; sourceTree = ""; }; - D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Framework.xcconfig"; sourceTree = ""; }; - D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-StaticLibrary.xcconfig"; sourceTree = ""; }; D0D8186C174421EB00995A2E /* README.md */ = {isa = PBXFileReference; lastKnownFileType = text; path = README.md; sourceTree = ""; }; D0F4E28917C7F24200BBDE30 /* NSErrorGitSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSErrorGitSpec.m; sourceTree = ""; }; DD3D9510182A81E1004AF532 /* GTBlame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTBlame.h; sourceTree = ""; }; @@ -647,7 +642,6 @@ DD3D951B182AB25C004AF532 /* GTBlameHunk.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTBlameHunk.m; sourceTree = ""; }; F81B6B51207B0A7700AB0836 /* Extension.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Extension.xcconfig; sourceTree = ""; }; F81B6B53207B0A8B00AB0836 /* iOS-Extension.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Extension.xcconfig"; sourceTree = ""; }; - F81B6B54207B0A9F00AB0836 /* Mac-XCTest.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Mac-XCTest.xcconfig"; sourceTree = ""; }; F879D82F1B4B77F4002D5C07 /* Libgit2FeaturesSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Libgit2FeaturesSpec.m; sourceTree = ""; }; F879D8361B4B7F7C002D5C07 /* ObjectiveGit-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ObjectiveGit-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; F8D1BDEC1B31FE7C00CDEC90 /* GTRepository+Pull.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+Pull.h"; sourceTree = ""; }; @@ -1053,7 +1047,6 @@ children = ( D0A463D517E57C45000F5021 /* Base */, D0D81862174421EB00995A2E /* iOS */, - D0D81866174421EB00995A2E /* Mac OS X */, 15CDDA5D2426568C00FC081A /* macOS */, D0D8186C174421EB00995A2E /* README.md */, ); @@ -1073,19 +1066,6 @@ path = iOS; sourceTree = ""; }; - D0D81866174421EB00995A2E /* Mac OS X */ = { - isa = PBXGroup; - children = ( - D0D81867174421EB00995A2E /* Mac-Application.xcconfig */, - D0D81868174421EB00995A2E /* Mac-Base.xcconfig */, - D0D81869174421EB00995A2E /* Mac-DynamicLibrary.xcconfig */, - D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */, - D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */, - F81B6B54207B0A9F00AB0836 /* Mac-XCTest.xcconfig */, - ); - path = "Mac OS X"; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ From c50d760e65f120c66677ae376946ee4de6930a90 Mon Sep 17 00:00:00 2001 From: vvveiii Date: Sat, 21 Mar 2020 22:26:02 +0800 Subject: [PATCH 3/3] Add `External/build` to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index dc2f3d3ef..faa84754a 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ External/libssh2-ios Carthage/Build +External/build