Update carthage remove deprecated xcconfig

.github/workflows/BuildPR.yml

@@ -0,0 +1,23 @@
+name: PullRequest
+
+on: [pull_request]
+
+jobs:
+  build-objective-git:
+    name: Build objective-git
+    runs-on: macOS-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        xcode: [Xcode_11.7, Xcode_12.2, Xcode_12.4]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2.3.3
+        with:
+          fetch-depth: 0
+          submodules: true
+      - name: Set XCode Version
+        run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app
+      - name: Build project
+        run: xcodebuild -workspace ObjectiveGitFramework.xcworkspace -scheme "ObjectiveGit Mac" archive | xcpretty
+

.gitignore

@@ -32,3 +32,4 @@ External/libssh2-ios
 
 Carthage/Build
 
+External/build

Cartfile.private

@@ -1,4 +1,4 @@
 github "jspahrsummers/xcconfigs" "master"
-github "Quick/Quick" ~> 1.2.0
-github "Quick/Nimble" ~> 7.1.0
-github "ZipArchive/ZipArchive" ~> 2.1.2
+github "Quick/Quick" ~> 1.3.4
+github "Quick/Nimble" ~> 7.3.3
+github "ZipArchive/ZipArchive" ~> 2.1.4

Cartfile.resolved

@@ -1,4 +1,4 @@
-github "Quick/Nimble" "v7.1.0"
-github "Quick/Quick" "v1.2.0"
-github "ZipArchive/ZipArchive" "v2.1.2"
-github "jspahrsummers/xcconfigs" "bb795558a76e5daf3688500055bbcfe243bffa8d"
+github "Quick/Nimble" "v7.3.4"
+github "Quick/Quick" "v1.3.4"
+github "ZipArchive/ZipArchive" "v2.2.2"
+github "jspahrsummers/xcconfigs" "81e1c552847883c15d5cbfda2adca6ec78044ead"

ObjectiveGit.modulemap

@@ -50,6 +50,7 @@ framework module ObjectiveGit {
 	header "git2/tree.h"
 	header "git2/types.h"
 	header "git2/version.h"
+	header "git2/sys/alloc.h"
 	header "git2/sys/commit.h"
 	header "git2/sys/config.h"
 	header "git2/sys/diff.h"
@@ -59,6 +60,7 @@ framework module ObjectiveGit {
 	header "git2/sys/mempack.h"
 	header "git2/sys/merge.h"
 	header "git2/sys/odb_backend.h"
+	header "git2/sys/path.h"
 	header "git2/sys/refdb_backend.h"
 	header "git2/sys/reflog.h"
 	header "git2/sys/refs.h"
@@ -72,74 +74,74 @@ framework module ObjectiveGit {
 
 	exclude header "git2/inttypes.h"
 	exclude header "git2/stdint.h"
-	exclude header "git2/sys/git2/annotated_commit.h"
-	exclude header "git2/sys/git2/attr.h"
-	exclude header "git2/sys/git2/blame.h"
-	exclude header "git2/sys/git2/blob.h"
-	exclude header "git2/sys/git2/branch.h"
-	exclude header "git2/sys/git2/buffer.h"
-	exclude header "git2/sys/git2/checkout.h"
-	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_helpers.h"
-	exclude header "git2/sys/git2/describe.h"
-	exclude header "git2/sys/git2/errors.h"
-	exclude header "git2/sys/git2/global.h"
-	exclude header "git2/sys/git2/graph.h"
-	exclude header "git2/sys/git2/ignore.h"
-	exclude header "git2/sys/git2/index.h"
-	exclude header "git2/sys/git2/indexer.h"
-	exclude header "git2/sys/git2/inttypes.h"
-	exclude header "git2/sys/git2/merge.h"
-	exclude header "git2/sys/git2/message.h"
-	exclude header "git2/sys/git2/notes.h"
-	exclude header "git2/sys/git2/object.h"
-	exclude header "git2/sys/git2/odb_backend.h"
-	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/pathspec.h"
-	exclude header "git2/sys/git2/rebase.h"
-	exclude header "git2/sys/git2/refdb.h"
-	exclude header "git2/sys/git2/reflog.h"
-	exclude header "git2/sys/git2/refs.h"
-	exclude header "git2/sys/git2/refspec.h"
-	exclude header "git2/sys/git2/remote.h"
-	exclude header "git2/sys/git2/repository.h"
-	exclude header "git2/sys/git2/reset.h"
-	exclude header "git2/sys/git2/revert.h"
-	exclude header "git2/sys/git2/revparse.h"
-	exclude header "git2/sys/git2/revwalk.h"
-	exclude header "git2/sys/git2/signature.h"
-	exclude header "git2/sys/git2/stash.h"
-	exclude header "git2/sys/git2/stdint.h"
-	exclude header "git2/sys/git2/strarray.h"
-	exclude header "git2/sys/git2/submodule.h"
-	exclude header "git2/sys/git2/tag.h"
-	exclude header "git2/sys/git2/trace.h"
-	exclude header "git2/sys/git2/transaction.h"
-	exclude header "git2/sys/git2/transport.h"
-	exclude header "git2/sys/git2/tree.h"
-	exclude header "git2/sys/git2/version.h"
-	exclude header "git2/sys/git2/sys/commit.h"
-	exclude header "git2/sys/git2/sys/config.h"
-	exclude header "git2/sys/git2/sys/diff.h"
-	exclude header "git2/sys/git2/sys/filter.h"
-	exclude header "git2/sys/git2/sys/hashsig.h"
-	exclude header "git2/sys/git2/sys/index.h"
-	exclude header "git2/sys/git2/sys/mempack.h"
-	exclude header "git2/sys/git2/sys/merge.h"
-	exclude header "git2/sys/git2/sys/odb_backend.h"
-	exclude header "git2/sys/git2/sys/openssl.h"
-	exclude header "git2/sys/git2/sys/refdb_backend.h"
-	exclude header "git2/sys/git2/sys/reflog.h"
-	exclude header "git2/sys/git2/sys/refs.h"
-	exclude header "git2/sys/git2/sys/repository.h"
-	exclude header "git2/sys/git2/sys/stream.h"
-	exclude header "git2/sys/git2/sys/time.h"
-	exclude header "git2/sys/git2/sys/transport.h"
-	exclude header "git2/sys/git2/sys/worktree.h"
+	exclude header "git2/sys/annotated_commit.h"
+	exclude header "git2/sys/attr.h"
+	exclude header "git2/sys/blame.h"
+	exclude header "git2/sys/blob.h"
+	exclude header "git2/sys/branch.h"
+	exclude header "git2/sys/buffer.h"
+	exclude header "git2/sys/checkout.h"
+	exclude header "git2/sys/cherrypick.h"
+	exclude header "git2/sys/clone.h"
+	exclude header "git2/sys/commit.h"
+	exclude header "git2/sys/cred_helpers.h"
+	exclude header "git2/sys/describe.h"
+	exclude header "git2/sys/errors.h"
+	exclude header "git2/sys/global.h"
+	exclude header "git2/sys/graph.h"
+	exclude header "git2/sys/ignore.h"
+	exclude header "git2/sys/index.h"
+	exclude header "git2/sys/indexer.h"
+	exclude header "git2/sys/inttypes.h"
+	exclude header "git2/sys/merge.h"
+	exclude header "git2/sys/message.h"
+	exclude header "git2/sys/notes.h"
+	exclude header "git2/sys/object.h"
+	exclude header "git2/sys/odb_backend.h"
+	exclude header "git2/sys/oidarray.h"
+	exclude header "git2/sys/pack.h"
+	exclude header "git2/sys/patch.h"
+	exclude header "git2/sys/pathspec.h"
+	exclude header "git2/sys/rebase.h"
+	exclude header "git2/sys/refdb.h"
+	exclude header "git2/sys/reflog.h"
+	exclude header "git2/sys/refs.h"
+	exclude header "git2/sys/refspec.h"
+	exclude header "git2/sys/remote.h"
+	exclude header "git2/sys/repository.h"
+	exclude header "git2/sys/reset.h"
+	exclude header "git2/sys/revert.h"
+	exclude header "git2/sys/revparse.h"
+	exclude header "git2/sys/revwalk.h"
+	exclude header "git2/sys/signature.h"
+	exclude header "git2/sys/stash.h"
+	exclude header "git2/sys/stdint.h"
+	exclude header "git2/sys/strarray.h"
+	exclude header "git2/sys/submodule.h"
+	exclude header "git2/sys/tag.h"
+	exclude header "git2/sys/trace.h"
+	exclude header "git2/sys/transaction.h"
+	exclude header "git2/sys/transport.h"
+	exclude header "git2/sys/tree.h"
+	exclude header "git2/sys/version.h"
+	exclude header "git2/sys/commit.h"
+	exclude header "git2/sys/config.h"
+	exclude header "git2/sys/diff.h"
+	exclude header "git2/sys/filter.h"
+	exclude header "git2/sys/hashsig.h"
+	exclude header "git2/sys/index.h"
+	exclude header "git2/sys/mempack.h"
+	exclude header "git2/sys/merge.h"
+	exclude header "git2/sys/odb_backend.h"
+	exclude header "git2/sys/openssl.h"
+	exclude header "git2/sys/refdb_backend.h"
+	exclude header "git2/sys/reflog.h"
+	exclude header "git2/sys/refs.h"
+	exclude header "git2/sys/repository.h"
+	exclude header "git2/sys/stream.h"
+	exclude header "git2/sys/time.h"
+	exclude header "git2/sys/transport.h"
+	exclude header "git2/sys/worktree.h"
 
 	export *
 	module * { export * }

ObjectiveGit/Categories/NSData+Git.m

@@ -17,7 +17,7 @@ - (BOOL)git_getOid:(git_oid *)oid error:(NSError **)error {
     if ([self length] != sizeof(git_oid)) {
         if (error != NULL) {
             *error = [NSError errorWithDomain:GTGitErrorDomain 
-                                         code:GITERR_INVALID 
+                                         code:GIT_ERROR_INVALID
                                      userInfo:
                       [NSDictionary dictionaryWithObject:@"can't extract oid from data of incorrect length" 
                                                   forKey:NSLocalizedDescriptionKey]];

ObjectiveGit/Categories/NSError+Git.m

@@ -98,10 +98,10 @@ + (NSError *)git_errorFor:(int)code {
 }
 
 + (NSString *)git_descriptionForErrorCode:(int)code {
-	const git_error *gitLastError = giterr_last();
+	const git_error *gitLastError = git_error_last();
 	if (gitLastError != NULL) {
 		return @(gitLastError->message);
-	} else if (code == GITERR_OS) {
+	} else if (code == GIT_ERROR_OS) {
 		return @(strerror(errno));
 	} else {
 		return nil;

ObjectiveGit/GTBlameHunk.m

@@ -39,7 +39,9 @@ - (GTSignature *)finalSignature {
 }
 
 - (NSString *)originalPath {
-	return @(self.git_blame_hunk.orig_path);
+	NSString *path = @(self.git_blame_hunk.orig_path);
+	NSAssert(path, @"string was nil");
+	return path;
 }
 
 - (BOOL)isBoundary {

ObjectiveGit/GTBlob.m

@@ -63,7 +63,7 @@ - (instancetype)initWithOid:(const git_oid *)oid inRepository:(GTRepository *)re
 	NSParameterAssert(repository != nil);
 
 	git_object *obj;
-    int gitError = git_object_lookup(&obj, repository.git_repository, oid, (git_otype) GTObjectTypeBlob);
+    int gitError = git_object_lookup(&obj, repository.git_repository, oid, (git_object_t) GTObjectTypeBlob);
     if (gitError < GIT_OK) {
         if (error != NULL) {
             *error = [NSError git_errorFor:gitError description:@"Failed to lookup blob"];

ObjectiveGit/GTConfiguration.m

@@ -112,7 +112,10 @@ - (BOOL)deleteValueForKey:(NSString *)key error:(NSError **)error {
 static int configCallback(const git_config_entry *entry, void *payload) {
 	NSMutableArray *configurationKeysArray = (__bridge NSMutableArray *)payload;
 
-	[configurationKeysArray addObject:@(entry->name)];
+	NSString *name = @(entry->name);
+	NSCAssert(name, @"string was nil");
+
+	[configurationKeysArray addObject:name];
 
 	return 0;
 }

ObjectiveGit/GTCredential.m

@@ -105,7 +105,7 @@ int GTCredentialAcquireCallback(git_cred **git_cred, const char *url, const char
 	GTCredentialProvider *provider = info->credProvider;
 
 	if (provider == nil) {
-		giterr_set_str(GIT_EUSER, "No GTCredentialProvider set, but authentication was requested.");
+		git_error_set_str(GIT_EUSER, "No GTCredentialProvider set, but authentication was requested.");
 		return GIT_ERROR;
 	}
 
@@ -114,7 +114,7 @@ int GTCredentialAcquireCallback(git_cred **git_cred, const char *url, const char
 
 	GTCredential *cred = [provider credentialForType:(GTCredentialType)allowed_types URL:URL userName:userName];
 	if (cred == nil) {
-		giterr_set_str(GIT_EUSER, "GTCredentialProvider failed to provide credentials.");
+		git_error_set_str(GIT_EUSER, "GTCredentialProvider failed to provide credentials.");
 		return GIT_ERROR;
 	}
 

ObjectiveGit/GTDiffFile.m

@@ -22,8 +22,9 @@ - (instancetype)initWithGitDiffFile:(git_diff_file)file {
 	self = [super init];
 	if (self == nil) return nil;
 
-	_path = @(file.path);
-	if (_path == nil) return nil;
+	NSString *path = @(file.path);
+	if (path == nil) return nil;
+	_path = path;
 
 	_git_diff_file = file;
 	_size = (NSUInteger)file.size;

ObjectiveGit/GTDiffPatch.m

@@ -69,7 +69,7 @@ - (NSData *)patchData {
 	git_patch_to_buf(&buf, self.git_patch);
 
 	NSData *buffer = [[NSData alloc] initWithBytes:buf.ptr length:buf.size];
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 
 	return buffer;
 }

ObjectiveGit/GTFilterSource.m

@@ -27,10 +27,13 @@ - (instancetype)initWithGitFilterSource:(const git_filter_source *)source {
 	self = [super init];
 	if (self == nil) return nil;
 
-	const char *path = git_repository_workdir(git_filter_source_repo(source));
-	_repositoryURL = [NSURL fileURLWithPath:@(path)];
-
-	_path = @(git_filter_source_path(source));
+	NSString *path = @(git_repository_workdir(git_filter_source_repo(source)));
+	NSAssert(path, @"workdir was nil");
+	_repositoryURL = [NSURL fileURLWithPath:path];
+
+	path = @(git_filter_source_path(source));
+	NSAssert(path, @"path was nil");
+	_path = path;
 
 	const git_oid *gitOid = git_filter_source_id(source);
 	if (gitOid != NULL) _OID = [[GTOID alloc] initWithGitOid:gitOid];

ObjectiveGit/GTIndexEntry.m

@@ -74,7 +74,9 @@ - (instancetype)initWithGitIndexEntry:(const git_index_entry *)entry {
 #pragma mark Properties
 
 - (NSString *)path {
-	return @(self.git_index_entry->path);
+	NSString *path = @(self.git_index_entry->path);
+	NSAssert(path, @"path is nil");
+	return path;
 }
 
 - (int)flags {
@@ -125,7 +127,7 @@ + (instancetype)objectWithIndexEntry:(GTIndexEntry *)indexEntry error:(NSError *
 
 - (instancetype)initWithIndexEntry:(GTIndexEntry *)indexEntry error:(NSError **)error {
 	git_object *obj;
-	int gitError = git_object_lookup(&obj, indexEntry.repository.git_repository, indexEntry.OID.git_oid, (git_otype)GTObjectTypeAny);
+	int gitError = git_object_lookup(&obj, indexEntry.repository.git_repository, indexEntry.OID.git_oid, (git_object_t)GTObjectTypeAny);
 
 	if (gitError < GIT_OK) {
 		if (error != NULL) {

ObjectiveGit/GTNote.m

@@ -42,7 +42,9 @@ - (git_note *)git_note {
 }
 
 - (NSString *)note {
-	return @(git_note_message(self.git_note));
+	NSString *message = @(git_note_message(self.git_note));
+	NSAssert(message, @"message is nil");
+	return message;
 }
 
 - (GTSignature *)author {
@@ -96,7 +98,7 @@ + (NSString *)defaultReferenceNameForRepository:(GTRepository *)repository error
 		if (error != NULL) *error = [NSError git_errorFor:GIT_ERROR description:@"Unable to get default git notes reference name"];
 	}
 
-	git_buf_free(&default_ref_name);
+	git_buf_dispose(&default_ref_name);
 
 	return noteRef;
 }

ObjectiveGit/GTOID.m

@@ -133,7 +133,7 @@ + (instancetype)OIDByHashingData:(NSData *)data type:(GTObjectType)type error:(N
 	NSParameterAssert(data != nil);
 
 	git_oid oid;
-	int gitError = git_odb_hash(&oid, data.bytes, data.length, (git_otype)type);
+	int gitError = git_odb_hash(&oid, data.bytes, data.length, (git_object_t)type);
 	if (gitError != GIT_OK) {
 		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to hash"];
 		return nil;