From 36aff66d53f5a1823a3282d48f8b1afb63b76f8d Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Wed, 24 Feb 2016 18:12:00 +0800 Subject: [PATCH 1/7] Update Nimble, Quick to latest versions --- Cartfile.private | 4 ++-- Cartfile.resolved | 6 +++--- Carthage/Checkouts/Nimble | 2 +- Carthage/Checkouts/Quick | 2 +- Carthage/Checkouts/xcconfigs | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cartfile.private b/Cartfile.private index 0bb217bbe..951c41ff2 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,4 +1,4 @@ github "jspahrsummers/xcconfigs" >= 0.7.1 -github "Quick/Quick" ~> 0.6 -github "Quick/Nimble" ~> 2.0 +github "Quick/Quick" ~> 0.9.1 +github "Quick/Nimble" ~> 3.1 github "ZipArchive/ZipArchive" ~> 0.3 diff --git a/Cartfile.resolved b/Cartfile.resolved index 66e8355fd..642bb547b 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ -github "Quick/Nimble" "v2.0.0" -github "Quick/Quick" "v0.6.0" +github "Quick/Nimble" "v3.1.0" +github "Quick/Quick" "v0.9.1" github "ZipArchive/ZipArchive" "v0.3.3" -github "jspahrsummers/xcconfigs" "0.8.1" +github "jspahrsummers/xcconfigs" "0.9" diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble index 20a3f3b4e..72878d662 160000 --- a/Carthage/Checkouts/Nimble +++ b/Carthage/Checkouts/Nimble @@ -1 +1 @@ -Subproject commit 20a3f3b4e63cc8d97c92c4164bf36f2a2c9a6e1b +Subproject commit 72878d6622cf8362d3507cd2e3d341b06580f451 diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick index a22e9736e..2f037560b 160000 --- a/Carthage/Checkouts/Quick +++ b/Carthage/Checkouts/Quick @@ -1 +1 @@ -Subproject commit a22e9736edf55168716dc2bb2f3256ce30061b0e +Subproject commit 2f037560be197f0f5ae992512549bc29fabb3818 diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs index 99624a6af..d78854b22 160000 --- a/Carthage/Checkouts/xcconfigs +++ b/Carthage/Checkouts/xcconfigs @@ -1 +1 @@ -Subproject commit 99624a6af366c015b678a1135e4c558776a59be6 +Subproject commit d78854b22b9567e7f30d748bdd4966c86bcc93a5 From 911943369f7709d2dbf857fac27de2a5dfc56360 Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Wed, 24 Feb 2016 19:31:45 +0800 Subject: [PATCH 2/7] Update SSZipArchive --- Cartfile.private | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/ZipArchive | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cartfile.private b/Cartfile.private index 951c41ff2..27124f747 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,4 +1,4 @@ github "jspahrsummers/xcconfigs" >= 0.7.1 github "Quick/Quick" ~> 0.9.1 github "Quick/Nimble" ~> 3.1 -github "ZipArchive/ZipArchive" ~> 0.3 +github "ZipArchive/ZipArchive" == 1.0.1 diff --git a/Cartfile.resolved b/Cartfile.resolved index 642bb547b..49f32b208 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ github "Quick/Nimble" "v3.1.0" github "Quick/Quick" "v0.9.1" -github "ZipArchive/ZipArchive" "v0.3.3" +github "ZipArchive/ZipArchive" "v1.0.1" github "jspahrsummers/xcconfigs" "0.9" diff --git a/Carthage/Checkouts/ZipArchive b/Carthage/Checkouts/ZipArchive index 28be5a67a..d2799f60a 160000 --- a/Carthage/Checkouts/ZipArchive +++ b/Carthage/Checkouts/ZipArchive @@ -1 +1 @@ -Subproject commit 28be5a67abd2aa939a2c055bf02a98e5f227ed73 +Subproject commit d2799f60a8a2332da182489c78aedbe3985b6271 From 81901e7114088830332bb35e6e7ee29f29f75333 Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Wed, 24 Feb 2016 19:31:58 +0800 Subject: [PATCH 3/7] Unzip once instead of after every test --- ObjectiveGitTests/QuickSpec+GTFixtures.m | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/ObjectiveGitTests/QuickSpec+GTFixtures.m b/ObjectiveGitTests/QuickSpec+GTFixtures.m index f5cf54fe6..1acda0381 100644 --- a/ObjectiveGitTests/QuickSpec+GTFixtures.m +++ b/ObjectiveGitTests/QuickSpec+GTFixtures.m @@ -67,8 +67,12 @@ - (void)cleanUp { #pragma mark Fixtures +- (NSString *)rootTempDirectory { + return [NSTemporaryDirectory() stringByAppendingPathComponent:@"com.libgit2.objectivegit"]; +} + - (void)setUpTempDirectoryPath { - self.tempDirectoryPath = [[NSTemporaryDirectory() stringByAppendingPathComponent:@"com.libgit2.objectivegit"] stringByAppendingPathComponent:NSProcessInfo.processInfo.globallyUniqueString]; + self.tempDirectoryPath = [self.rootTempDirectory stringByAppendingPathComponent:NSProcessInfo.processInfo.globallyUniqueString]; NSError *error = nil; BOOL success = [NSFileManager.defaultManager createDirectoryAtPath:self.tempDirectoryPath withIntermediateDirectories:YES attributes:nil error:&error]; @@ -87,9 +91,15 @@ - (void)setUpRepositoryFixtureIfNeeded:(NSString *)repositoryName { NSString *zippedRepositoriesPath = [[NSBundle bundleForClass:self.class] pathForResource:@"fixtures" ofType:@"zip"]; - error = nil; - success = [self unzipFile:repositoryName fromArchiveAtPath:zippedRepositoriesPath intoDirectory:self.repositoryFixturesPath error:&error]; - XCTAssertTrue(success, @"Couldn't unzip fixture \"%@\" from %@ to %@: %@", repositoryName, zippedRepositoriesPath, self.repositoryFixturesPath, error); + NSString *cleanRepositoryPath = [self.rootTempDirectory stringByAppendingPathComponent:@"clean_repository"]; + if (![NSFileManager.defaultManager fileExistsAtPath:cleanRepositoryPath isDirectory:nil]) { + error = nil; + success = [self unzipFile:repositoryName fromArchiveAtPath:zippedRepositoriesPath intoDirectory:cleanRepositoryPath error:&error]; + XCTAssertTrue(success, @"Couldn't unzip fixture \"%@\" from %@ to %@: %@", repositoryName, zippedRepositoriesPath, cleanRepositoryPath, error); + } + + success = [[NSFileManager defaultManager] copyItemAtPath:[cleanRepositoryPath stringByAppendingPathComponent:repositoryName] toPath:path error:&error]; + XCTAssertTrue(success, @"Couldn't copy directory %@", error); } - (NSString *)pathForFixtureRepositoryNamed:(NSString *)repositoryName { @@ -138,7 +148,8 @@ - (BOOL)unzipFile:(NSString *)member fromArchiveAtPath:(NSString *)zipPath intoD #pragma mark API - (GTRepository *)fixtureRepositoryNamed:(NSString *)name { - GTRepository *repository = [[GTRepository alloc] initWithURL:[NSURL fileURLWithPath:[self pathForFixtureRepositoryNamed:name]] error:NULL]; + NSURL *url = [NSURL fileURLWithPath:[self pathForFixtureRepositoryNamed:name]]; + GTRepository *repository = [[GTRepository alloc] initWithURL:url error:NULL]; XCTAssertNotNil(repository, @"Couldn't create a repository for %@", name); return repository; } From 35f7d08f6021d8218289a169dec7ce794e10e859 Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Wed, 24 Feb 2016 22:32:43 +0800 Subject: [PATCH 4/7] Fix pull spec mess and include in both targets --- ObjectiveGitFramework.xcodeproj/project.pbxproj | 6 ++++-- ObjectiveGitTests/GTRepository+PullSpec.m | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index 1fd8c1b1c..b6c213f4f 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -60,6 +60,8 @@ 2089E43C17D9A58000F451DA /* GTTagSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 2089E43B17D9A58000F451DA /* GTTagSpec.m */; }; 20F43DE318A2F668007D3621 /* GTRepository+Blame.h in Headers */ = {isa = PBXBuildFile; fileRef = 20F43DE118A2F667007D3621 /* GTRepository+Blame.h */; settings = {ATTRIBUTES = (Public, ); }; }; 20F43DE618A2F668007D3621 /* GTRepository+Blame.m in Sources */ = {isa = PBXBuildFile; fileRef = 20F43DE218A2F667007D3621 /* GTRepository+Blame.m */; }; + 23BB67C11C7DF60300A37A66 /* GTRepository+PullSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0361B405020000FF7D0 /* GTRepository+PullSpec.m */; }; + 23BB67C21C7DF60400A37A66 /* GTRepository+PullSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0361B405020000FF7D0 /* GTRepository+PullSpec.m */; }; 3011D86B1668E48500CE3409 /* GTDiffFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 3011D8691668E48500CE3409 /* GTDiffFile.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3011D86D1668E48500CE3409 /* GTDiffFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 3011D86A1668E48500CE3409 /* GTDiffFile.m */; }; 3011D8711668E78500CE3409 /* GTDiffHunk.h in Headers */ = {isa = PBXBuildFile; fileRef = 3011D86F1668E78500CE3409 /* GTDiffHunk.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -363,7 +365,6 @@ F8D1BDF01B31FE7C00CDEC90 /* GTRepository+Pull.m in Sources */ = {isa = PBXBuildFile; fileRef = F8D1BDED1B31FE7C00CDEC90 /* GTRepository+Pull.m */; }; F8D1BDF11B31FE7C00CDEC90 /* GTRepository+Pull.m in Sources */ = {isa = PBXBuildFile; fileRef = F8D1BDED1B31FE7C00CDEC90 /* GTRepository+Pull.m */; }; F8E4A2911A170CA6006485A8 /* GTRemotePushSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8E4A2901A170CA6006485A8 /* GTRemotePushSpec.m */; }; - F8EFA0371B405020000FF7D0 /* GTRepository+PullSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0361B405020000FF7D0 /* GTRepository+PullSpec.m */; }; F8EFA03A1B4059ED000FF7D0 /* GTUtilityFunctions.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0391B4059ED000FF7D0 /* GTUtilityFunctions.m */; }; /* End PBXBuildFile section */ @@ -1387,6 +1388,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 23BB67C11C7DF60300A37A66 /* GTRepository+PullSpec.m in Sources */, D0751CD918BE520400134314 /* GTFilterListSpec.m in Sources */, 200578C518932A82001C06C3 /* GTBlameSpec.m in Sources */, 4D1C40D8182C006D00BE2960 /* GTBlobSpec.m in Sources */, @@ -1408,7 +1410,6 @@ D0AC906C172F941F00347DC4 /* GTRepositorySpec.m in Sources */, D01EFDA0195DEF2200838D24 /* NSDataGitSpec.m in Sources */, 30A269AD17B4878C000FE64E /* GTRepository+StatusSpec.m in Sources */, - F8EFA0371B405020000FF7D0 /* GTRepository+PullSpec.m in Sources */, 307623AB17C6C8BD00E2CDF1 /* NSArray+StringArraySpec.m in Sources */, 8832811F173D8816006D7DCF /* GTIndexSpec.m in Sources */, D0F4E28A17C7F24200BBDE30 /* NSErrorGitSpec.m in Sources */, @@ -1555,6 +1556,7 @@ F8D007761B4F7D10009A8DAF /* GTTimeAdditionsSpec.m in Sources */, F8D007921B4FA03B009A8DAF /* GTIndexSpec.m in Sources */, F8D007711B4F7CB0009A8DAF /* NSDataGitSpec.m in Sources */, + 23BB67C21C7DF60400A37A66 /* GTRepository+PullSpec.m in Sources */, F8D007A11B4FA03B009A8DAF /* GTRepositoryStashingSpec.m in Sources */, F8D007A31B4FA03B009A8DAF /* GTFilterListSpec.m in Sources */, F8D0079D1B4FA03B009A8DAF /* GTTreeBuilderSpec.m in Sources */, diff --git a/ObjectiveGitTests/GTRepository+PullSpec.m b/ObjectiveGitTests/GTRepository+PullSpec.m index da4e37a58..ac3864ef7 100644 --- a/ObjectiveGitTests/GTRepository+PullSpec.m +++ b/ObjectiveGitTests/GTRepository+PullSpec.m @@ -68,7 +68,6 @@ [NSFileManager.defaultManager removeItemAtURL:remoteRepoURL error:NULL]; [NSFileManager.defaultManager removeItemAtURL:localRepoURL error:NULL]; error = NULL; - [self tearDown]; }); context(@"when the local and remote branches are in sync", ^{ From 3e49f0dad2fb6e1ed2739a5fc27b8a6efee0f88d Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Wed, 24 Feb 2016 23:31:08 +0800 Subject: [PATCH 5/7] Use SSZipArchive for OS X as well --- .../project.pbxproj | 39 +++++++++++++++++++ ObjectiveGitTests/QuickSpec+GTFixtures.m | 33 +--------------- 2 files changed, 41 insertions(+), 31 deletions(-) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index b6c213f4f..3b79f3bc6 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -60,6 +60,12 @@ 2089E43C17D9A58000F451DA /* GTTagSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 2089E43B17D9A58000F451DA /* GTTagSpec.m */; }; 20F43DE318A2F668007D3621 /* GTRepository+Blame.h in Headers */ = {isa = PBXBuildFile; fileRef = 20F43DE118A2F667007D3621 /* GTRepository+Blame.h */; settings = {ATTRIBUTES = (Public, ); }; }; 20F43DE618A2F668007D3621 /* GTRepository+Blame.m in Sources */ = {isa = PBXBuildFile; fileRef = 20F43DE218A2F667007D3621 /* GTRepository+Blame.m */; }; + 23BB67B91C7DF3B600A37A66 /* SSZipArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = F8D007801B4F9758009A8DAF /* SSZipArchive.m */; }; + 23BB67BA1C7DF3BC00A37A66 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007841B4F97F9009A8DAF /* unzip.c */; }; + 23BB67BC1C7DF45300A37A66 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 23BB67BB1C7DF45300A37A66 /* libz.tbd */; }; + 23BB67BD1C7DF49500A37A66 /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007851B4F97F9009A8DAF /* zip.c */; }; + 23BB67BE1C7DF4B100A37A66 /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007831B4F97F9009A8DAF /* mztools.c */; }; + 23BB67BF1C7DF4CD00A37A66 /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = F8D007821B4F97F9009A8DAF /* ioapi.c */; }; 23BB67C11C7DF60300A37A66 /* GTRepository+PullSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0361B405020000FF7D0 /* GTRepository+PullSpec.m */; }; 23BB67C21C7DF60400A37A66 /* GTRepository+PullSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0361B405020000FF7D0 /* GTRepository+PullSpec.m */; }; 3011D86B1668E48500CE3409 /* GTDiffFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 3011D8691668E48500CE3409 /* GTDiffFile.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -445,6 +451,7 @@ 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 = ""; }; 20F43DE218A2F667007D3621 /* GTRepository+Blame.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTRepository+Blame.m"; sourceTree = ""; }; + 23BB67BB1C7DF45300A37A66 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; 3011D8691668E48500CE3409 /* GTDiffFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTDiffFile.h; sourceTree = ""; }; 3011D86A1668E48500CE3409 /* GTDiffFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTDiffFile.m; sourceTree = ""; }; 3011D86F1668E78500CE3409 /* GTDiffHunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTDiffHunk.h; sourceTree = ""; }; @@ -649,6 +656,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 23BB67BC1C7DF45300A37A66 /* libz.tbd in Frameworks */, D0A0128A19F98475007F1914 /* Quick.framework in Frameworks */, 88F05A9E16011F6E00B7AD1D /* ObjectiveGit.framework in Frameworks */, D0A0128C19F9853D007F1914 /* Nimble.framework in Frameworks */, @@ -705,6 +713,7 @@ 0867D691FE84028FC02AAC07 /* ObjectiveGitFramework */ = { isa = PBXGroup; children = ( + 23BB67BB1C7DF45300A37A66 /* libz.tbd */, BDD8AB01130F01AB00CB5D40 /* README.md */, 887B948D1A3A38130070D41D /* ObjectiveGit.modulemap */, BDE4C05E130EFE2C00851650 /* ObjectiveGit */, @@ -1388,6 +1397,11 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 23BB67BF1C7DF4CD00A37A66 /* ioapi.c in Sources */, + 23BB67BE1C7DF4B100A37A66 /* mztools.c in Sources */, + 23BB67BD1C7DF49500A37A66 /* zip.c in Sources */, + 23BB67BA1C7DF3BC00A37A66 /* unzip.c in Sources */, + 23BB67B91C7DF3B600A37A66 /* SSZipArchive.m in Sources */, 23BB67C11C7DF60300A37A66 /* GTRepository+PullSpec.m in Sources */, D0751CD918BE520400134314 /* GTFilterListSpec.m in Sources */, 200578C518932A82001C06C3 /* GTBlameSpec.m in Sources */, @@ -1810,6 +1824,16 @@ "$(inherited)", "$(DEVELOPER_FRAMEWORKS_DIR)", ); + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "NOUNCRYPT=1", + "NOCRYPT=1", + ); + HEADER_SEARCH_PATHS = ( + External/libgit2/include, + /usr/local/include, + "Carthage/Checkouts/ZipArchive/SSZipArchive/**", + ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; MACOSX_DEPLOYMENT_TARGET = 10.9; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; @@ -1825,6 +1849,11 @@ "$(inherited)", "$(DEVELOPER_FRAMEWORKS_DIR)", ); + HEADER_SEARCH_PATHS = ( + External/libgit2/include, + /usr/local/include, + "Carthage/Checkouts/ZipArchive/SSZipArchive/**", + ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; MACOSX_DEPLOYMENT_TARGET = 10.9; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; @@ -1894,6 +1923,11 @@ "$(inherited)", "$(DEVELOPER_FRAMEWORKS_DIR)", ); + HEADER_SEARCH_PATHS = ( + External/libgit2/include, + /usr/local/include, + "Carthage/Checkouts/ZipArchive/SSZipArchive/**", + ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; MACOSX_DEPLOYMENT_TARGET = 10.9; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; @@ -2127,6 +2161,11 @@ "$(inherited)", "$(DEVELOPER_FRAMEWORKS_DIR)", ); + HEADER_SEARCH_PATHS = ( + External/libgit2/include, + /usr/local/include, + "Carthage/Checkouts/ZipArchive/SSZipArchive/**", + ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; MACOSX_DEPLOYMENT_TARGET = 10.9; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; diff --git a/ObjectiveGitTests/QuickSpec+GTFixtures.m b/ObjectiveGitTests/QuickSpec+GTFixtures.m index 1acda0381..cc63e887f 100644 --- a/ObjectiveGitTests/QuickSpec+GTFixtures.m +++ b/ObjectiveGitTests/QuickSpec+GTFixtures.m @@ -9,10 +9,7 @@ #import #import "QuickSpec+GTFixtures.h" #import - -#if TARGET_OS_IPHONE #import "SSZipArchive.h" -#endif static const NSInteger FixturesErrorUnzipFailed = 666; @@ -94,7 +91,7 @@ - (void)setUpRepositoryFixtureIfNeeded:(NSString *)repositoryName { NSString *cleanRepositoryPath = [self.rootTempDirectory stringByAppendingPathComponent:@"clean_repository"]; if (![NSFileManager.defaultManager fileExistsAtPath:cleanRepositoryPath isDirectory:nil]) { error = nil; - success = [self unzipFile:repositoryName fromArchiveAtPath:zippedRepositoriesPath intoDirectory:cleanRepositoryPath error:&error]; + success = [self unzipFromArchiveAtPath:zippedRepositoriesPath intoDirectory:cleanRepositoryPath error:&error]; XCTAssertTrue(success, @"Couldn't unzip fixture \"%@\" from %@ to %@: %@", repositoryName, zippedRepositoriesPath, cleanRepositoryPath, error); } @@ -108,13 +105,7 @@ - (NSString *)pathForFixtureRepositoryNamed:(NSString *)repositoryName { return [self.repositoryFixturesPath stringByAppendingPathComponent:repositoryName]; } -- (BOOL)unzipFile:(NSString *)member fromArchiveAtPath:(NSString *)zipPath intoDirectory:(NSString *)destinationPath error:(NSError **)error { - -#if TARGET_OS_IPHONE - // iOS: unzip in-process using SSZipArchive - // - // system() and NSTask() are not available when running tests in the iOS simulator - +- (BOOL)unzipFromArchiveAtPath:(NSString *)zipPath intoDirectory:(NSString *)destinationPath error:(NSError **)error { BOOL success = [SSZipArchive unzipFileAtPath:zipPath toDestination:destinationPath overwrite:YES password:nil error:error]; if (!success) { @@ -123,26 +114,6 @@ - (BOOL)unzipFile:(NSString *)member fromArchiveAtPath:(NSString *)zipPath intoD } return YES; - -#else - // OS X: shell out to unzip using NSTask - - NSTask *task = [[NSTask alloc] init]; - task.launchPath = @"/usr/bin/unzip"; - task.arguments = @[ @"-qq", @"-d", destinationPath, zipPath, [member stringByAppendingString:@"*"] ]; - - [task launch]; - [task waitUntilExit]; - - BOOL success = (task.terminationStatus == 0); - if (!success) { - if (error != NULL) *error = [NSError errorWithDomain:FixturesErrorDomain code:FixturesErrorUnzipFailed userInfo:@{ NSLocalizedDescriptionKey: NSLocalizedString(@"Unzip failed", @"") }]; - } - - return success; - -#endif - } #pragma mark API From ad0a3f52475b3b5f3bf1fe618dc480f24cbd362a Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Thu, 25 Feb 2016 00:07:18 +0800 Subject: [PATCH 6/7] Set iOS Deployment target to 9.0 in tests --- ObjectiveGitFramework.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index 3b79f3bc6..1493a3343 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -2268,7 +2268,7 @@ "Carthage/Checkouts/ZipArchive/SSZipArchive/**", ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( ., @@ -2320,7 +2320,7 @@ "Carthage/Checkouts/ZipArchive/SSZipArchive/**", ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( ., @@ -2373,7 +2373,7 @@ "Carthage/Checkouts/ZipArchive/SSZipArchive/**", ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( ., @@ -2426,7 +2426,7 @@ "Carthage/Checkouts/ZipArchive/SSZipArchive/**", ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( ., From a387dbd0b522c6f120bb7b6a902908b4134677b1 Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Fri, 26 Feb 2016 11:50:26 +0800 Subject: [PATCH 7/7] Remove SSZipArchive project as files are imported otherwise --- ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata | 3 --- 1 file changed, 3 deletions(-) diff --git a/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata b/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata index c99ffb396..f9725c4b5 100644 --- a/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata +++ b/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata @@ -13,7 +13,4 @@ - -