diff --git a/.travis.yml b/.travis.yml index fca5353..74a8275 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: objective-c os: osx -osx_image: xcode9.3 +osx_image: xcode10.1 sudo: false # Enable container-based builds diff --git a/Cartfile b/Cartfile index 32a661f..e9bc3ad 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "antitypical/Result" ~> 3.0 +github "antitypical/Result" ~> 4.0 diff --git a/Cartfile.private b/Cartfile.private index 8c4fe0d..da3abe3 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,4 +1,4 @@ -github "jspahrsummers/xcconfigs" >= 0.10 -github "Quick/Quick" ~> 1.0 -github "Quick/Nimble" ~> 7.0 -github "ZipArchive/ZipArchive" ~> 1.6 +github "jspahrsummers/xcconfigs" ~> 0.12 +github "Quick/Quick" ~> 2.0 +github "Quick/Nimble" ~> 8.0 +github "ZipArchive/ZipArchive" ~> 2.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 6131837..6df61af 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ -github "Quick/Nimble" "v7.0.3" -github "Quick/Quick" "v1.2.0" -github "ZipArchive/ZipArchive" "v1.8.1" -github "antitypical/Result" "3.2.4" -github "jspahrsummers/xcconfigs" "0.10" +github "Quick/Nimble" "v8.0.1" +github "Quick/Quick" "v2.0.0" +github "ZipArchive/ZipArchive" "v2.1.5" +github "antitypical/Result" "4.1.0" +github "jspahrsummers/xcconfigs" "0.12" diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble index 22800b0..43304bf 160000 --- a/Carthage/Checkouts/Nimble +++ b/Carthage/Checkouts/Nimble @@ -1 +1 @@ -Subproject commit 22800b0954c89344bb8c87f8ab93378076716fb7 +Subproject commit 43304bf2b1579fd555f2fdd51742771c1e4f2b98 diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick index 0ff81f2..0b4ed6c 160000 --- a/Carthage/Checkouts/Quick +++ b/Carthage/Checkouts/Quick @@ -1 +1 @@ -Subproject commit 0ff81f2c665b4381f526bd656f8708dd52a9ea2f +Subproject commit 0b4ed6c706dd0cce923b5019a605a9bcc6b1b600 diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result index 7477584..2ca499b 160000 --- a/Carthage/Checkouts/Result +++ b/Carthage/Checkouts/Result @@ -1 +1 @@ -Subproject commit 7477584259bfce2560a19e06ad9f71db441fff11 +Subproject commit 2ca499ba456795616fbc471561ff1d963e6ae160 diff --git a/Carthage/Checkouts/ZipArchive b/Carthage/Checkouts/ZipArchive index 92f3cac..6017bab 160000 --- a/Carthage/Checkouts/ZipArchive +++ b/Carthage/Checkouts/ZipArchive @@ -1 +1 @@ -Subproject commit 92f3cac49f7b70fc1466d681ac0e13ff91cf7898 +Subproject commit 6017baba3cd7f5563a23aee865d08bc26e338bd1 diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs index cc451b0..bb79555 160000 --- a/Carthage/Checkouts/xcconfigs +++ b/Carthage/Checkouts/xcconfigs @@ -1 +1 @@ -Subproject commit cc451b08e052b6146f5caf66bc1120420c529c7b +Subproject commit bb795558a76e5daf3688500055bbcfe243bffa8d diff --git a/SwiftGit2.xcodeproj/project.pbxproj b/SwiftGit2.xcodeproj/project.pbxproj index 76f2dcb..20af11b 100644 --- a/SwiftGit2.xcodeproj/project.pbxproj +++ b/SwiftGit2.xcodeproj/project.pbxproj @@ -597,22 +597,22 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0810; + LastUpgradeCheck = 1010; ORGANIZATIONNAME = "GitHub, Inc"; TargetAttributes = { 621E66611C72958800A0F352 = { - LastSwiftMigration = 0810; + LastSwiftMigration = 1010; }; 621E66B61C72958D00A0F352 = { - LastSwiftMigration = 0810; + LastSwiftMigration = 1010; }; BEB31F221A0D6F7A00F525B9 = { CreatedOnToolsVersion = 6.1; - LastSwiftMigration = 0810; + LastSwiftMigration = 1010; }; BEB31F2D1A0D6F7A00F525B9 = { CreatedOnToolsVersion = 6.1; - LastSwiftMigration = 0810; + LastSwiftMigration = 1010; }; BEB31F8E1A0E563900F525B9 = { CreatedOnToolsVersion = 6.1; @@ -983,7 +983,7 @@ INSTALL_OWNER = ""; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MACOSX_DEPLOYMENT_TARGET = 10.9; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -998,7 +998,7 @@ INSTALL_OWNER = ""; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MACOSX_DEPLOYMENT_TARGET = 10.9; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -1027,7 +1027,6 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = SwiftGit2; SWIFT_INCLUDE_PATHS = "$(SRCROOT)/libgit2"; - SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -1056,7 +1055,6 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = SwiftGit2; SWIFT_INCLUDE_PATHS = "$(SRCROOT)/libgit2"; - SWIFT_VERSION = 4.0; }; name = Release; }; @@ -1065,6 +1063,7 @@ baseConfigurationReference = BEB31F531A0D75EE00F525B9 /* Mac-Application.xcconfig */; buildSettings = { INFOPLIST_FILE = SwiftGit2Tests/Info.plist; + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -1075,6 +1074,7 @@ baseConfigurationReference = BEB31F531A0D75EE00F525B9 /* Mac-Application.xcconfig */; buildSettings = { INFOPLIST_FILE = SwiftGit2Tests/Info.plist; + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; diff --git a/SwiftGit2.xcodeproj/xcshareddata/xcschemes/SwiftGit2-OSX.xcscheme b/SwiftGit2.xcodeproj/xcshareddata/xcschemes/SwiftGit2-OSX.xcscheme index ff804bf..0d9a6bf 100644 --- a/SwiftGit2.xcodeproj/xcshareddata/xcschemes/SwiftGit2-OSX.xcscheme +++ b/SwiftGit2.xcodeproj/xcshareddata/xcschemes/SwiftGit2-OSX.xcscheme @@ -1,6 +1,6 @@