From 5ec4722a2078a42461100e44715342a794755d7d Mon Sep 17 00:00:00 2001 From: Bilal Reffas Date: Mon, 27 Apr 2020 22:05:20 +0200 Subject: [PATCH] Updated to Swift 5.2 --- .travis.yml | 2 +- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ SwiftGit2/Diffs.swift | 2 +- SwiftGit2/Repository.swift | 7 ++++--- 4 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 SwiftGit2.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/.travis.yml b/.travis.yml index fa220ad..09db92b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: objective-c os: osx -osx_image: xcode10.2 +osx_image: xcode11.4 sudo: false # Enable container-based builds diff --git a/SwiftGit2.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SwiftGit2.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/SwiftGit2.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/SwiftGit2/Diffs.swift b/SwiftGit2/Diffs.swift index a1d64b7..337d87f 100644 --- a/SwiftGit2/Diffs.swift +++ b/SwiftGit2/Diffs.swift @@ -94,7 +94,7 @@ public struct Diff { } public let rawValue: UInt32 - public static let binary = Flags(rawValue: 0) + public static let binary = Flags([]) public static let notBinary = Flags(rawValue: 1 << 0) public static let validId = Flags(rawValue: 1 << 1) public static let exists = Flags(rawValue: 1 << 2) diff --git a/SwiftGit2/Repository.swift b/SwiftGit2/Repository.swift index eda25f1..61d4047 100644 --- a/SwiftGit2/Repository.swift +++ b/SwiftGit2/Repository.swift @@ -588,9 +588,10 @@ public final class Repository { /// Stage the file(s) under the specified path. public func add(path: String) -> Result<(), NSError> { - let dir = path - var dirPointer = UnsafeMutablePointer(mutating: (dir as NSString).utf8String) - var paths = git_strarray(strings: &dirPointer, count: 1) + var dirPointer = UnsafeMutablePointer(mutating: (path as NSString).utf8String) + var paths = withExtendedLifetime(&dirPointer) { + git_strarray(strings: $0, count: 1) + } return unsafeIndex().flatMap { index in defer { git_index_free(index) } let addResult = git_index_add_all(index, &paths, 0, nil, nil)