Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Carthage dependencies and Remove deprecated xcconfigs #704

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update Carthage dependencies and Remove deprecated xcconfigs #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9537a66
Update Carthage dependencies
cntrump Mar 21, 2020
9cf1377
Remove deprecated xcconfigs
cntrump Mar 21, 2020
c50d760
Add `External/build` to .gitignore
cntrump Mar 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ External/libssh2-ios

Carthage/Build

External/build
6 changes: 3 additions & 3 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "Quick/Nimble" "v7.3.3"
github "Quick/Nimble" "v7.3.4"
github "Quick/Quick" "v1.3.4"
github "ZipArchive/ZipArchive" "v2.1.4"
github "jspahrsummers/xcconfigs" "bb795558a76e5daf3688500055bbcfe243bffa8d"
github "ZipArchive/ZipArchive" "v2.2.2"
github "jspahrsummers/xcconfigs" "81e1c552847883c15d5cbfda2adca6ec78044ead"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Open in desktop
Submodule Nimble updated 7 files
+1 −10 .travis.yml
+1 −1 Nimble.podspec
+1 −1 README.md
+8 −2 Sources/Nimble/DSL+Wait.swift
+1 −2 Sources/Nimble/Matchers/BeginWith.swift
+80 −92 Sources/Nimble/Matchers/Equal.swift
+5 −0 Tests/NimbleTests/objc/ObjCAsyncTest.m
2 changes: 1 addition & 1 deletion Carthage/Checkouts/ZipArchive
Open in desktop
Submodule ZipArchive updated 159 files
2 changes: 1 addition & 1 deletion Carthage/Checkouts/xcconfigs
Open in desktop
Submodule xcconfigs updated from bb7955 to 81e1c5
64 changes: 32 additions & 32 deletions ObjectiveGitFramework.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,12 @@

/* Begin PBXFileReference section */
1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
15CDDA5E2426568C00FC081A /* macOS-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-Application.xcconfig"; sourceTree = "<group>"; };
15CDDA5F2426568C00FC081A /* macOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-Framework.xcconfig"; sourceTree = "<group>"; };
15CDDA602426568C00FC081A /* macOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
15CDDA612426568C00FC081A /* macOS-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-Base.xcconfig"; sourceTree = "<group>"; };
15CDDA622426568C00FC081A /* macOS-XCTest.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-XCTest.xcconfig"; sourceTree = "<group>"; };
15CDDA632426568C00FC081A /* macOS-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-DynamicLibrary.xcconfig"; sourceTree = "<group>"; };
200578C418932A82001C06C3 /* GTBlameSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTBlameSpec.m; sourceTree = "<group>"; };
2089E43B17D9A58000F451DA /* GTTagSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTTagSpec.m; sourceTree = "<group>"; };
20F43DE118A2F667007D3621 /* GTRepository+Blame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+Blame.h"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -628,11 +634,6 @@
D0D81863174421EB00995A2E /* iOS-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Application.xcconfig"; sourceTree = "<group>"; };
D0D81864174421EB00995A2E /* iOS-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Base.xcconfig"; sourceTree = "<group>"; };
D0D81865174421EB00995A2E /* iOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
D0D81867174421EB00995A2E /* Mac-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Application.xcconfig"; sourceTree = "<group>"; };
D0D81868174421EB00995A2E /* Mac-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Base.xcconfig"; sourceTree = "<group>"; };
D0D81869174421EB00995A2E /* Mac-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-DynamicLibrary.xcconfig"; sourceTree = "<group>"; };
D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Framework.xcconfig"; sourceTree = "<group>"; };
D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
D0D8186C174421EB00995A2E /* README.md */ = {isa = PBXFileReference; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
D0F4E28917C7F24200BBDE30 /* NSErrorGitSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSErrorGitSpec.m; sourceTree = "<group>"; };
DD3D9510182A81E1004AF532 /* GTBlame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTBlame.h; sourceTree = "<group>"; };
Expand All @@ -641,7 +642,6 @@
DD3D951B182AB25C004AF532 /* GTBlameHunk.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTBlameHunk.m; sourceTree = "<group>"; };
F81B6B51207B0A7700AB0836 /* Extension.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Extension.xcconfig; sourceTree = "<group>"; };
F81B6B53207B0A8B00AB0836 /* iOS-Extension.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Extension.xcconfig"; sourceTree = "<group>"; };
F81B6B54207B0A9F00AB0836 /* Mac-XCTest.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Mac-XCTest.xcconfig"; sourceTree = "<group>"; };
F879D82F1B4B77F4002D5C07 /* Libgit2FeaturesSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Libgit2FeaturesSpec.m; sourceTree = "<group>"; };
F879D8361B4B7F7C002D5C07 /* ObjectiveGit-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ObjectiveGit-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
F8D1BDEC1B31FE7C00CDEC90 /* GTRepository+Pull.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+Pull.h"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -782,6 +782,19 @@
name = Resources;
sourceTree = "<group>";
};
15CDDA5D2426568C00FC081A /* macOS */ = {
isa = PBXGroup;
children = (
15CDDA5E2426568C00FC081A /* macOS-Application.xcconfig */,
15CDDA5F2426568C00FC081A /* macOS-Framework.xcconfig */,
15CDDA602426568C00FC081A /* macOS-StaticLibrary.xcconfig */,
15CDDA612426568C00FC081A /* macOS-Base.xcconfig */,
15CDDA622426568C00FC081A /* macOS-XCTest.xcconfig */,
15CDDA632426568C00FC081A /* macOS-DynamicLibrary.xcconfig */,
);
path = macOS;
sourceTree = "<group>";
};
306123A817EA5261006591D4 /* extobjc */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1034,7 +1047,7 @@
children = (
D0A463D517E57C45000F5021 /* Base */,
D0D81862174421EB00995A2E /* iOS */,
D0D81866174421EB00995A2E /* Mac OS X */,
15CDDA5D2426568C00FC081A /* macOS */,
D0D8186C174421EB00995A2E /* README.md */,
);
name = Configuration;
Expand All @@ -1053,19 +1066,6 @@
path = iOS;
sourceTree = "<group>";
};
D0D81866174421EB00995A2E /* Mac OS X */ = {
isa = PBXGroup;
children = (
D0D81867174421EB00995A2E /* Mac-Application.xcconfig */,
D0D81868174421EB00995A2E /* Mac-Base.xcconfig */,
D0D81869174421EB00995A2E /* Mac-DynamicLibrary.xcconfig */,
D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */,
D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */,
F81B6B54207B0A9F00AB0836 /* Mac-XCTest.xcconfig */,
);
path = "Mac OS X";
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand Down Expand Up @@ -1694,7 +1694,7 @@
/* Begin XCBuildConfiguration section */
1DEB91AE08733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */;
baseConfigurationReference = 15CDDA5F2426568C00FC081A /* macOS-Framework.xcconfig */;
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand Down Expand Up @@ -1723,7 +1723,7 @@
};
1DEB91AF08733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */;
baseConfigurationReference = 15CDDA5F2426568C00FC081A /* macOS-Framework.xcconfig */;
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand Down Expand Up @@ -1878,7 +1878,7 @@
};
88F05A8016011E5400B7AD1D /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F81B6B54207B0A9F00AB0836 /* Mac-XCTest.xcconfig */;
baseConfigurationReference = 15CDDA622426568C00FC081A /* macOS-XCTest.xcconfig */;
buildSettings = {
CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1904,7 +1904,7 @@
};
88F05A8116011E5400B7AD1D /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D0D81867174421EB00995A2E /* Mac-Application.xcconfig */;
baseConfigurationReference = 15CDDA5E2426568C00FC081A /* macOS-Application.xcconfig */;
buildSettings = {
CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -1963,7 +1963,7 @@
};
D019778E19F830F500F523DA /* Test */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */;
baseConfigurationReference = 15CDDA5F2426568C00FC081A /* macOS-Framework.xcconfig */;
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand Down Expand Up @@ -1992,7 +1992,7 @@
};
D019778F19F830F500F523DA /* Test */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F81B6B54207B0A9F00AB0836 /* Mac-XCTest.xcconfig */;
baseConfigurationReference = 15CDDA622426568C00FC081A /* macOS-XCTest.xcconfig */;
buildSettings = {
CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -2038,7 +2038,7 @@
};
D019779219F830F500F523DA /* Test */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */;
baseConfigurationReference = 15CDDA602426568C00FC081A /* macOS-StaticLibrary.xcconfig */;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
};
Expand Down Expand Up @@ -2183,7 +2183,7 @@
};
D03FC3D81602E97F00BCFA73 /* Profile */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */;
baseConfigurationReference = 15CDDA5F2426568C00FC081A /* macOS-Framework.xcconfig */;
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand Down Expand Up @@ -2212,7 +2212,7 @@
};
D03FC3DA1602E97F00BCFA73 /* Profile */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D0D81867174421EB00995A2E /* Mac-Application.xcconfig */;
baseConfigurationReference = 15CDDA5E2426568C00FC081A /* macOS-Application.xcconfig */;
buildSettings = {
CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -2233,7 +2233,7 @@
};
D03FC3DB1602E97F00BCFA73 /* Profile */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */;
baseConfigurationReference = 15CDDA602426568C00FC081A /* macOS-StaticLibrary.xcconfig */;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
};
Expand All @@ -2249,15 +2249,15 @@
};
D0A330EF16027F1E00A616FA /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */;
baseConfigurationReference = 15CDDA602426568C00FC081A /* macOS-StaticLibrary.xcconfig */;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
D0A330F016027F1E00A616FA /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */;
baseConfigurationReference = 15CDDA602426568C00FC081A /* macOS-StaticLibrary.xcconfig */;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
};
Expand Down