diff --git a/.gitignore b/.gitignore index dc2f3d3ef..7caa37186 100644 --- a/.gitignore +++ b/.gitignore @@ -2,16 +2,6 @@ *.swp *~.nib -build/* -.build/* -build-iPhoneSimulator/* -build-iPhoneOS/* -objective-git.bridgesupport -ObjectiveGitFramework/build/* -ObjectiveGit-iOS.framework/* -External/libgit2*.a -External/libgit2-ios - *.pbxuser *.perspective *.perspectivev3 @@ -19,16 +9,10 @@ External/libgit2-ios *.mode1v3 *.mode2v3 -project.xcworkspace */xcuserdata/ *.xccheckout *.xcscmblueprint -ObjectiveGitTests/fixtures/Fixtures/* - -External/ios-openssl/include -External/ios-openssl/lib -External/libssh2-ios - +External/libgit2-mac.a Carthage/Build diff --git a/.travis.yml b/.travis.yml index 4cab7cf69..52c7d6dcc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,17 +7,15 @@ # --- os: osx -osx_image: xcode9.3 +osx_image: xcode12.2 language: objective-c matrix: fast_finish: true include: - - osx_image: xcode9.3 - env: + - env: - SCHEME="ObjectiveGit Mac" - - osx_image: xcode9.3 - env: + - env: - SCHEME="ObjectiveGit iOS" before_install: diff --git a/Cartfile.private b/Cartfile.private index 0dfa9b497..b021ce726 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,4 +1,4 @@ github "jspahrsummers/xcconfigs" "master" -github "Quick/Quick" ~> 1.3.4 -github "Quick/Nimble" ~> 7.3.3 -github "ZipArchive/ZipArchive" ~> 2.1.4 +github "Quick/Quick" ~> 2.1.0 +github "Quick/Nimble" ~> 8.0.1 +github "ZipArchive/ZipArchive" ~> 2.2.3 diff --git a/Cartfile.resolved b/Cartfile.resolved index 36c5288e0..1b6153da6 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ -github "Quick/Nimble" "v7.3.3" -github "Quick/Quick" "v1.3.4" -github "ZipArchive/ZipArchive" "v2.1.4" -github "jspahrsummers/xcconfigs" "bb795558a76e5daf3688500055bbcfe243bffa8d" +github "Quick/Nimble" "v8.1.2" +github "Quick/Quick" "v2.2.1" +github "ZipArchive/ZipArchive" "v2.2.3" +github "jspahrsummers/xcconfigs" "4ced0ad5a971220917994a4edfa6abf9702e3818" diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble index 9a281b1cf..7a46a5fc8 160000 --- a/Carthage/Checkouts/Nimble +++ b/Carthage/Checkouts/Nimble @@ -1 +1 @@ -Subproject commit 9a281b1cfa1c53d1e8bd92e1798e4e473af8d263 +Subproject commit 7a46a5fc86cb917f69e3daf79fcb045283d8f008 diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick index f2b5a0644..09b3becb3 160000 --- a/Carthage/Checkouts/Quick +++ b/Carthage/Checkouts/Quick @@ -1 +1 @@ -Subproject commit f2b5a06440ea87eba1a167cab37bf6496646c52e +Subproject commit 09b3becb37cb2163919a3842a4c5fa6ec7130792 diff --git a/Carthage/Checkouts/ZipArchive b/Carthage/Checkouts/ZipArchive index e8b08ceb6..f3379e6ef 160000 --- a/Carthage/Checkouts/ZipArchive +++ b/Carthage/Checkouts/ZipArchive @@ -1 +1 @@ -Subproject commit e8b08ceb6ab9ff56e0826913b13680a129a92828 +Subproject commit f3379e6efa93e657293573ad196302b94041e464 diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs index bb795558a..4ced0ad5a 160000 --- a/Carthage/Checkouts/xcconfigs +++ b/Carthage/Checkouts/xcconfigs @@ -1 +1 @@ -Subproject commit bb795558a76e5daf3688500055bbcfe243bffa8d +Subproject commit 4ced0ad5a971220917994a4edfa6abf9702e3818 diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index 85d1cf442..26da37c95 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXAggregateTarget section */ @@ -91,14 +91,19 @@ 4D1C40D8182C006D00BE2960 /* GTBlobSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D1C40D7182C006D00BE2960 /* GTBlobSpec.m */; }; 4D79C0EE17DF9F4D00997DE4 /* GTCredential.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D79C0EC17DF9F4D00997DE4 /* GTCredential.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D79C0EF17DF9F4D00997DE4 /* GTCredential.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D79C0ED17DF9F4D00997DE4 /* GTCredential.m */; }; - 4D9BCD24206D84AD003CD3CE /* libgit2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D9BCD23206D84AD003CD3CE /* libgit2.a */; }; 4D9BCD25206D84B2003CD3CE /* libgit2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D9BCD23206D84AD003CD3CE /* libgit2.a */; }; + 4DB9711D2645CA3700D14944 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DB970A32645C8BB00D14944 /* Quick.framework */; }; + 4DB9711F2645CA5200D14944 /* ZipArchive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DB971172645C8F300D14944 /* ZipArchive.framework */; }; + 4DB971202645CA5D00D14944 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DB970AD2645C8BB00D14944 /* Quick.framework */; }; + 4DB971212645CA6600D14944 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DB971062645C8F300D14944 /* Nimble.framework */; }; + 4DB971222645CA6D00D14944 /* ZipArchive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DB971152645C8F300D14944 /* ZipArchive.framework */; }; 4DBA4A3217DA73CE006CD5F5 /* GTRemoteSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DBA4A3117DA73CE006CD5F5 /* GTRemoteSpec.m */; }; 4DC55AE51AD859AD0032563C /* GTCheckoutOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DC55AE31AD859AD0032563C /* GTCheckoutOptions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4DC55AE61AD859AD0032563C /* GTCheckoutOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DC55AE31AD859AD0032563C /* GTCheckoutOptions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4DC55AE71AD859AD0032563C /* GTCheckoutOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DC55AE41AD859AD0032563C /* GTCheckoutOptions.m */; }; 4DC55AE81AD859AD0032563C /* GTCheckoutOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DC55AE41AD859AD0032563C /* GTCheckoutOptions.m */; }; - 4DFA918F207D0B87003CD3CE /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8D63865207ACCAA00D1FD32 /* Nimble.framework */; }; + 4DD769A92645D214007599B8 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DB971022645C8F300D14944 /* Nimble.framework */; }; + 4DD7422C25D3F8CB009D9A17 /* libgit2-mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DD7422B25D3F8CB009D9A17 /* libgit2-mac.a */; }; 4DFFB15B183AA8D600D1565E /* GTRepository+RemoteOperations.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DFFB159183AA8D600D1565E /* GTRepository+RemoteOperations.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4DFFB15C183AA8D600D1565E /* GTRepository+RemoteOperations.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DFFB15A183AA8D600D1565E /* GTRepository+RemoteOperations.m */; }; 55C8055013861FE7004DCB0F /* GTObjectDatabase.m in Sources */ = {isa = PBXBuildFile; fileRef = 55C8054D13861F34004DCB0F /* GTObjectDatabase.m */; }; @@ -305,8 +310,6 @@ D09C2E361755F16200065E36 /* GTSubmodule.h in Headers */ = {isa = PBXBuildFile; fileRef = D09C2E341755F16200065E36 /* GTSubmodule.h */; settings = {ATTRIBUTES = (Public, ); }; }; D09C2E381755F16200065E36 /* GTSubmodule.m in Sources */ = {isa = PBXBuildFile; fileRef = D09C2E351755F16200065E36 /* GTSubmodule.m */; }; D09C2E51175602A500065E36 /* fixtures.zip in Resources */ = {isa = PBXBuildFile; fileRef = D09C2E50175602A500065E36 /* fixtures.zip */; }; - D0A0128A19F98475007F1914 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0A0128819F98475007F1914 /* Quick.framework */; }; - D0A0128C19F9853D007F1914 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0A0128B19F9853D007F1914 /* Nimble.framework */; }; D0A0129519F99EF8007F1914 /* NSDate+GTTimeAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 30B1E7EC1703522100D0814D /* NSDate+GTTimeAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; D0A0129719F9A660007F1914 /* SwiftSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0A0129619F9A660007F1914 /* SwiftSpec.swift */; }; D0AC906C172F941F00347DC4 /* GTRepositorySpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D0AC906B172F941F00347DC4 /* GTRepositorySpec.m */; }; @@ -368,9 +371,6 @@ F8D6385D207AC75100D1FD32 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 23BB67BB1C7DF45300A37A66 /* libz.tbd */; }; F8D6385F207ACAE600D1FD32 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = F8D6385E207ACAE600D1FD32 /* libz.tbd */; }; F8D63861207ACAF700D1FD32 /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = F8D63860207ACAF600D1FD32 /* libiconv.tbd */; }; - F8D63868207ACCEE00D1FD32 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8D63867207ACCEE00D1FD32 /* Quick.framework */; }; - F8D6386A207ACDDD00D1FD32 /* ZipArchive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8D63869207ACDDD00D1FD32 /* ZipArchive.framework */; }; - F8D6386C207ACE0600D1FD32 /* ZipArchive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8D6386B207ACE0600D1FD32 /* ZipArchive.framework */; }; F8E4A2911A170CA6006485A8 /* GTRemotePushSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8E4A2901A170CA6006485A8 /* GTRemotePushSpec.m */; }; F8EFA03A1B4059ED000FF7D0 /* GTUtilityFunctions.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0391B4059ED000FF7D0 /* GTUtilityFunctions.m */; }; F964D5F11CE9D9B200F1D8DD /* GTNote.h in Headers */ = {isa = PBXBuildFile; fileRef = F964D5EF1CE9D9B200F1D8DD /* GTNote.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -388,6 +388,209 @@ remoteGlobalIDString = D0A330ED16027F1E00A616FA; remoteInfo = libgit2; }; + 4DB970A22645C8BB00D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970912645C8BA00D14944 /* Quick.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = DAEB6B8E1943873100289F44; + remoteInfo = "Quick-macOS"; + }; + 4DB970A42645C8BB00D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970912645C8BA00D14944 /* Quick.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = DAEB6B991943873100289F44; + remoteInfo = "Quick - macOSTests"; + }; + 4DB970A62645C8BB00D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970912645C8BA00D14944 /* Quick.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = CD89D17B247A673100C1F086; + remoteInfo = QuickIssue853RegressionTests; + }; + 4DB970A82645C8BB00D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970912645C8BA00D14944 /* Quick.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = DA5663E81A4C8D8500193C88; + remoteInfo = "QuickFocused - macOSTests"; + }; + 4DB970AA2645C8BB00D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970912645C8BA00D14944 /* Quick.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 64076CF51D6D7C2000E2B499; + remoteInfo = "QuickAfterSuite - macOSTests"; + }; + 4DB970AC2645C8BB00D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970912645C8BA00D14944 /* Quick.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 5A5D117C19473F2100F6D13D; + remoteInfo = "Quick-iOS"; + }; + 4DB970AE2645C8BB00D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970912645C8BA00D14944 /* Quick.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 5A5D118619473F2100F6D13D; + remoteInfo = "Quick - iOSTests"; + }; + 4DB970B02645C8BB00D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970912645C8BA00D14944 /* Quick.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = DA9876B21A4C70EB0004AA17; + remoteInfo = "QuickFocused - iOSTests"; + }; + 4DB970B22645C8BB00D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970912645C8BA00D14944 /* Quick.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 64076D081D6D7CD600E2B499; + remoteInfo = "QuickAfterSuite - iOSTests"; + }; + 4DB970B42645C8BB00D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970912645C8BA00D14944 /* Quick.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1F118CD51BDCA4AB005013A2; + remoteInfo = "Quick-tvOS"; + }; + 4DB970B62645C8BB00D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970912645C8BA00D14944 /* Quick.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1F118CDE1BDCA4AB005013A2; + remoteInfo = "Quick - tvOSTests"; + }; + 4DB970B82645C8BB00D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970912645C8BA00D14944 /* Quick.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1F118CF01BDCA4BB005013A2; + remoteInfo = "QuickFocused - tvOSTests"; + }; + 4DB970BA2645C8BB00D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970912645C8BA00D14944 /* Quick.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 64076D1A1D6D7CEA00E2B499; + remoteInfo = "QuickAfterSuite - tvOSTests"; + }; + 4DB971012645C8F300D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970F72645C8F300D14944 /* Nimble.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1F925EAD195C0D6300ED456B; + remoteInfo = "Nimble-macOS"; + }; + 4DB971032645C8F300D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970F72645C8F300D14944 /* Nimble.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1F925EB7195C0D6300ED456B; + remoteInfo = "Nimble-macOSTests"; + }; + 4DB971052645C8F300D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970F72645C8F300D14944 /* Nimble.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1F1A74291940169200FFFC47; + remoteInfo = "Nimble-iOS"; + }; + 4DB971072645C8F300D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970F72645C8F300D14944 /* Nimble.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1F1A74341940169200FFFC47; + remoteInfo = "Nimble-iOSTests"; + }; + 4DB971092645C8F300D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970F72645C8F300D14944 /* Nimble.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1F5DF1551BDCA0CE00C3A531; + remoteInfo = "Nimble-tvOS"; + }; + 4DB9710B2645C8F300D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970F72645C8F300D14944 /* Nimble.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1F5DF15E1BDCA0CE00C3A531; + remoteInfo = "Nimble-tvOSTests"; + }; + 4DB971142645C8F300D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB9710D2645C8F300D14944 /* ZipArchive.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B423AE1A1C0DF76A0004A2F1; + remoteInfo = "ZipArchive-iOS"; + }; + 4DB971162645C8F300D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB9710D2645C8F300D14944 /* ZipArchive.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = AFF75A241C37279600F450AC; + remoteInfo = "ZipArchive-Mac"; + }; + 4DB971182645C8F300D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB9710D2645C8F300D14944 /* ZipArchive.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 37952C261F63B50D00DD6677; + remoteInfo = "ZipArchive-tvos"; + }; + 4DB9711A2645C8F300D14944 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB9710D2645C8F300D14944 /* ZipArchive.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 37952C5E1F63BB7100DD6677; + remoteInfo = "ZipArchive-watchos"; + }; + 4DD769842645D15D007599B8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970912645C8BA00D14944 /* Quick.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = DAEB6B8D1943873100289F44; + remoteInfo = "Quick-macOS"; + }; + 4DD769862645D15D007599B8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970F72645C8F300D14944 /* Nimble.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 1F925EAC195C0D6300ED456B; + remoteInfo = "Nimble-macOS"; + }; + 4DD769882645D15D007599B8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB9710D2645C8F300D14944 /* ZipArchive.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = AFF75A231C37279600F450AC; + remoteInfo = "ZipArchive-Mac"; + }; + 4DD769A32645D16B007599B8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970912645C8BA00D14944 /* Quick.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 5A5D117B19473F2100F6D13D; + remoteInfo = "Quick-iOS"; + }; + 4DD769A52645D16B007599B8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB970F72645C8F300D14944 /* Nimble.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 1F1A74281940169200FFFC47; + remoteInfo = "Nimble-iOS"; + }; + 4DD769A72645D16B007599B8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4DB9710D2645C8F300D14944 /* ZipArchive.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B423AE191C0DF76A0004A2F1; + remoteInfo = "ZipArchive-iOS"; + }; 6A3C609C17D5964E00382DFF /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; @@ -490,9 +693,19 @@ 4D79C0ED17DF9F4D00997DE4 /* GTCredential.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTCredential.m; sourceTree = ""; }; 4D79C0F617DFAA7100997DE4 /* GTCredential+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTCredential+Private.h"; sourceTree = ""; }; 4D9BCD23206D84AD003CD3CE /* libgit2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgit2.a; path = External/build/lib/libgit2.a; sourceTree = ""; }; + 4DB97074264596AE00D14944 /* macOS-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-Application.xcconfig"; sourceTree = ""; }; + 4DB97075264596AE00D14944 /* macOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-Framework.xcconfig"; sourceTree = ""; }; + 4DB97076264596AE00D14944 /* macOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-StaticLibrary.xcconfig"; sourceTree = ""; }; + 4DB97077264596AE00D14944 /* macOS-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-Base.xcconfig"; sourceTree = ""; }; + 4DB97078264596AE00D14944 /* macOS-XCTest.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-XCTest.xcconfig"; sourceTree = ""; }; + 4DB97079264596AE00D14944 /* macOS-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-DynamicLibrary.xcconfig"; sourceTree = ""; }; + 4DB970912645C8BA00D14944 /* Quick.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Quick.xcodeproj; path = Carthage/Checkouts/Quick/Quick.xcodeproj; sourceTree = ""; }; + 4DB970F72645C8F300D14944 /* Nimble.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Nimble.xcodeproj; path = Carthage/Checkouts/Nimble/Nimble.xcodeproj; sourceTree = ""; }; + 4DB9710D2645C8F300D14944 /* ZipArchive.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ZipArchive.xcodeproj; path = Carthage/Checkouts/ZipArchive/ZipArchive.xcodeproj; sourceTree = ""; }; 4DBA4A3117DA73CE006CD5F5 /* GTRemoteSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTRemoteSpec.m; sourceTree = ""; }; 4DC55AE31AD859AD0032563C /* GTCheckoutOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTCheckoutOptions.h; sourceTree = ""; }; 4DC55AE41AD859AD0032563C /* GTCheckoutOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTCheckoutOptions.m; sourceTree = ""; }; + 4DD7422B25D3F8CB009D9A17 /* libgit2-mac.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libgit2-mac.a"; path = "External/libgit2-mac.a"; sourceTree = ""; }; 4DE864341794A37E00371A65 /* GTRepository+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+Private.h"; sourceTree = ""; }; 4DFFB159183AA8D600D1565E /* GTRepository+RemoteOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+RemoteOperations.h"; sourceTree = ""; }; 4DFFB15A183AA8D600D1565E /* GTRepository+RemoteOperations.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTRepository+RemoteOperations.m"; sourceTree = ""; }; @@ -590,7 +803,6 @@ BDFAF9C2131C1845000508BC /* GTIndex.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTIndex.m; sourceTree = ""; }; BDFAF9C7131C1868000508BC /* GTIndexEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTIndexEntry.h; sourceTree = ""; }; BDFAF9C8131C1868000508BC /* GTIndexEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = GTIndexEntry.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; - C9088CC322B98E8300DB4A02 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; D00F6815175D373C004DB9D6 /* GTReferenceSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTReferenceSpec.m; sourceTree = ""; }; D015F7C817F695E800AD5E1F /* GTRepository+Stashing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+Stashing.h"; sourceTree = ""; }; D015F7C917F695E800AD5E1F /* GTRepository+Stashing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTRepository+Stashing.m"; sourceTree = ""; }; @@ -611,8 +823,6 @@ D09C2E341755F16200065E36 /* GTSubmodule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTSubmodule.h; sourceTree = ""; }; D09C2E351755F16200065E36 /* GTSubmodule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTSubmodule.m; sourceTree = ""; }; D09C2E50175602A500065E36 /* fixtures.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; name = fixtures.zip; path = fixtures/fixtures.zip; sourceTree = ""; }; - D0A0128819F98475007F1914 /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Quick.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D0A0128B19F9853D007F1914 /* Nimble.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Nimble.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0A0129619F9A660007F1914 /* SwiftSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftSpec.swift; sourceTree = ""; }; D0A463D617E57C45000F5021 /* Common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; D0A463D817E57C45000F5021 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; @@ -627,11 +837,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 = ""; }; @@ -640,7 +845,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 = ""; }; @@ -649,10 +853,6 @@ F8D6385B207AC74A00D1FD32 /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; }; F8D6385E207ACAE600D1FD32 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; }; F8D63860207ACAF600D1FD32 /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/usr/lib/libiconv.tbd; sourceTree = DEVELOPER_DIR; }; - F8D63865207ACCAA00D1FD32 /* Nimble.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = Nimble.framework; path = "../Debug-iphonesimulator/Nimble.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - F8D63867207ACCEE00D1FD32 /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quick.framework; path = "../Debug-iphonesimulator/Quick.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - F8D63869207ACDDD00D1FD32 /* ZipArchive.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZipArchive.framework; path = "../Debug-iphonesimulator/ZipArchive.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - F8D6386B207ACE0600D1FD32 /* ZipArchive.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ZipArchive.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F8D63871207AE62A00D1FD32 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/MacOSX.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; F8D63872207AE63A00D1FD32 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; F8E4A2901A170CA6006485A8 /* GTRemotePushSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTRemotePushSpec.m; sourceTree = ""; }; @@ -670,10 +870,10 @@ buildActionMask = 2147483647; files = ( F81B6B50207B032800AB0836 /* XCTest.framework in Frameworks */, - D0A0128A19F98475007F1914 /* Quick.framework in Frameworks */, 88F05A9E16011F6E00B7AD1D /* ObjectiveGit.framework in Frameworks */, - D0A0128C19F9853D007F1914 /* Nimble.framework in Frameworks */, - F8D6386C207ACE0600D1FD32 /* ZipArchive.framework in Frameworks */, + 4DB9711D2645CA3700D14944 /* Quick.framework in Frameworks */, + 4DD769A92645D214007599B8 /* Nimble.framework in Frameworks */, + 4DB9711F2645CA5200D14944 /* ZipArchive.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -683,7 +883,7 @@ files = ( F8D6385D207AC75100D1FD32 /* libz.tbd in Frameworks */, F8D6385C207AC74A00D1FD32 /* libiconv.tbd in Frameworks */, - 4D9BCD24206D84AD003CD3CE /* libgit2.a in Frameworks */, + 4DD7422C25D3F8CB009D9A17 /* libgit2-mac.a in Frameworks */, 8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -706,10 +906,10 @@ buildActionMask = 2147483647; files = ( F84277BE207B104A008AB8E8 /* XCTest.framework in Frameworks */, - F8D63868207ACCEE00D1FD32 /* Quick.framework in Frameworks */, F879D83C1B4B7F7D002D5C07 /* ObjectiveGit.framework in Frameworks */, - 4DFA918F207D0B87003CD3CE /* Nimble.framework in Frameworks */, - F8D6386A207ACDDD00D1FD32 /* ZipArchive.framework in Frameworks */, + 4DB971202645CA5D00D14944 /* Quick.framework in Frameworks */, + 4DB971212645CA6600D14944 /* Nimble.framework in Frameworks */, + 4DB971222645CA6D00D14944 /* ZipArchive.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -740,6 +940,7 @@ D0D81857174421EB00995A2E /* Configuration */, 034768DFFF38A50411DB9C8B /* Products */, F8D6384A207A618D00D1FD32 /* script */, + 4DB9711C2645CA3700D14944 /* Frameworks */, ); name = ObjectiveGitFramework; sourceTree = ""; @@ -748,6 +949,7 @@ 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */ = { isa = PBXGroup; children = ( + 4DB970902645C8A500D14944 /* Carthage */, 306123A817EA5261006591D4 /* extobjc */, 889923F919FF5DD40092A9A6 /* git2 */, 6A1F2FD317C6A8F3003DFADE /* libcrypto.a */, @@ -758,16 +960,11 @@ 6A1F2FD417C6A8F3003DFADE /* libssl.a */, 6A502B8617D6892D00BAF4A5 /* libssh2.a */, 4D9BCD23206D84AD003CD3CE /* libgit2.a */, + 4DD7422B25D3F8CB009D9A17 /* libgit2-mac.a */, 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */, - D0A0128B19F9853D007F1914 /* Nimble.framework */, - F8D63865207ACCAA00D1FD32 /* Nimble.framework */, - D0A0128819F98475007F1914 /* Quick.framework */, - F8D63867207ACCEE00D1FD32 /* Quick.framework */, 887DAFF615CB1C8000F30D0D /* Security.framework */, F8D63871207AE62A00D1FD32 /* XCTest.framework */, F8D63872207AE63A00D1FD32 /* XCTest.framework */, - F8D6386B207ACE0600D1FD32 /* ZipArchive.framework */, - F8D63869207ACDDD00D1FD32 /* ZipArchive.framework */, ); name = "External Frameworks and Libraries"; sourceTree = ""; @@ -820,6 +1017,80 @@ name = "Other Sources"; sourceTree = ""; }; + 4DB97073264596AE00D14944 /* macOS */ = { + isa = PBXGroup; + children = ( + 4DB97074264596AE00D14944 /* macOS-Application.xcconfig */, + 4DB97075264596AE00D14944 /* macOS-Framework.xcconfig */, + 4DB97076264596AE00D14944 /* macOS-StaticLibrary.xcconfig */, + 4DB97077264596AE00D14944 /* macOS-Base.xcconfig */, + 4DB97078264596AE00D14944 /* macOS-XCTest.xcconfig */, + 4DB97079264596AE00D14944 /* macOS-DynamicLibrary.xcconfig */, + ); + path = macOS; + sourceTree = ""; + }; + 4DB970902645C8A500D14944 /* Carthage */ = { + isa = PBXGroup; + children = ( + 4DB970912645C8BA00D14944 /* Quick.xcodeproj */, + 4DB970F72645C8F300D14944 /* Nimble.xcodeproj */, + 4DB9710D2645C8F300D14944 /* ZipArchive.xcodeproj */, + ); + name = Carthage; + sourceTree = ""; + }; + 4DB970922645C8BA00D14944 /* Products */ = { + isa = PBXGroup; + children = ( + 4DB970A32645C8BB00D14944 /* Quick.framework */, + 4DB970A52645C8BB00D14944 /* Quick - macOSTests.xctest */, + 4DB970A72645C8BB00D14944 /* QuickIssue853RegressionTests.xctest */, + 4DB970A92645C8BB00D14944 /* QuickFocused - macOSTests.xctest */, + 4DB970AB2645C8BB00D14944 /* QuickAfterSuite - macOSTests.xctest */, + 4DB970AD2645C8BB00D14944 /* Quick.framework */, + 4DB970AF2645C8BB00D14944 /* Quick - iOSTests.xctest */, + 4DB970B12645C8BB00D14944 /* QuickFocused - iOSTests.xctest */, + 4DB970B32645C8BB00D14944 /* QuickAfterSuite - iOSTests.xctest */, + 4DB970B52645C8BB00D14944 /* Quick.framework */, + 4DB970B72645C8BB00D14944 /* Quick - tvOSTests.xctest */, + 4DB970B92645C8BB00D14944 /* QuickFocused - tvOSTests.xctest */, + 4DB970BB2645C8BB00D14944 /* QuickAfterSuite - tvOSTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 4DB970F82645C8F300D14944 /* Products */ = { + isa = PBXGroup; + children = ( + 4DB971022645C8F300D14944 /* Nimble.framework */, + 4DB971042645C8F300D14944 /* NimbleTests.xctest */, + 4DB971062645C8F300D14944 /* Nimble.framework */, + 4DB971082645C8F300D14944 /* NimbleTests.xctest */, + 4DB9710A2645C8F300D14944 /* Nimble.framework */, + 4DB9710C2645C8F300D14944 /* NimbleTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 4DB9710E2645C8F300D14944 /* Products */ = { + isa = PBXGroup; + children = ( + 4DB971152645C8F300D14944 /* ZipArchive.framework */, + 4DB971172645C8F300D14944 /* ZipArchive.framework */, + 4DB971192645C8F300D14944 /* ZipArchive.framework */, + 4DB9711B2645C8F300D14944 /* ZipArchive.framework */, + ); + name = Products; + sourceTree = ""; + }; + 4DB9711C2645CA3700D14944 /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; 88F05A7516011E5400B7AD1D /* ObjectiveGitTests */ = { isa = PBXGroup; children = ( @@ -1030,9 +1301,9 @@ D0D81857174421EB00995A2E /* Configuration */ = { isa = PBXGroup; children = ( + 4DB97073264596AE00D14944 /* macOS */, D0A463D517E57C45000F5021 /* Base */, D0D81862174421EB00995A2E /* iOS */, - D0D81866174421EB00995A2E /* Mac OS X */, D0D8186C174421EB00995A2E /* README.md */, ); name = Configuration; @@ -1051,19 +1322,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 */ @@ -1206,6 +1464,9 @@ buildRules = ( ); dependencies = ( + 4DD769852645D15D007599B8 /* PBXTargetDependency */, + 4DD769872645D15D007599B8 /* PBXTargetDependency */, + 4DD769892645D15D007599B8 /* PBXTargetDependency */, 88F05AA016011F9000B7AD1D /* PBXTargetDependency */, ); name = "ObjectiveGit-MacTests"; @@ -1265,6 +1526,9 @@ buildRules = ( ); dependencies = ( + 4DD769A42645D16B007599B8 /* PBXTargetDependency */, + 4DD769A62645D16B007599B8 /* PBXTargetDependency */, + 4DD769A82645D16B007599B8 /* PBXTargetDependency */, F879D83E1B4B7F7D002D5C07 /* PBXTargetDependency */, ); name = "ObjectiveGit-iOSTests"; @@ -1313,6 +1577,20 @@ mainGroup = 0867D691FE84028FC02AAC07 /* ObjectiveGitFramework */; productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 4DB970F82645C8F300D14944 /* Products */; + ProjectRef = 4DB970F72645C8F300D14944 /* Nimble.xcodeproj */; + }, + { + ProductGroup = 4DB970922645C8BA00D14944 /* Products */; + ProjectRef = 4DB970912645C8BA00D14944 /* Quick.xcodeproj */; + }, + { + ProductGroup = 4DB9710E2645C8F300D14944 /* Products */; + ProjectRef = 4DB9710D2645C8F300D14944 /* ZipArchive.xcodeproj */; + }, + ); projectRoot = ""; targets = ( 8DC2EF4F0486A6940098B216 /* ObjectiveGit-Mac */, @@ -1327,6 +1605,170 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 4DB970A32645C8BB00D14944 /* Quick.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Quick.framework; + remoteRef = 4DB970A22645C8BB00D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB970A52645C8BB00D14944 /* Quick - macOSTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "Quick - macOSTests.xctest"; + remoteRef = 4DB970A42645C8BB00D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB970A72645C8BB00D14944 /* QuickIssue853RegressionTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = QuickIssue853RegressionTests.xctest; + remoteRef = 4DB970A62645C8BB00D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB970A92645C8BB00D14944 /* QuickFocused - macOSTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "QuickFocused - macOSTests.xctest"; + remoteRef = 4DB970A82645C8BB00D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB970AB2645C8BB00D14944 /* QuickAfterSuite - macOSTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "QuickAfterSuite - macOSTests.xctest"; + remoteRef = 4DB970AA2645C8BB00D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB970AD2645C8BB00D14944 /* Quick.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Quick.framework; + remoteRef = 4DB970AC2645C8BB00D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB970AF2645C8BB00D14944 /* Quick - iOSTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "Quick - iOSTests.xctest"; + remoteRef = 4DB970AE2645C8BB00D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB970B12645C8BB00D14944 /* QuickFocused - iOSTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "QuickFocused - iOSTests.xctest"; + remoteRef = 4DB970B02645C8BB00D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB970B32645C8BB00D14944 /* QuickAfterSuite - iOSTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "QuickAfterSuite - iOSTests.xctest"; + remoteRef = 4DB970B22645C8BB00D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB970B52645C8BB00D14944 /* Quick.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Quick.framework; + remoteRef = 4DB970B42645C8BB00D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB970B72645C8BB00D14944 /* Quick - tvOSTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "Quick - tvOSTests.xctest"; + remoteRef = 4DB970B62645C8BB00D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB970B92645C8BB00D14944 /* QuickFocused - tvOSTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "QuickFocused - tvOSTests.xctest"; + remoteRef = 4DB970B82645C8BB00D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB970BB2645C8BB00D14944 /* QuickAfterSuite - tvOSTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "QuickAfterSuite - tvOSTests.xctest"; + remoteRef = 4DB970BA2645C8BB00D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB971022645C8F300D14944 /* Nimble.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Nimble.framework; + remoteRef = 4DB971012645C8F300D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB971042645C8F300D14944 /* NimbleTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = NimbleTests.xctest; + remoteRef = 4DB971032645C8F300D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB971062645C8F300D14944 /* Nimble.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Nimble.framework; + remoteRef = 4DB971052645C8F300D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB971082645C8F300D14944 /* NimbleTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = NimbleTests.xctest; + remoteRef = 4DB971072645C8F300D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB9710A2645C8F300D14944 /* Nimble.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Nimble.framework; + remoteRef = 4DB971092645C8F300D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB9710C2645C8F300D14944 /* NimbleTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = NimbleTests.xctest; + remoteRef = 4DB9710B2645C8F300D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB971152645C8F300D14944 /* ZipArchive.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = ZipArchive.framework; + remoteRef = 4DB971142645C8F300D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB971172645C8F300D14944 /* ZipArchive.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = ZipArchive.framework; + remoteRef = 4DB971162645C8F300D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB971192645C8F300D14944 /* ZipArchive.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = ZipArchive.framework; + remoteRef = 4DB971182645C8F300D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DB9711B2645C8F300D14944 /* ZipArchive.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = ZipArchive.framework; + remoteRef = 4DB9711A2645C8F300D14944 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ 88F05A6816011E5400B7AD1D /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -1650,6 +2092,36 @@ target = D0A330ED16027F1E00A616FA /* libgit2 */; targetProxy = 3D6123BD1A6432F6008F831A /* PBXContainerItemProxy */; }; + 4DD769852645D15D007599B8 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "Quick-macOS"; + targetProxy = 4DD769842645D15D007599B8 /* PBXContainerItemProxy */; + }; + 4DD769872645D15D007599B8 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "Nimble-macOS"; + targetProxy = 4DD769862645D15D007599B8 /* PBXContainerItemProxy */; + }; + 4DD769892645D15D007599B8 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "ZipArchive-Mac"; + targetProxy = 4DD769882645D15D007599B8 /* PBXContainerItemProxy */; + }; + 4DD769A42645D16B007599B8 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "Quick-iOS"; + targetProxy = 4DD769A32645D16B007599B8 /* PBXContainerItemProxy */; + }; + 4DD769A62645D16B007599B8 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "Nimble-iOS"; + targetProxy = 4DD769A52645D16B007599B8 /* PBXContainerItemProxy */; + }; + 4DD769A82645D16B007599B8 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "ZipArchive-iOS"; + targetProxy = 4DD769A72645D16B007599B8 /* PBXContainerItemProxy */; + }; 6A3C609D17D5964E00382DFF /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 6A28265217C69CB400C6A948 /* OpenSSL-iOS */; @@ -1667,6 +2139,7 @@ }; D019779719F8335100F523DA /* PBXTargetDependency */ = { isa = PBXTargetDependency; + platformFilter = ios; target = D0A330F216027F3600A616FA /* libgit2-iOS */; targetProxy = D019779619F8335100F523DA /* PBXContainerItemProxy */; }; @@ -1680,7 +2153,7 @@ /* Begin XCBuildConfiguration section */ 1DEB91AE08733DA50010E9CD /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */; + baseConfigurationReference = 4DB97075264596AE00D14944 /* macOS-Framework.xcconfig */; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1690,12 +2163,12 @@ "$(inherited)", /usr/local/opt/openssl/lib, "$(PROJECT_DIR)/External/build/lib", + "$(PROJECT_DIR)/External", ); MODULEMAP_FILE = ObjectiveGit.modulemap; OTHER_LDFLAGS = ( - "-lgit2", "-force_load", - External/libgit2.a, + "External/libgit2-mac.a", /usr/local/lib/libssh2.a, "-lcrypto", "-lssl", @@ -1709,7 +2182,7 @@ }; 1DEB91AF08733DA50010E9CD /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */; + baseConfigurationReference = 4DB97075264596AE00D14944 /* macOS-Framework.xcconfig */; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1719,12 +2192,12 @@ "$(inherited)", /usr/local/opt/openssl/lib, "$(PROJECT_DIR)/External/build/lib", + "$(PROJECT_DIR)/External", ); MODULEMAP_FILE = ObjectiveGit.modulemap; OTHER_LDFLAGS = ( - "-lgit2", "-force_load", - External/libgit2.a, + "External/libgit2-mac.a", /usr/local/lib/libssh2.a, "-lcrypto", "-lssl", @@ -1761,13 +2234,13 @@ ., External, ); - MACOSX_DEPLOYMENT_TARGET = 10.8; + MACOSX_DEPLOYMENT_TARGET = 10.10; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "$(inherited)", "-DGIT_SSH", ); - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; WARNING_CFLAGS = ( "$(inherited)", @@ -1800,12 +2273,12 @@ ., External, ); - MACOSX_DEPLOYMENT_TARGET = 10.8; + MACOSX_DEPLOYMENT_TARGET = 10.10; OTHER_CFLAGS = ( "$(inherited)", "-DGIT_SSH", ); - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; WARNING_CFLAGS = ( "$(inherited)", @@ -1864,12 +2337,13 @@ }; 88F05A8016011E5400B7AD1D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F81B6B54207B0A9F00AB0836 /* Mac-XCTest.xcconfig */; + baseConfigurationReference = 4DB97078264596AE00D14944 /* macOS-XCTest.xcconfig */; buildSettings = { CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(DEVELOPER_FRAMEWORKS_DIR)", + "$(PROJECT_DIR)/Carthage/Build/Mac", ); GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -1881,31 +2355,28 @@ /usr/local/include, ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.9; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; }; name = Debug; }; 88F05A8116011E5400B7AD1D /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0D81867174421EB00995A2E /* Mac-Application.xcconfig */; + baseConfigurationReference = 4DB97078264596AE00D14944 /* macOS-XCTest.xcconfig */; buildSettings = { CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(DEVELOPER_FRAMEWORKS_DIR)", + "$(PROJECT_DIR)/Carthage/Build/Mac", ); HEADER_SEARCH_PATHS = ( External/libgit2/include, /usr/local/include, ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.9; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; }; name = Release; }; @@ -1933,12 +2404,12 @@ ., External, ); - MACOSX_DEPLOYMENT_TARGET = 10.8; + MACOSX_DEPLOYMENT_TARGET = 10.10; OTHER_CFLAGS = ( "$(inherited)", "-DGIT_SSH", ); - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; WARNING_CFLAGS = ( "$(inherited)", @@ -1949,7 +2420,7 @@ }; D019778E19F830F500F523DA /* Test */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */; + baseConfigurationReference = 4DB97075264596AE00D14944 /* macOS-Framework.xcconfig */; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1959,12 +2430,12 @@ "$(inherited)", /usr/local/opt/openssl/lib, "$(PROJECT_DIR)/External/build/lib", + "$(PROJECT_DIR)/External", ); MODULEMAP_FILE = ObjectiveGit.modulemap; OTHER_LDFLAGS = ( - "-lgit2", "-force_load", - External/libgit2.a, + "External/libgit2-mac.a", /usr/local/lib/libssh2.a, "-lcrypto", "-lssl", @@ -1978,22 +2449,21 @@ }; D019778F19F830F500F523DA /* Test */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F81B6B54207B0A9F00AB0836 /* Mac-XCTest.xcconfig */; + baseConfigurationReference = 4DB97078264596AE00D14944 /* macOS-XCTest.xcconfig */; buildSettings = { CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(DEVELOPER_FRAMEWORKS_DIR)", + "$(PROJECT_DIR)/Carthage/Build/Mac", ); HEADER_SEARCH_PATHS = ( External/libgit2/include, /usr/local/include, ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.9; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; }; name = Test; }; @@ -2024,7 +2494,7 @@ }; D019779219F830F500F523DA /* Test */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */; + baseConfigurationReference = 4DB97076264596AE00D14944 /* macOS-StaticLibrary.xcconfig */; buildSettings = { PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -2153,12 +2623,12 @@ ., External, ); - MACOSX_DEPLOYMENT_TARGET = 10.8; + MACOSX_DEPLOYMENT_TARGET = 10.10; OTHER_CFLAGS = ( "$(inherited)", "-DGIT_SSH", ); - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; WARNING_CFLAGS = ( "$(inherited)", @@ -2169,7 +2639,7 @@ }; D03FC3D81602E97F00BCFA73 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */; + baseConfigurationReference = 4DB97075264596AE00D14944 /* macOS-Framework.xcconfig */; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -2179,12 +2649,12 @@ "$(inherited)", /usr/local/opt/openssl/lib, "$(PROJECT_DIR)/External/build/lib", + "$(PROJECT_DIR)/External", ); MODULEMAP_FILE = ObjectiveGit.modulemap; OTHER_LDFLAGS = ( - "-lgit2", "-force_load", - External/libgit2.a, + "External/libgit2-mac.a", /usr/local/lib/libssh2.a, "-lcrypto", "-lssl", @@ -2198,28 +2668,27 @@ }; D03FC3DA1602E97F00BCFA73 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0D81867174421EB00995A2E /* Mac-Application.xcconfig */; + baseConfigurationReference = 4DB97078264596AE00D14944 /* macOS-XCTest.xcconfig */; buildSettings = { CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(DEVELOPER_FRAMEWORKS_DIR)", + "$(PROJECT_DIR)/Carthage/Build/Mac", ); HEADER_SEARCH_PATHS = ( External/libgit2/include, /usr/local/include, ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.9; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; }; name = Profile; }; D03FC3DB1602E97F00BCFA73 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */; + baseConfigurationReference = 4DB97076264596AE00D14944 /* macOS-StaticLibrary.xcconfig */; buildSettings = { PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -2235,7 +2704,7 @@ }; D0A330EF16027F1E00A616FA /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */; + baseConfigurationReference = 4DB97076264596AE00D14944 /* macOS-StaticLibrary.xcconfig */; buildSettings = { PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -2243,7 +2712,7 @@ }; D0A330F016027F1E00A616FA /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */; + baseConfigurationReference = 4DB97076264596AE00D14944 /* macOS-StaticLibrary.xcconfig */; buildSettings = { PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -2284,6 +2753,10 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -2305,7 +2778,11 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = ( ., External, @@ -2337,6 +2814,10 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_TREAT_WARNINGS_AS_ERRORS = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -2349,7 +2830,11 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = ( ., External, @@ -2382,6 +2867,10 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_TREAT_WARNINGS_AS_ERRORS = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -2394,7 +2883,11 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = ( ., External, @@ -2403,7 +2896,8 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -2428,6 +2922,10 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_TREAT_WARNINGS_AS_ERRORS = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -2440,7 +2938,11 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = ( ., External, diff --git a/ObjectiveGitFramework.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ObjectiveGitFramework.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..f3c74e883 --- /dev/null +++ b/ObjectiveGitFramework.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/ObjectiveGitFramework.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ObjectiveGitFramework.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/ObjectiveGitFramework.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme index 2e7f2c268..02ffc2cf1 100644 --- a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme +++ b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme @@ -83,6 +83,15 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> + + + + @@ -95,17 +104,6 @@ - - - - - - - - + + + + @@ -81,17 +90,6 @@ - - - - - - - - - - - - - - diff --git a/ObjectiveGitFramework.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ObjectiveGitFramework.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 000000000..0c67376eb --- /dev/null +++ b/ObjectiveGitFramework.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,5 @@ + + + + + diff --git a/script/cibuild b/script/cibuild index cc58cb660..0897947e5 100755 --- a/script/cibuild +++ b/script/cibuild @@ -59,7 +59,7 @@ if [ "$SCHEME" == "ObjectiveGit Mac" ]; then -scheme "$SCHEME" \ ${XCODE_OPTIONS[*]} \ build test \ - 2>&1 | xcpretty $XCPRETTY_FORMAT_OPTIONS + 2>&1 #| xcpretty $XCPRETTY_FORMAT_OPTIONS elif [ "$SCHEME" == "ObjectiveGit iOS" ]; then echo "*** Prebuilding OpenSSL" "$SCRIPT_DIR/update_libssl_ios" @@ -69,9 +69,9 @@ elif [ "$SCHEME" == "ObjectiveGit iOS" ]; then xcodebuild -workspace "$XCWORKSPACE" \ -scheme "$SCHEME" \ - -destination "platform=iOS Simulator,name=iPhone 5" \ + -destination "platform=iOS Simulator,name=iPhone 11" \ -sdk iphonesimulator \ ${XCODE_OPTIONS[*]} \ build test \ - 2>&1 | xcpretty $XCPRETTY_FORMAT_OPTIONS + 2>&1 #| xcpretty $XCPRETTY_FORMAT_OPTIONS fi diff --git a/script/update_libgit2 b/script/update_libgit2 index 151231742..2c89cec38 100755 --- a/script/update_libgit2 +++ b/script/update_libgit2 @@ -7,7 +7,7 @@ set -e # ~/.MacOSX/environment.plist PATH="/usr/local/bin:$PATH" -if [ "External/libgit2.a" -nt "External/libgit2" ] +if [ "External/libgit2-mac.a" -nt "External/libgit2" ] then echo "No update needed." exit 0 @@ -33,9 +33,9 @@ cmake -DBUILD_SHARED_LIBS:BOOL=OFF \ cmake --build . product="libgit2.a" -install_path="../../${product}" -if [ "${product}" -nt "${install_path}" ]; then - cp -v "${product}" "${install_path}" +install_path="../../" +if [ "libgit2.a" -nt "${install_path}/libgit2-mac.a" ]; then + cp -v "libgit2.a" "${install_path}/libgit2-mac.a" fi echo "libgit2 has been updated."