From 0d34c00133f77d18e9c49340f12ff49d735772b5 Mon Sep 17 00:00:00 2001 From: joshaber Date: Mon, 5 Oct 2015 16:11:00 -0400 Subject: [PATCH 1/7] Xcode knows best. LOLJK --- Info.plist | 2 +- .../project.pbxproj | 30 ++++++++++++++----- .../xcschemes/ObjectiveGit Mac.xcscheme | 13 ++++---- .../xcschemes/ObjectiveGit iOS.xcscheme | 13 ++++---- .../ObjectiveGitTests-Info.plist | 2 +- 5 files changed, 41 insertions(+), 19 deletions(-) diff --git a/Info.plist b/Info.plist index c61e7624f..d3de8eefb 100644 --- a/Info.plist +++ b/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - org.libgit2.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index 4a1ba8b93..84c9bb703 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -319,7 +319,6 @@ F8D007701B4F7CA8009A8DAF /* NSErrorGitSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D0F4E28917C7F24200BBDE30 /* NSErrorGitSpec.m */; }; F8D007711B4F7CB0009A8DAF /* NSDataGitSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D01EFD9F195DEF2200838D24 /* NSDataGitSpec.m */; }; F8D007721B4F7CB6009A8DAF /* NSArray+StringArraySpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 307623AA17C6C8BD00E2CDF1 /* NSArray+StringArraySpec.m */; }; - F8D1BDEE1B31FE7C00CDEC90 /* GTRepository+Pull.h in Headers */ = {isa = PBXBuildFile; fileRef = F8D1BDEC1B31FE7C00CDEC90 /* GTRepository+Pull.h */; settings = {ATTRIBUTES = (Public, ); }; }; F8D007731B4F7CC3009A8DAF /* GTSignatureSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D040AF77177B9A9E001AD9EB /* GTSignatureSpec.m */; }; F8D007741B4F7CCC009A8DAF /* GTOIDSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D040AF6F177B9779001AD9EB /* GTOIDSpec.m */; }; F8D007761B4F7D10009A8DAF /* GTTimeAdditionsSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 30B1E7FF1703871900D0814D /* GTTimeAdditionsSpec.m */; }; @@ -350,7 +349,6 @@ F8D0079E1B4FA03B009A8DAF /* GTTreeSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88328127173D8A64006D7DCF /* GTTreeSpec.m */; }; F8D0079F1B4FA03B009A8DAF /* GTObjectDatabaseSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88948AC81779243600809CDA /* GTObjectDatabaseSpec.m */; }; F8D007A01B4FA03B009A8DAF /* GTRepository+StatusSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 30A269AC17B4878C000FE64E /* GTRepository+StatusSpec.m */; }; - F8D1BDEF1B31FE7C00CDEC90 /* GTRepository+Pull.h in Headers */ = {isa = PBXBuildFile; fileRef = F8D1BDEC1B31FE7C00CDEC90 /* GTRepository+Pull.h */; settings = {ATTRIBUTES = (Public, ); }; }; F8D007A11B4FA03B009A8DAF /* GTRepositoryStashingSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D015F7D417F6965400AD5E1F /* GTRepositoryStashingSpec.m */; }; F8D007A21B4FA03B009A8DAF /* GTFilterSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 886E623618AECD86000611A0 /* GTFilterSpec.m */; }; F8D007A31B4FA03B009A8DAF /* GTFilterListSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D0751CD818BE520400134314 /* GTFilterListSpec.m */; }; @@ -358,9 +356,11 @@ F8D007A51B4FA03B009A8DAF /* GTDiffDeltaSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8870390A1975E3F2004118D7 /* GTDiffDeltaSpec.m */; }; F8D007A61B4FA03B009A8DAF /* GTRepositoryAttributesSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E353051982EA6B0051001F /* GTRepositoryAttributesSpec.m */; }; F8D007A71B4FA040009A8DAF /* QuickSpec+GTFixtures.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A994CA16FCED1D00402C7B /* QuickSpec+GTFixtures.m */; }; + F8D007A81B4FA045009A8DAF /* fixtures.zip in Resources */ = {isa = PBXBuildFile; fileRef = D09C2E50175602A500065E36 /* fixtures.zip */; }; + F8D1BDEE1B31FE7C00CDEC90 /* GTRepository+Pull.h in Headers */ = {isa = PBXBuildFile; fileRef = F8D1BDEC1B31FE7C00CDEC90 /* GTRepository+Pull.h */; settings = {ATTRIBUTES = (Public, ); }; }; + F8D1BDEF1B31FE7C00CDEC90 /* GTRepository+Pull.h in Headers */ = {isa = PBXBuildFile; fileRef = F8D1BDEC1B31FE7C00CDEC90 /* GTRepository+Pull.h */; settings = {ATTRIBUTES = (Public, ); }; }; 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 */; }; - F8D007A81B4FA045009A8DAF /* fixtures.zip in Resources */ = {isa = PBXBuildFile; fileRef = D09C2E50175602A500065E36 /* fixtures.zip */; }; 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 */; }; @@ -628,14 +628,14 @@ 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; }; F879D8461B4B8138002D5C07 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = "Carthage/Checkouts/Nimble/build/Debug-iphoneos/Nimble.framework"; sourceTree = ""; }; - F8D1BDEC1B31FE7C00CDEC90 /* GTRepository+Pull.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+Pull.h"; sourceTree = ""; }; F8D007801B4F9758009A8DAF /* SSZipArchive.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SSZipArchive.m; path = Carthage/Checkouts/ZipArchive/SSZipArchive/SSZipArchive.m; sourceTree = ""; }; F8D007821B4F97F9009A8DAF /* ioapi.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = ioapi.c; path = Carthage/Checkouts/ZipArchive/SSZipArchive/minizip/ioapi.c; sourceTree = ""; }; F8D007831B4F97F9009A8DAF /* mztools.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = mztools.c; path = Carthage/Checkouts/ZipArchive/SSZipArchive/minizip/mztools.c; sourceTree = ""; }; - F8D1BDED1B31FE7C00CDEC90 /* GTRepository+Pull.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTRepository+Pull.m"; sourceTree = ""; }; F8D007841B4F97F9009A8DAF /* unzip.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = unzip.c; path = Carthage/Checkouts/ZipArchive/SSZipArchive/minizip/unzip.c; sourceTree = ""; }; F8D007851B4F97F9009A8DAF /* zip.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = zip.c; path = Carthage/Checkouts/ZipArchive/SSZipArchive/minizip/zip.c; sourceTree = ""; }; F8D0078A1B4F9F9E009A8DAF /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.4.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; }; + F8D1BDEC1B31FE7C00CDEC90 /* GTRepository+Pull.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+Pull.h"; sourceTree = ""; }; + F8D1BDED1B31FE7C00CDEC90 /* GTRepository+Pull.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTRepository+Pull.m"; sourceTree = ""; }; F8E4A2901A170CA6006485A8 /* GTRemotePushSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTRemotePushSpec.m; sourceTree = ""; }; F8EFA0361B405020000FF7D0 /* GTRepository+PullSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTRepository+PullSpec.m"; sourceTree = ""; }; F8EFA0381B4059ED000FF7D0 /* GTUtilityFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTUtilityFunctions.h; sourceTree = ""; }; @@ -798,7 +798,6 @@ 88A994B916FCE7D400402C7B /* GTBranchSpec.m */, 88F05AA416011FFD00B7AD1D /* GTCommitSpec.m */, 88C0BC5817038CF3009E99AA /* GTConfigurationSpec.m */, - 8870390A1975E3F2004118D7 /* GTDiffDeltaSpec.m */, 30865A90167F503400B1AB6E /* GTDiffSpec.m */, D06D9E001755D10000558C17 /* GTEnumeratorSpec.m */, D0751CD818BE520400134314 /* GTFilterListSpec.m */, @@ -1257,7 +1256,7 @@ attributes = { LastSwiftUpdateCheck = 0700; LastTestingUpgradeCheck = 0510; - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0700; ORGANIZATIONNAME = "GitHub, Inc"; TargetAttributes = { D01B6ED219F82E2000D411BC = { @@ -1660,6 +1659,7 @@ "-lssl", "-lcurl", ); + PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ObjectiveGit; WRAPPER_EXTENSION = framework; }; @@ -1684,6 +1684,7 @@ "-lssl", "-lcurl", ); + PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ObjectiveGit; WRAPPER_EXTENSION = framework; }; @@ -1694,6 +1695,7 @@ baseConfigurationReference = D0A463D817E57C45000F5021 /* Debug.xcconfig */; buildSettings = { CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; + ENABLE_TESTABILITY = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; HEADER_SEARCH_PATHS = ( @@ -1806,6 +1808,7 @@ ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; MACOSX_DEPLOYMENT_TARGET = 10.9; + PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -1820,6 +1823,7 @@ ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; MACOSX_DEPLOYMENT_TARGET = 10.9; + PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -1872,6 +1876,7 @@ "-lssl", "-lcurl", ); + PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ObjectiveGit; WRAPPER_EXTENSION = framework; }; @@ -1887,6 +1892,7 @@ ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; MACOSX_DEPLOYMENT_TARGET = 10.9; + PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Test; @@ -1917,6 +1923,7 @@ "-lgit2-ios", "-all_load", ); + PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ObjectiveGit; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1981,6 +1988,7 @@ "-lgit2-ios", "-all_load", ); + PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ObjectiveGit; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -2013,6 +2021,7 @@ "-lgit2-ios", "-all_load", ); + PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ObjectiveGit; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -2045,6 +2054,7 @@ "-lgit2-ios", "-all_load", ); + PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ObjectiveGit; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -2099,6 +2109,7 @@ "-lssl", "-lcurl", ); + PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ObjectiveGit; WRAPPER_EXTENSION = framework; }; @@ -2114,6 +2125,7 @@ ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; MACOSX_DEPLOYMENT_TARGET = 10.9; + PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Profile; @@ -2220,6 +2232,7 @@ External, ); MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; }; @@ -2271,6 +2284,7 @@ External, ); MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; @@ -2323,6 +2337,7 @@ External, ); MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; @@ -2375,6 +2390,7 @@ External, ); MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; diff --git a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme index 55268d37c..47f735a71 100644 --- a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme +++ b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -62,16 +62,19 @@ ReferencedContainer = "container:ObjectiveGitFramework.xcodeproj"> + + + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -48,15 +48,18 @@ ReferencedContainer = "container:ObjectiveGitFramework.xcodeproj"> + + CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - org.libgit2.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType From e4dad0081fe7b1496fbbe108a5dcf888f3f06bc5 Mon Sep 17 00:00:00 2001 From: joshaber Date: Mon, 5 Oct 2015 16:18:59 -0400 Subject: [PATCH 2/7] Exclude all this shit. --- ObjectiveGit.modulemap | 53 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/ObjectiveGit.modulemap b/ObjectiveGit.modulemap index 5cb6db0a5..0184a3078 100644 --- a/ObjectiveGit.modulemap +++ b/ObjectiveGit.modulemap @@ -68,6 +68,59 @@ framework module ObjectiveGit { header "git2/sys/stream.h" header "git2/trace.h" + exclude "git2/inttypes.h" + exclude "git2/stdint.h" + exclude "git2/sys/git2/annotated_commit.h" + exclude "git2/sys/git2/attr.h" + exclude "git2/sys/git2/blame.h" + exclude "git2/sys/git2/blob.h" + exclude "git2/sys/git2/branch.h" + exclude "git2/sys/git2/buffer.h" + exclude "git2/sys/git2/checkout.h" + exclude "git2/sys/git2/cherrypick.h" + exclude "git2/sys/git2/clone.h" + exclude "git2/sys/git2/commit.h" + exclude "git2/sys/git2/cred_helpers.h" + exclude "git2/sys/git2/describe.h" + exclude "git2/sys/git2/errors.h" + exclude "git2/sys/git2/global.h" + exclude "git2/sys/git2/graph.h" + exclude "git2/sys/git2/ignore.h" + exclude "git2/sys/git2/index.h" + exclude "git2/sys/git2/indexer.h" + exclude "git2/sys/git2/inttypes.h" + exclude "git2/sys/git2/merge.h" + exclude "git2/sys/git2/message.h" + exclude "git2/sys/git2/notes.h" + exclude "git2/sys/git2/object.h" + exclude "git2/sys/git2/odb_backend.h" + exclude "git2/sys/git2/oidarray.h" + exclude "git2/sys/git2/pack.h" + exclude "git2/sys/git2/patch.h" + exclude "git2/sys/git2/pathspec.h" + exclude "git2/sys/git2/rebase.h" + exclude "git2/sys/git2/refdb.h" + exclude "git2/sys/git2/reflog.h" + exclude "git2/sys/git2/refs.h" + exclude "git2/sys/git2/refspec.h" + exclude "git2/sys/git2/remote.h" + exclude "git2/sys/git2/repository.h" + exclude "git2/sys/git2/reset.h" + exclude "git2/sys/git2/revert.h" + exclude "git2/sys/git2/revparse.h" + exclude "git2/sys/git2/revwalk.h" + exclude "git2/sys/git2/signature.h" + exclude "git2/sys/git2/stash.h" + exclude "git2/sys/git2/stdint.h" + exclude "git2/sys/git2/strarray.h" + exclude "git2/sys/git2/submodule.h" + exclude "git2/sys/git2/tag.h" + exclude "git2/sys/git2/trace.h" + exclude "git2/sys/git2/transaction.h" + exclude "git2/sys/git2/transport.h" + exclude "git2/sys/git2/tree.h" + exclude "git2/sys/git2/version.h" + export * module * { export * } } From d7e244288b983cd80f49917356208de51ca3b4f2 Mon Sep 17 00:00:00 2001 From: joshaber Date: Mon, 5 Oct 2015 16:26:43 -0400 Subject: [PATCH 3/7] Try using the header keyword too? --- ObjectiveGit.modulemap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ObjectiveGit.modulemap b/ObjectiveGit.modulemap index 0184a3078..f056ca605 100644 --- a/ObjectiveGit.modulemap +++ b/ObjectiveGit.modulemap @@ -68,7 +68,7 @@ framework module ObjectiveGit { header "git2/sys/stream.h" header "git2/trace.h" - exclude "git2/inttypes.h" + exclude header "git2/inttypes.h" exclude "git2/stdint.h" exclude "git2/sys/git2/annotated_commit.h" exclude "git2/sys/git2/attr.h" From 19adfba9a3f862695efc83677f5b40a1a5bb870b Mon Sep 17 00:00:00 2001 From: joshaber Date: Mon, 5 Oct 2015 16:29:57 -0400 Subject: [PATCH 4/7] Gonna exclude so many headers. --- ObjectiveGit.modulemap | 102 ++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/ObjectiveGit.modulemap b/ObjectiveGit.modulemap index f056ca605..9a82cc54a 100644 --- a/ObjectiveGit.modulemap +++ b/ObjectiveGit.modulemap @@ -69,57 +69,57 @@ framework module ObjectiveGit { header "git2/trace.h" exclude header "git2/inttypes.h" - exclude "git2/stdint.h" - exclude "git2/sys/git2/annotated_commit.h" - exclude "git2/sys/git2/attr.h" - exclude "git2/sys/git2/blame.h" - exclude "git2/sys/git2/blob.h" - exclude "git2/sys/git2/branch.h" - exclude "git2/sys/git2/buffer.h" - exclude "git2/sys/git2/checkout.h" - exclude "git2/sys/git2/cherrypick.h" - exclude "git2/sys/git2/clone.h" - exclude "git2/sys/git2/commit.h" - exclude "git2/sys/git2/cred_helpers.h" - exclude "git2/sys/git2/describe.h" - exclude "git2/sys/git2/errors.h" - exclude "git2/sys/git2/global.h" - exclude "git2/sys/git2/graph.h" - exclude "git2/sys/git2/ignore.h" - exclude "git2/sys/git2/index.h" - exclude "git2/sys/git2/indexer.h" - exclude "git2/sys/git2/inttypes.h" - exclude "git2/sys/git2/merge.h" - exclude "git2/sys/git2/message.h" - exclude "git2/sys/git2/notes.h" - exclude "git2/sys/git2/object.h" - exclude "git2/sys/git2/odb_backend.h" - exclude "git2/sys/git2/oidarray.h" - exclude "git2/sys/git2/pack.h" - exclude "git2/sys/git2/patch.h" - exclude "git2/sys/git2/pathspec.h" - exclude "git2/sys/git2/rebase.h" - exclude "git2/sys/git2/refdb.h" - exclude "git2/sys/git2/reflog.h" - exclude "git2/sys/git2/refs.h" - exclude "git2/sys/git2/refspec.h" - exclude "git2/sys/git2/remote.h" - exclude "git2/sys/git2/repository.h" - exclude "git2/sys/git2/reset.h" - exclude "git2/sys/git2/revert.h" - exclude "git2/sys/git2/revparse.h" - exclude "git2/sys/git2/revwalk.h" - exclude "git2/sys/git2/signature.h" - exclude "git2/sys/git2/stash.h" - exclude "git2/sys/git2/stdint.h" - exclude "git2/sys/git2/strarray.h" - exclude "git2/sys/git2/submodule.h" - exclude "git2/sys/git2/tag.h" - exclude "git2/sys/git2/trace.h" - exclude "git2/sys/git2/transaction.h" - exclude "git2/sys/git2/transport.h" - exclude "git2/sys/git2/tree.h" - exclude "git2/sys/git2/version.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" export * module * { export * } From 72b08f0a50f0bf77fd7e1d43323d449061e472b7 Mon Sep 17 00:00:00 2001 From: joshaber Date: Mon, 5 Oct 2015 16:38:12 -0400 Subject: [PATCH 5/7] Exclude even more! --- ObjectiveGit.modulemap | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ObjectiveGit.modulemap b/ObjectiveGit.modulemap index 9a82cc54a..e52bf7ccb 100644 --- a/ObjectiveGit.modulemap +++ b/ObjectiveGit.modulemap @@ -120,6 +120,21 @@ framework module ObjectiveGit { 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/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/transport.h" export * module * { export * } From 495206957fc404597b06162672fd09125ed347d9 Mon Sep 17 00:00:00 2001 From: joshaber Date: Mon, 5 Oct 2015 16:55:07 -0400 Subject: [PATCH 6/7] ++everything --- Cartfile.private | 4 ++-- Cartfile.resolved | 8 ++++---- Carthage/Checkouts/Nimble | 2 +- Carthage/Checkouts/Quick | 2 +- Carthage/Checkouts/ZipArchive | 2 +- Carthage/Checkouts/xcconfigs | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cartfile.private b/Cartfile.private index 5f6f0ad92..0bb217bbe 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,4 +1,4 @@ github "jspahrsummers/xcconfigs" >= 0.7.1 -github "Quick/Quick" ~> 0.3 -github "Quick/Nimble" ~> 0.4 +github "Quick/Quick" ~> 0.6 +github "Quick/Nimble" ~> 2.0 github "ZipArchive/ZipArchive" ~> 0.3 diff --git a/Cartfile.resolved b/Cartfile.resolved index 4ea6a066d..66e8355fd 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ -github "Quick/Nimble" "v0.4.2" -github "Quick/Quick" "v0.3.1" -github "ZipArchive/ZipArchive" "v0.3.2" -github "jspahrsummers/xcconfigs" "0.7.2" +github "Quick/Nimble" "v2.0.0" +github "Quick/Quick" "v0.6.0" +github "ZipArchive/ZipArchive" "v0.3.3" +github "jspahrsummers/xcconfigs" "0.8.1" diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble index 8927113f8..20a3f3b4e 160000 --- a/Carthage/Checkouts/Nimble +++ b/Carthage/Checkouts/Nimble @@ -1 +1 @@ -Subproject commit 8927113f877f32c8a01b41b746c4ac261b42c48e +Subproject commit 20a3f3b4e63cc8d97c92c4164bf36f2a2c9a6e1b diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick index 8bf96f708..b47b9ebf9 160000 --- a/Carthage/Checkouts/Quick +++ b/Carthage/Checkouts/Quick @@ -1 +1 @@ -Subproject commit 8bf96f708924d728dab5f0cf7543b6f1b896a209 +Subproject commit b47b9ebf97bc8e377070bd1e868c9f89b870c4fc diff --git a/Carthage/Checkouts/ZipArchive b/Carthage/Checkouts/ZipArchive index 60312c173..28be5a67a 160000 --- a/Carthage/Checkouts/ZipArchive +++ b/Carthage/Checkouts/ZipArchive @@ -1 +1 @@ -Subproject commit 60312c173bb9bdb778cdef49de7a53beee2891c3 +Subproject commit 28be5a67abd2aa939a2c055bf02a98e5f227ed73 diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs index 2e77204b5..99624a6af 160000 --- a/Carthage/Checkouts/xcconfigs +++ b/Carthage/Checkouts/xcconfigs @@ -1 +1 @@ -Subproject commit 2e77204b59c3d97c24e5dd34966fb32c231194f0 +Subproject commit 99624a6af366c015b678a1135e4c558776a59be6 From 49fd504cdee41f44ab875cb1e1f4c7f9e5e5bd9b Mon Sep 17 00:00:00 2001 From: joshaber Date: Mon, 5 Oct 2015 16:59:03 -0400 Subject: [PATCH 7/7] Hrm we may need to tell Travis to use Xcode 7? --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2e8d266d3..d0658a5ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -osx_image: xcode6.4 +osx_image: xcode7 language: objective-c install: script/bootstrap script: script/cibuild