vhad/SwiftGit2
1
0
Fork 0
mirror of https://github.com/gosticks/SwiftGit2.git synced 2025-10-16 11:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #145 from mattrubin/swift-4.2

Browse Source 
Swift 4.2 and Xcode 10.1
This commit is contained in:
Matt Diephouse 2019-04-12 05:19:39 -07:00 committed by GitHub
commit cdfacb944b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -1,7 +1,7 @@
language: objective-c language: objective-c
os: osx os: osx
osx_image: xcode9.3 osx_image: xcode10.1
sudo: false # Enable container-based builds sudo: false # Enable container-based builds

2
Cartfile
View File

@ -1 +1 @@
github "antitypical/Result" ~> 3.0 github "antitypical/Result" ~> 4.0

8
Cartfile.private
View File

@ -1,4 +1,4 @@
github "jspahrsummers/xcconfigs" >= 0.10 github "jspahrsummers/xcconfigs" ~> 0.12
github "Quick/Quick" ~> 1.0 github "Quick/Quick" ~> 2.0
github "Quick/Nimble" ~> 7.0 github "Quick/Nimble" ~> 8.0
github "ZipArchive/ZipArchive" ~> 1.6 github "ZipArchive/ZipArchive" ~> 2.0

10
Cartfile.resolved
View File

@ -1,5 +1,5 @@
github "Quick/Nimble" "v7.0.3" github "Quick/Nimble" "v8.0.1"
github "Quick/Quick" "v1.2.0" github "Quick/Quick" "v2.0.0"
github "ZipArchive/ZipArchive" "v1.8.1" github "ZipArchive/ZipArchive" "v2.1.5"
github "antitypical/Result" "3.2.4" github "antitypical/Result" "4.1.0"
github "jspahrsummers/xcconfigs" "0.10" github "jspahrsummers/xcconfigs" "0.12"

2
Carthage/Checkouts/Nimble vendored

@ -1 +1 @@
Subproject commit 22800b0954c89344bb8c87f8ab93378076716fb7 Subproject commit 43304bf2b1579fd555f2fdd51742771c1e4f2b98

2
Carthage/Checkouts/Quick vendored

@ -1 +1 @@
Subproject commit 0ff81f2c665b4381f526bd656f8708dd52a9ea2f Subproject commit 0b4ed6c706dd0cce923b5019a605a9bcc6b1b600

2
Carthage/Checkouts/Result vendored

@ -1 +1 @@
Subproject commit 7477584259bfce2560a19e06ad9f71db441fff11 Subproject commit 2ca499ba456795616fbc471561ff1d963e6ae160

2
Carthage/Checkouts/ZipArchive vendored

@ -1 +1 @@
Subproject commit 92f3cac49f7b70fc1466d681ac0e13ff91cf7898 Subproject commit 6017baba3cd7f5563a23aee865d08bc26e338bd1

2
Carthage/Checkouts/xcconfigs vendored

@ -1 +1 @@
Subproject commit cc451b08e052b6146f5caf66bc1120420c529c7b Subproject commit bb795558a76e5daf3688500055bbcfe243bffa8d

18
SwiftGit2.xcodeproj/project.pbxproj
View File

@ -597,22 +597,22 @@
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastSwiftUpdateCheck = 0720; LastSwiftUpdateCheck = 0720;
LastUpgradeCheck = 0810; LastUpgradeCheck = 1010;
ORGANIZATIONNAME = "GitHub, Inc"; ORGANIZATIONNAME = "GitHub, Inc";
TargetAttributes = { TargetAttributes = {
621E66611C72958800A0F352 = { 621E66611C72958800A0F352 = {
LastSwiftMigration = 0810; LastSwiftMigration = 1010;
}; };
621E66B61C72958D00A0F352 = { 621E66B61C72958D00A0F352 = {
LastSwiftMigration = 0810; LastSwiftMigration = 1010;
}; };
BEB31F221A0D6F7A00F525B9 = { BEB31F221A0D6F7A00F525B9 = {
CreatedOnToolsVersion = 6.1; CreatedOnToolsVersion = 6.1;
LastSwiftMigration = 0810; LastSwiftMigration = 1010;
}; };
BEB31F2D1A0D6F7A00F525B9 = { BEB31F2D1A0D6F7A00F525B9 = {
CreatedOnToolsVersion = 6.1; CreatedOnToolsVersion = 6.1;
LastSwiftMigration = 0810; LastSwiftMigration = 1010;
}; };
BEB31F8E1A0E563900F525B9 = { BEB31F8E1A0E563900F525B9 = {
CreatedOnToolsVersion = 6.1; CreatedOnToolsVersion = 6.1;
@ -983,7 +983,7 @@
INSTALL_OWNER = ""; INSTALL_OWNER = "";
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MACOSX_DEPLOYMENT_TARGET = 10.9; MACOSX_DEPLOYMENT_TARGET = 10.9;
SWIFT_VERSION = 3.0; SWIFT_VERSION = 4.2;
}; };
name = Debug; name = Debug;
}; };
@ -998,7 +998,7 @@
INSTALL_OWNER = ""; INSTALL_OWNER = "";
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MACOSX_DEPLOYMENT_TARGET = 10.9; MACOSX_DEPLOYMENT_TARGET = 10.9;
SWIFT_VERSION = 3.0; SWIFT_VERSION = 4.2;
}; };
name = Release; name = Release;
}; };
@ -1027,7 +1027,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = SwiftGit2; PRODUCT_NAME = SwiftGit2;
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/libgit2"; SWIFT_INCLUDE_PATHS = "$(SRCROOT)/libgit2";
SWIFT_VERSION = 4.0;
}; };
name = Debug; name = Debug;
}; };
@ -1056,7 +1055,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = SwiftGit2; PRODUCT_NAME = SwiftGit2;
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/libgit2"; SWIFT_INCLUDE_PATHS = "$(SRCROOT)/libgit2";
SWIFT_VERSION = 4.0;
}; };
name = Release; name = Release;
}; };
@ -1065,6 +1063,7 @@
baseConfigurationReference = BEB31F531A0D75EE00F525B9 /* Mac-Application.xcconfig */; baseConfigurationReference = BEB31F531A0D75EE00F525B9 /* Mac-Application.xcconfig */;
buildSettings = { buildSettings = {
INFOPLIST_FILE = SwiftGit2Tests/Info.plist; INFOPLIST_FILE = SwiftGit2Tests/Info.plist;
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
@ -1075,6 +1074,7 @@
baseConfigurationReference = BEB31F531A0D75EE00F525B9 /* Mac-Application.xcconfig */; baseConfigurationReference = BEB31F531A0D75EE00F525B9 /* Mac-Application.xcconfig */;
buildSettings = { buildSettings = {
INFOPLIST_FILE = SwiftGit2Tests/Info.plist; INFOPLIST_FILE = SwiftGit2Tests/Info.plist;
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };

2
SwiftGit2.xcodeproj/xcshareddata/xcschemes/SwiftGit2-OSX.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0810" LastUpgradeVersion = "1010"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
SwiftGit2.xcodeproj/xcshareddata/xcschemes/SwiftGit2-iOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0810" LastUpgradeVersion = "1010"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
SwiftGit2Tests/RepositorySpec.swift
View File

@ -55,7 +55,7 @@ class RepositorySpec: QuickSpec {
it("should return error if .git is not readable") { it("should return error if .git is not readable") {
let localURL = self.temporaryURL(forPurpose: "git-isValid-unreadable").appendingPathComponent(".git") let localURL = self.temporaryURL(forPurpose: "git-isValid-unreadable").appendingPathComponent(".git")
let nonReadablePermissions: [String: Any] = [FileAttributeKey.posixPermissions.rawValue: 0o077] let nonReadablePermissions: [FileAttributeKey: Any] = [.posixPermissions: 0o077]
try! FileManager.default.createDirectory( try! FileManager.default.createDirectory(
at: localURL, at: localURL,
withIntermediateDirectories: true, withIntermediateDirectories: true,