Update dependencies

.gitignore

@@ -2,33 +2,17 @@
 *.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
 
 *.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
 

.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:

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

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"

ObjectiveGit.modulemap

@@ -52,6 +52,7 @@ framework module ObjectiveGit {
 	header "git2/version.h"
 	header "git2/sys/commit.h"
 	header "git2/sys/config.h"
+	header "git2/sys/credential.h"
 	header "git2/sys/diff.h"
 	header "git2/sys/filter.h"
 	header "git2/sys/hashsig.h"
@@ -64,14 +65,14 @@ framework module ObjectiveGit {
 	header "git2/sys/refs.h"
 	header "git2/sys/repository.h"
 	header "git2/sys/transport.h"
-	header "git2/sys/time.h"
 	header "git2/cred_helpers.h"
 	header "git2/sys/openssl.h"
 	header "git2/sys/stream.h"
 	header "git2/trace.h"
 
 	exclude header "git2/inttypes.h"
 	exclude header "git2/stdint.h"
+	exclude header "git2/sys/git2/alloc.h"
 	exclude header "git2/sys/git2/annotated_commit.h"
 	exclude header "git2/sys/git2/attr.h"
 	exclude header "git2/sys/git2/blame.h"
@@ -82,6 +83,7 @@ framework module ObjectiveGit {
 	exclude header "git2/sys/git2/cherrypick.h"
 	exclude header "git2/sys/git2/clone.h"
 	exclude header "git2/sys/git2/commit.h"
+	exclude header "git2/sys/git2/cred.h"
 	exclude header "git2/sys/git2/cred_helpers.h"
 	exclude header "git2/sys/git2/describe.h"
 	exclude header "git2/sys/git2/errors.h"
@@ -99,6 +101,7 @@ framework module ObjectiveGit {
 	exclude header "git2/sys/git2/oidarray.h"
 	exclude header "git2/sys/git2/pack.h"
 	exclude header "git2/sys/git2/patch.h"
+	exclude header "git2/sys/git2/path.h"
 	exclude header "git2/sys/git2/pathspec.h"
 	exclude header "git2/sys/git2/rebase.h"
 	exclude header "git2/sys/git2/refdb.h"

ObjectiveGit/Categories/NSArray+StringArray.h

@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/strarray.h"
+#import <ObjectiveGit/git2/strarray.h>
 
 @interface NSArray (StringArray)
 

ObjectiveGit/Categories/NSData+Git.h

@@ -3,8 +3,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/buffer.h"
-#import "git2/oid.h"
+#import <ObjectiveGit/git2/buffer.h>
+#import <ObjectiveGit/git2/oid.h>
 
 @interface NSData (Git)
 

ObjectiveGit/Categories/NSDate+GTTimeAdditions.h

@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/types.h"
+#import <ObjectiveGit/git2/types.h>
 
 @interface NSDate (GTTimeAdditions)
 

ObjectiveGit/GTBlob.m

@@ -84,7 +84,7 @@ - (instancetype)initWithData:(NSData *)data inRepository:(GTRepository *)reposit
 	NSParameterAssert(repository != nil);
 
 	git_oid oid;
-	int gitError = git_blob_create_frombuffer(&oid, repository.git_repository, [data bytes], data.length);
+	int gitError = git_blob_create_from_buffer(&oid, repository.git_repository, [data bytes], data.length);
 	if(gitError < GIT_OK) {
 		if(error != NULL) {
 			*error = [NSError git_errorFor:gitError description:@"Failed to create blob from NSData"];
@@ -100,7 +100,7 @@ - (instancetype)initWithFile:(NSURL *)file inRepository:(GTRepository *)reposito
 	NSParameterAssert(repository != nil);
 
 	git_oid oid;
-	int gitError = git_blob_create_fromdisk(&oid, repository.git_repository, [[file path] fileSystemRepresentation]);
+	int gitError = git_blob_create_from_disk(&oid, repository.git_repository, [[file path] fileSystemRepresentation]);
 	if(gitError < GIT_OK) {
 		if(error != NULL) {
 			*error = [NSError git_errorFor:gitError description:@"Failed to create blob from NSURL"];
@@ -137,7 +137,9 @@ - (NSData *)applyFiltersForPath:(NSString *)path error:(NSError **)error {
 	NSCParameterAssert(path != nil);
 
 	git_buf buffer = GIT_BUF_INIT_CONST(0, NULL);
-	int gitError = git_blob_filtered_content(&buffer, self.git_blob, path.UTF8String, 1);
+
+	git_blob_filter_options opts = GIT_BLOB_FILTER_OPTIONS_INIT;
+	int gitError = git_blob_filter(&buffer, self.git_blob, path.UTF8String, &opts);
 	if (gitError != GIT_OK) {
 		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to apply filters for path %@ to blob", path];
 		return nil;

ObjectiveGit/GTConfiguration.m

@@ -146,7 +146,7 @@ - (NSArray *)remotes {
 		}
 	}
 
-	git_strarray_free(&names);
+	git_strarray_dispose(&names);
 
 	return remotes;
 }

ObjectiveGit/GTCredential+Private.h

@@ -27,4 +27,4 @@ typedef struct {
 	__unsafe_unretained GTCredentialProvider *credProvider;
 } GTCredentialAcquireCallbackInfo;
 
-int GTCredentialAcquireCallback(git_cred **cred, const char *url, const char *username_from_url, unsigned int allowed_types, void *payload);
+int GTCredentialAcquireCallback(git_credential **cred, const char *url, const char *username_from_url, unsigned int allowed_types, void *payload);

ObjectiveGit/GTCredential.h

@@ -12,9 +12,9 @@
 /// An enum describing the data needed for authentication.
 /// See `git_credtype_t`.
 typedef NS_ENUM(NSInteger, GTCredentialType) {
-    GTCredentialTypeUserPassPlaintext = GIT_CREDTYPE_USERPASS_PLAINTEXT,
-    GTCredentialTypeSSHKey = GIT_CREDTYPE_SSH_KEY,
-    GTCredentialTypeSSHCustom = GIT_CREDTYPE_SSH_CUSTOM,
+	GTCredentialTypeUserPassPlaintext = GIT_CREDENTIAL_USERPASS_PLAINTEXT,
+	GTCredentialTypeSSHKey = GIT_CREDENTIAL_SSH_KEY,
+	GTCredentialTypeSSHCustom = GIT_CREDENTIAL_SSH_CUSTOM,
 };
 
 NS_ASSUME_NONNULL_BEGIN
@@ -50,7 +50,7 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /// The GTCredential class is used to provide authentication data.
-/// It acts as a wrapper around `git_cred` objects.
+/// It acts as a wrapper around `git_credential` objects.
 @interface GTCredential : NSObject
 
 /// Create a credential object from a username/password pair.
@@ -86,8 +86,8 @@ NS_ASSUME_NONNULL_BEGIN
 /// Return a new GTCredential instance, or nil if an error occurred
 + (instancetype _Nullable)credentialWithUserName:(NSString *)userName publicKeyString:(NSString * _Nullable)publicKeyString privateKeyString:(NSString *)privateKeyString passphrase:(NSString * _Nullable)passphrase error:(NSError **)error;
 
-/// The underlying `git_cred` object.
-- (git_cred *)git_cred __attribute__((objc_returns_inner_pointer));
+/// The underlying `git_credential` object.
+- (git_credential *)git_credential __attribute__((objc_returns_inner_pointer));
 
 @end
 

ObjectiveGit/GTCredential.m

@@ -39,14 +39,14 @@ - (GTCredential *)credentialForType:(GTCredentialType)type URL:(NSString *)URL u
 @end
 
 @interface GTCredential ()
-@property (nonatomic, assign, readonly) git_cred *git_cred;
+@property (nonatomic, assign, readonly) git_credential *git_credential;
 @end
 
 @implementation GTCredential
 
 + (instancetype)credentialWithUserName:(NSString *)userName password:(NSString *)password error:(NSError **)error {
-	git_cred *cred;
-	int gitError = git_cred_userpass_plaintext_new(&cred, userName.UTF8String, password.UTF8String);
+	git_credential *cred;
+	int gitError = git_credential_userpass_plaintext_new(&cred, userName.UTF8String, password.UTF8String);
 	if (gitError != GIT_OK) {
 		if (error) *error = [NSError git_errorFor:gitError description:@"Failed to create credentials object" failureReason:@"There was an error creating a credential object for username %@.", userName];
 		return nil;
@@ -61,8 +61,8 @@ + (instancetype)credentialWithUserName:(NSString *)userName publicKeyURL:(NSURL
 	NSString *privateKeyPath = privateKeyURL.filePathURL.path;
 	NSAssert(privateKeyPath != nil, @"Invalid file URL passed: %@", privateKeyURL);
 
-	git_cred *cred;
-	int gitError = git_cred_ssh_key_new(&cred, userName.UTF8String, publicKeyPath.fileSystemRepresentation, privateKeyPath.fileSystemRepresentation, passphrase.UTF8String);
+	git_credential *cred;
+	int gitError = git_credential_ssh_key_new(&cred, userName.UTF8String, publicKeyPath.fileSystemRepresentation, privateKeyPath.fileSystemRepresentation, passphrase.UTF8String);
 	if (gitError != GIT_OK) {
 		if (error) *error = [NSError git_errorFor:gitError description:@"Failed to create credentials object" failureReason:@"There was an error creating a credential object for username %@ with the provided public/private key pair.\nPublic key: %@\nPrivate key: %@", userName, publicKeyURL, privateKeyURL];
 		return nil;
@@ -74,8 +74,8 @@ + (instancetype)credentialWithUserName:(NSString *)userName publicKeyURL:(NSURL
 + (instancetype)credentialWithUserName:(NSString *)userName publicKeyString:(NSString *)publicKeyString privateKeyString:(NSString *)privateKeyString passphrase:(NSString *)passphrase error:(NSError **)error {
 	NSParameterAssert(privateKeyString != nil);
 
-	git_cred *cred;
-	int gitError = git_cred_ssh_key_memory_new(&cred, userName.UTF8String, publicKeyString.UTF8String, privateKeyString.UTF8String, passphrase.UTF8String);
+	git_credential *cred;
+	int gitError = git_credential_ssh_key_memory_new(&cred, userName.UTF8String, publicKeyString.UTF8String, privateKeyString.UTF8String, passphrase.UTF8String);
 	if (gitError != GIT_OK) {
 		if (error) *error = [NSError git_errorFor:gitError description:@"Failed to create credentials object" failureReason:@"There was an error creating a credential object for username %@ with the provided public/private key pair.\nPublic key: %@", userName, publicKeyString];
 		return nil;
@@ -84,21 +84,21 @@ + (instancetype)credentialWithUserName:(NSString *)userName publicKeyString:(NSS
 	return [[self alloc] initWithGitCred:cred];
 }
 
-- (instancetype)initWithGitCred:(git_cred *)cred {
+- (instancetype)initWithGitCred:(git_credential *)cred {
 	NSParameterAssert(cred != nil);
 	self = [self init];
 
 	if (self == nil) return nil;
 
-	_git_cred = cred;
+	_git_credential = cred;
 
 	return self;
 }
 
 @end
 
-int GTCredentialAcquireCallback(git_cred **git_cred, const char *url, const char *username_from_url, unsigned int allowed_types, void *payload) {
-	NSCParameterAssert(git_cred != NULL);
+int GTCredentialAcquireCallback(git_credential **git_credential, const char *url, const char *username_from_url, unsigned int allowed_types, void *payload) {
+	NSCParameterAssert(git_credential != NULL);
 	NSCParameterAssert(payload != NULL);
 
 	GTCredentialAcquireCallbackInfo *info = payload;
@@ -118,6 +118,6 @@ int GTCredentialAcquireCallback(git_cred **git_cred, const char *url, const char
 		return GIT_ERROR;
 	}
 
-	*git_cred = cred.git_cred;
+	*git_credential = cred.git_credential;
 	return GIT_OK;
 }

ObjectiveGit/GTDiff.m

@@ -71,7 +71,7 @@ + (int)handleParsedOptionsDictionary:(NSDictionary *)dictionary usingBlock:(int
 	git_strarray strArray = pathSpec.git_strarray;
 	if (pathSpec != nil) newOptions.pathspec = strArray;
 	@onExit {
-		git_strarray_free((git_strarray *)&strArray);
+		git_strarray_dispose((git_strarray *)&strArray);
 	};
 
 	git_diff_options *optionsPtr = &newOptions;

ObjectiveGit/GTIndex.m

@@ -196,7 +196,7 @@ - (BOOL)addData:(NSData *)data withPath:(NSString *)path error:(NSError **)error
 	entry.path = [path cStringUsingEncoding:NSUTF8StringEncoding];
 	entry.mode = GIT_FILEMODE_BLOB;
 
-	int status = git_index_add_frombuffer(self.git_index, &entry, [data bytes], [data length]);
+	int status = git_index_add_from_buffer(self.git_index, &entry, [data bytes], [data length]);
 
 	if (status != GIT_OK) {
 		if (error != NULL) *error = [NSError git_errorFor:status description:@"Failed to add data with name %@ into index.", path];

ObjectiveGit/GTOID.h

@@ -7,8 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/oid.h"
-#import "GTObject.h"
+#import <ObjectiveGit/git2/oid.h>
+#import <ObjectiveGit/GTObject.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

ObjectiveGit/GTOID.m

@@ -98,7 +98,7 @@ + (instancetype)oidWithSHACString:(const char *)SHA {
 }
 
 - (BOOL)isZero {
-	return git_oid_iszero(self.git_oid) != 0;
+	return git_oid_is_zero(self.git_oid) != 0;
 }
 
 #pragma mark NSObject

ObjectiveGit/GTObject.h

@@ -28,7 +28,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/types.h"
+#import <ObjectiveGit/git2/types.h>
 
 typedef NS_ENUM(int, GTObjectType) {
 	GTObjectTypeAny = GIT_OBJECT_ANY,				/**< Object can be any of the following */

ObjectiveGit/GTReflogEntry+Private.h

@@ -23,4 +23,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-NS_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END

ObjectiveGit/GTRemote.m

@@ -157,7 +157,7 @@ - (BOOL)rename:(NSString *)name error:(NSError **)error {
 		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to rename remote" userInfo:userInfo failureReason:@"Couldn't rename remote %@ to %@", self.name, name];
 	}
 
-	git_strarray_free(&problematic_refspecs);
+	git_strarray_dispose(&problematic_refspecs);
 
 	return gitError == GIT_OK;
 }
@@ -168,7 +168,7 @@ - (NSArray *)fetchRefspecs {
 	if (gitError != GIT_OK) return nil;
 
 	@onExit {
-		git_strarray_free(&refspecs);
+		git_strarray_dispose(&refspecs);
 	};
 
 	return [NSArray git_arrayWithStrarray:refspecs];
@@ -181,7 +181,7 @@ - (NSArray *)pushRefspecs {
 	if (gitError != GIT_OK) return nil;
 
 	@onExit {
-		git_strarray_free(&refspecs);
+		git_strarray_dispose(&refspecs);
 	};
 
 	return [NSArray git_arrayWithStrarray:refspecs];