Skip to content

Commit 13c3213

Browse files
tiennoutiennou
authored
Merge pull request #645 from tiennou/update/libgit2-0.27
Update libgit2 to 0.27
2 parents 19c6bfb + 6e54d41 commit 13c3213

File tree

15 files changed

+154
-147
lines changed

15 files changed

+154
-147
lines changed

‎External/libcrypto.a‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎External/libgit2‎

Submodule libgit2 updated 112 files

‎External/libssl.a‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎ObjectiveGit.modulemap‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,14 @@ framework module ObjectiveGit {
5757
header "git2/sys/hashsig.h"
5858
header "git2/sys/index.h"
5959
header "git2/sys/mempack.h"
60+
header "git2/sys/merge.h"
6061
header "git2/sys/odb_backend.h"
6162
header "git2/sys/refdb_backend.h"
6263
header "git2/sys/reflog.h"
6364
header "git2/sys/refs.h"
6465
header "git2/sys/repository.h"
6566
header "git2/sys/transport.h"
67+
header "git2/sys/time.h"
6668
header "git2/cred_helpers.h"
6769
header "git2/sys/openssl.h"
6870
header "git2/sys/stream.h"

‎ObjectiveGitFramework.xcodeproj/project.pbxproj‎

Lines changed: 56 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,14 @@
9191
4D1C40D8182C006D00BE2960 /* GTBlobSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D1C40D7182C006D00BE2960 /* GTBlobSpec.m */; };
9292
4D79C0EE17DF9F4D00997DE4 /* GTCredential.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D79C0EC17DF9F4D00997DE4 /* GTCredential.h */; settings = {ATTRIBUTES = (Public, ); }; };
9393
4D79C0EF17DF9F4D00997DE4 /* GTCredential.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D79C0ED17DF9F4D00997DE4 /* GTCredential.m */; };
94+
4D9BCD24206D84AD003CD3CE /* libgit2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D9BCD23206D84AD003CD3CE /* libgit2.a */; };
95+
4D9BCD25206D84B2003CD3CE /* libgit2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D9BCD23206D84AD003CD3CE /* libgit2.a */; };
9496
4DBA4A3217DA73CE006CD5F5 /* GTRemoteSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DBA4A3117DA73CE006CD5F5 /* GTRemoteSpec.m */; };
9597
4DC55AE51AD859AD0032563C /* GTCheckoutOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DC55AE31AD859AD0032563C /* GTCheckoutOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
9698
4DC55AE61AD859AD0032563C /* GTCheckoutOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DC55AE31AD859AD0032563C /* GTCheckoutOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
9799
4DC55AE71AD859AD0032563C /* GTCheckoutOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DC55AE41AD859AD0032563C /* GTCheckoutOptions.m */; };
98100
4DC55AE81AD859AD0032563C /* GTCheckoutOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DC55AE41AD859AD0032563C /* GTCheckoutOptions.m */; };
101+
4DFA918F207D0B87003CD3CE /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8D63865207ACCAA00D1FD32 /* Nimble.framework */; };
99102
4DFFB15B183AA8D600D1565E /* GTRepository+RemoteOperations.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DFFB159183AA8D600D1565E /* GTRepository+RemoteOperations.h */; settings = {ATTRIBUTES = (Public, ); }; };
100103
4DFFB15C183AA8D600D1565E /* GTRepository+RemoteOperations.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DFFB15A183AA8D600D1565E /* GTRepository+RemoteOperations.m */; };
101104
55C8055013861FE7004DCB0F /* GTObjectDatabase.m in Sources */ = {isa = PBXBuildFile; fileRef = 55C8054D13861F34004DCB0F /* GTObjectDatabase.m */; };
@@ -297,7 +300,7 @@
297300
D040AF78177B9A9E001AD9EB /* GTSignatureSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D040AF77177B9A9E001AD9EB /* GTSignatureSpec.m */; };
298301
D05FC5E219FAD039008C9348 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6A1F2FD317C6A8F3003DFADE /* libcrypto.a */; };
299302
D05FC5E319FAD03C008C9348 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6A1F2FD417C6A8F3003DFADE /* libssl.a */; };
300-
D05FC5E419FAD040008C9348 /* libssh2-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6A502B8617D6892D00BAF4A5 /* libssh2-ios.a */; };
303+
D05FC5E419FAD040008C9348 /* libssh2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6A502B8617D6892D00BAF4A5 /* libssh2.a */; };
301304
D06D9E011755D10000558C17 /* GTEnumeratorSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D06D9E001755D10000558C17 /* GTEnumeratorSpec.m */; };
302305
D0751CD918BE520400134314 /* GTFilterListSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D0751CD818BE520400134314 /* GTFilterListSpec.m */; };
303306
D09C2E361755F16200065E36 /* GTSubmodule.h in Headers */ = {isa = PBXBuildFile; fileRef = D09C2E341755F16200065E36 /* GTSubmodule.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -490,6 +493,7 @@
490493
4D79C0EC17DF9F4D00997DE4 /* GTCredential.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTCredential.h; sourceTree = "<group>"; };
491494
4D79C0ED17DF9F4D00997DE4 /* GTCredential.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTCredential.m; sourceTree = "<group>"; };
492495
4D79C0F617DFAA7100997DE4 /* GTCredential+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTCredential+Private.h"; sourceTree = "<group>"; };
496+
4D9BCD23206D84AD003CD3CE /* libgit2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgit2.a; path = External/build/lib/libgit2.a; sourceTree = "<group>"; };
493497
4DBA4A3117DA73CE006CD5F5 /* GTRemoteSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTRemoteSpec.m; sourceTree = "<group>"; };
494498
4DC55AE31AD859AD0032563C /* GTCheckoutOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTCheckoutOptions.h; sourceTree = "<group>"; };
495499
4DC55AE41AD859AD0032563C /* GTCheckoutOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTCheckoutOptions.m; sourceTree = "<group>"; };
@@ -503,9 +507,9 @@
503507
5BE612861745EE3300266D8C /* GTTreeBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTTreeBuilder.h; sourceTree = "<group>"; };
504508
5BE612871745EE3300266D8C /* GTTreeBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTTreeBuilder.m; sourceTree = "<group>"; };
505509
5BE612921745EEBC00266D8C /* GTTreeBuilderSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTTreeBuilderSpec.m; sourceTree = "<group>"; };
506-
6A1F2FD317C6A8F3003DFADE /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "External/ios-openssl/lib/libcrypto.a"; sourceTree = "<group>"; };
507-
6A1F2FD417C6A8F3003DFADE /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "External/ios-openssl/lib/libssl.a"; sourceTree = "<group>"; };
508-
6A502B8617D6892D00BAF4A5 /* libssh2-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libssh2-ios.a"; path = "External/libssh2-ios/lib/libssh2-ios.a"; sourceTree = "<group>"; };
510+
6A1F2FD317C6A8F3003DFADE /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = External/build/lib/libcrypto.a; sourceTree = "<group>"; };
511+
6A1F2FD417C6A8F3003DFADE /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = External/build/lib/libssl.a; sourceTree = "<group>"; };
512+
6A502B8617D6892D00BAF4A5 /* libssh2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssh2.a; path = External/build/lib/libssh2.a; sourceTree = "<group>"; };
509513
6EEB519F199D62B9001D72C0 /* GTFetchHeadEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTFetchHeadEntry.h; sourceTree = "<group>"; };
510514
6EEB51A0199D62B9001D72C0 /* GTFetchHeadEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTFetchHeadEntry.m; sourceTree = "<group>"; };
511515
79262F0E13C697BE00A4B1EA /* git2 */ = {isa = PBXFileReference; lastKnownFileType = folder; name = git2; path = External/libgit2/include/git2; sourceTree = "<group>"; };
@@ -682,6 +686,7 @@
682686
files = (
683687
F8D6385D207AC75100D1FD32 /* libz.tbd in Frameworks */,
684688
F8D6385C207AC74A00D1FD32 /* libiconv.tbd in Frameworks */,
689+
4D9BCD24206D84AD003CD3CE /* libgit2.a in Frameworks */,
685690
8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */,
686691
);
687692
runOnlyForDeploymentPostprocessing = 0;
@@ -694,7 +699,8 @@
694699
F8D6385F207ACAE600D1FD32 /* libz.tbd in Frameworks */,
695700
D05FC5E319FAD03C008C9348 /* libssl.a in Frameworks */,
696701
D05FC5E219FAD039008C9348 /* libcrypto.a in Frameworks */,
697-
D05FC5E419FAD040008C9348 /* libssh2-ios.a in Frameworks */,
702+
D05FC5E419FAD040008C9348 /* libssh2.a in Frameworks */,
703+
4D9BCD25206D84B2003CD3CE /* libgit2.a in Frameworks */,
698704
);
699705
runOnlyForDeploymentPostprocessing = 0;
700706
};
@@ -705,6 +711,7 @@
705711
F84277BE207B104A008AB8E8 /* XCTest.framework in Frameworks */,
706712
F8D63868207ACCEE00D1FD32 /* Quick.framework in Frameworks */,
707713
F879D83C1B4B7F7D002D5C07 /* ObjectiveGit.framework in Frameworks */,
714+
4DFA918F207D0B87003CD3CE /* Nimble.framework in Frameworks */,
708715
F8D6386A207ACDDD00D1FD32 /* ZipArchive.framework in Frameworks */,
709716
);
710717
runOnlyForDeploymentPostprocessing = 0;
@@ -744,16 +751,17 @@
744751
0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */ = {
745752
isa = PBXGroup;
746753
children = (
747-
1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */,
748754
306123A817EA5261006591D4 /* extobjc */,
749755
889923F919FF5DD40092A9A6 /* git2 */,
750756
6A1F2FD317C6A8F3003DFADE /* libcrypto.a */,
751757
F8D63860207ACAF600D1FD32 /* libiconv.tbd */,
752758
F8D6385B207AC74A00D1FD32 /* libiconv.tbd */,
753-
6A502B8617D6892D00BAF4A5 /* libssh2-ios.a */,
754-
6A1F2FD417C6A8F3003DFADE /* libssl.a */,
755759
23BB67BB1C7DF45300A37A66 /* libz.tbd */,
756760
F8D6385E207ACAE600D1FD32 /* libz.tbd */,
761+
6A1F2FD417C6A8F3003DFADE /* libssl.a */,
762+
6A502B8617D6892D00BAF4A5 /* libssh2.a */,
763+
4D9BCD23206D84AD003CD3CE /* libgit2.a */,
764+
1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */,
757765
D0A0128B19F9853D007F1914 /* Nimble.framework */,
758766
F8D63865207ACCAA00D1FD32 /* Nimble.framework */,
759767
D0A0128819F98475007F1914 /* Quick.framework */,
@@ -1681,6 +1689,11 @@
16811689
DYLIB_CURRENT_VERSION = 1;
16821690
FRAMEWORK_VERSION = A;
16831691
INFOPLIST_FILE = Info.plist;
1692+
LIBRARY_SEARCH_PATHS = (
1693+
"$(inherited)",
1694+
/usr/local/opt/openssl/lib,
1695+
"$(PROJECT_DIR)/External/build/lib",
1696+
);
16841697
MODULEMAP_FILE = ObjectiveGit.modulemap;
16851698
OTHER_LDFLAGS = (
16861699
"-lgit2",
@@ -1705,6 +1718,11 @@
17051718
DYLIB_CURRENT_VERSION = 1;
17061719
FRAMEWORK_VERSION = A;
17071720
INFOPLIST_FILE = Info.plist;
1721+
LIBRARY_SEARCH_PATHS = (
1722+
"$(inherited)",
1723+
/usr/local/opt/openssl/lib,
1724+
"$(PROJECT_DIR)/External/build/lib",
1725+
);
17081726
MODULEMAP_FILE = ObjectiveGit.modulemap;
17091727
OTHER_LDFLAGS = (
17101728
"-lgit2",
@@ -1752,7 +1770,7 @@
17521770
"$(inherited)",
17531771
"-DGIT_SSH",
17541772
);
1755-
SWIFT_VERSION = 2.3;
1773+
SWIFT_VERSION = 3.0;
17561774
TARGETED_DEVICE_FAMILY = "1,2";
17571775
WARNING_CFLAGS = (
17581776
"$(inherited)",
@@ -1790,7 +1808,7 @@
17901808
"$(inherited)",
17911809
"-DGIT_SSH",
17921810
);
1793-
SWIFT_VERSION = 2.3;
1811+
SWIFT_VERSION = 3.0;
17941812
TARGETED_DEVICE_FAMILY = "1,2";
17951813
WARNING_CFLAGS = (
17961814
"$(inherited)",
@@ -1923,7 +1941,7 @@
19231941
"$(inherited)",
19241942
"-DGIT_SSH",
19251943
);
1926-
SWIFT_VERSION = 2.3;
1944+
SWIFT_VERSION = 3.0;
19271945
TARGETED_DEVICE_FAMILY = "1,2";
19281946
WARNING_CFLAGS = (
19291947
"$(inherited)",
@@ -1940,6 +1958,11 @@
19401958
DYLIB_CURRENT_VERSION = 1;
19411959
FRAMEWORK_VERSION = A;
19421960
INFOPLIST_FILE = Info.plist;
1961+
LIBRARY_SEARCH_PATHS = (
1962+
"$(inherited)",
1963+
/usr/local/opt/openssl/lib,
1964+
"$(PROJECT_DIR)/External/build/lib",
1965+
);
19431966
MODULEMAP_FILE = ObjectiveGit.modulemap;
19441967
OTHER_LDFLAGS = (
19451968
"-lgit2",
@@ -1988,22 +2011,15 @@
19882011
DYLIB_CURRENT_VERSION = 1;
19892012
HEADER_SEARCH_PATHS = (
19902013
"$(inherited)",
1991-
"External/libssh2-ios/include/libssh2",
1992-
External/libgit2/include,
2014+
External/build/include,
19932015
);
19942016
INFOPLIST_FILE = Info.plist;
1995-
LIBRARY_SEARCH_PATHS = (
1996-
"External/ios-openssl/lib",
1997-
"External/libssh2-ios/lib",
1998-
"External/libgit2-ios",
1999-
);
2017+
LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/External/build/lib";
20002018
MODULEMAP_FILE = ObjectiveGit.modulemap;
2001-
OTHER_LDFLAGS = (
2002-
"-lgit2-ios",
2003-
"-all_load",
2004-
);
2019+
OTHER_LDFLAGS = "-all_load";
20052020
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
20062021
PRODUCT_NAME = ObjectiveGit;
2022+
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/External/libgit2/include";
20072023
VERSIONING_SYSTEM = "apple-generic";
20082024
VERSION_INFO_PREFIX = "";
20092025
};
@@ -2052,22 +2068,15 @@
20522068
DYLIB_CURRENT_VERSION = 1;
20532069
HEADER_SEARCH_PATHS = (
20542070
"$(inherited)",
2055-
"External/libssh2-ios/include/libssh2",
2056-
External/libgit2/include,
2071+
External/build/include,
20572072
);
20582073
INFOPLIST_FILE = Info.plist;
2059-
LIBRARY_SEARCH_PATHS = (
2060-
"External/ios-openssl/lib",
2061-
"External/libssh2-ios/lib",
2062-
"External/libgit2-ios",
2063-
);
2074+
LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/External/build/lib";
20642075
MODULEMAP_FILE = ObjectiveGit.modulemap;
2065-
OTHER_LDFLAGS = (
2066-
"-lgit2-ios",
2067-
"-all_load",
2068-
);
2076+
OTHER_LDFLAGS = "-all_load";
20692077
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
20702078
PRODUCT_NAME = ObjectiveGit;
2079+
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/External/libgit2/include";
20712080
VERSIONING_SYSTEM = "apple-generic";
20722081
VERSION_INFO_PREFIX = "";
20732082
};
@@ -2084,22 +2093,15 @@
20842093
DYLIB_CURRENT_VERSION = 1;
20852094
HEADER_SEARCH_PATHS = (
20862095
"$(inherited)",
2087-
"External/libssh2-ios/include/libssh2",
2088-
External/libgit2/include,
2096+
External/build/include,
20892097
);
20902098
INFOPLIST_FILE = Info.plist;
2091-
LIBRARY_SEARCH_PATHS = (
2092-
"External/ios-openssl/lib",
2093-
"External/libssh2-ios/lib",
2094-
"External/libgit2-ios",
2095-
);
2099+
LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/External/build/lib";
20962100
MODULEMAP_FILE = ObjectiveGit.modulemap;
2097-
OTHER_LDFLAGS = (
2098-
"-lgit2-ios",
2099-
"-all_load",
2100-
);
2101+
OTHER_LDFLAGS = "-all_load";
21012102
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
21022103
PRODUCT_NAME = ObjectiveGit;
2104+
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/External/libgit2/include";
21032105
VERSIONING_SYSTEM = "apple-generic";
21042106
VERSION_INFO_PREFIX = "";
21052107
};
@@ -2116,22 +2118,15 @@
21162118
DYLIB_CURRENT_VERSION = 1;
21172119
HEADER_SEARCH_PATHS = (
21182120
"$(inherited)",
2119-
"External/libssh2-ios/include/libssh2",
2120-
External/libgit2/include,
2121+
External/build/include,
21212122
);
21222123
INFOPLIST_FILE = Info.plist;
2123-
LIBRARY_SEARCH_PATHS = (
2124-
"External/ios-openssl/lib",
2125-
"External/libssh2-ios/lib",
2126-
"External/libgit2-ios",
2127-
);
2124+
LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/External/build/lib";
21282125
MODULEMAP_FILE = ObjectiveGit.modulemap;
2129-
OTHER_LDFLAGS = (
2130-
"-lgit2-ios",
2131-
"-all_load",
2132-
);
2126+
OTHER_LDFLAGS = "-all_load";
21332127
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
21342128
PRODUCT_NAME = ObjectiveGit;
2129+
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/External/libgit2/include";
21352130
VERSIONING_SYSTEM = "apple-generic";
21362131
VERSION_INFO_PREFIX = "";
21372132
};
@@ -2166,7 +2161,7 @@
21662161
"$(inherited)",
21672162
"-DGIT_SSH",
21682163
);
2169-
SWIFT_VERSION = 2.3;
2164+
SWIFT_VERSION = 3.0;
21702165
TARGETED_DEVICE_FAMILY = "1,2";
21712166
WARNING_CFLAGS = (
21722167
"$(inherited)",
@@ -2183,6 +2178,11 @@
21832178
DYLIB_CURRENT_VERSION = 1;
21842179
FRAMEWORK_VERSION = A;
21852180
INFOPLIST_FILE = Info.plist;
2181+
LIBRARY_SEARCH_PATHS = (
2182+
"$(inherited)",
2183+
/usr/local/opt/openssl/lib,
2184+
"$(PROJECT_DIR)/External/build/lib",
2185+
);
21862186
MODULEMAP_FILE = ObjectiveGit.modulemap;
21872187
OTHER_LDFLAGS = (
21882188
"-lgit2",
@@ -2317,7 +2317,6 @@
23172317
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
23182318
PRODUCT_NAME = "$(TARGET_NAME)";
23192319
SDKROOT = iphoneos;
2320-
SWIFT_VERSION = 4.0;
23212320
};
23222321
name = Debug;
23232322
};
@@ -2362,7 +2361,6 @@
23622361
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
23632362
PRODUCT_NAME = "$(TARGET_NAME)";
23642363
SDKROOT = iphoneos;
2365-
SWIFT_VERSION = 4.0;
23662364
VALIDATE_PRODUCT = YES;
23672365
};
23682366
name = Test;
@@ -2409,7 +2407,6 @@
24092407
PRODUCT_NAME = "$(TARGET_NAME)";
24102408
SDKROOT = iphoneos;
24112409
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
2412-
SWIFT_VERSION = 4.0;
24132410
VALIDATE_PRODUCT = YES;
24142411
};
24152412
name = Release;
@@ -2455,7 +2452,6 @@
24552452
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
24562453
PRODUCT_NAME = "$(TARGET_NAME)";
24572454
SDKROOT = iphoneos;
2458-
SWIFT_VERSION = 4.0;
24592455
VALIDATE_PRODUCT = YES;
24602456
};
24612457
name = Profile;

‎ObjectiveGitTests/Libgit2FeaturesSpec.m‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,17 @@
3030
expect(@(git_features & GIT_FEATURE_HTTPS)).to(beTruthy());
3131
});
3232

33-
xit(@"should be built with SSH enabled", ^{
33+
it(@"should be built with SSH enabled", ^{
3434
expect(@(git_features & GIT_FEATURE_SSH)).to(beTruthy());
3535
});
3636

37+
it(@"should have ssh memory credentials", ^{
38+
NSError *error;
39+
GTCredential *cred = [GTCredential credentialWithUserName:@"null" publicKeyString:@"pub" privateKeyString:@"priv" passphrase:@"pass" error:&error];
40+
41+
expect(cred).notTo(beNil());
42+
expect(error).to(beNil());
43+
});
3744
});
3845

3946
QuickSpecEnd

‎script/bootstrap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
export SCRIPT_DIR=$(dirname "$0")
3+
export SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
44

55
##
66
## Configuration Variables

‎script/cibuild‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fi
3333
##
3434

3535
set -o pipefail
36-
SCRIPT_DIR=$(dirname "$0")
36+
SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
3737
XCWORKSPACE="ObjectiveGitFramework.xcworkspace"
3838
XCODE_OPTIONS=$(RUN_CLANG_STATIC_ANALYZER=NO ONLY_ACTIVE_ARCH=NO CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO)
3939

0 commit comments

Comments
 (0)