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

Fix SPM errors with Xcode 11 beta #546

Merged
merged 1 commit into from
Jun 9, 2019
Merged

Fix SPM errors with Xcode 11 beta #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions GRDB/Core/Database.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ extension Database {
add(function: .lowercase)
add(function: .uppercase)

if #available(OSX 10.11, watchOS 3.0, *) {
if #available(iOS 9.0, OSX 10.11, watchOS 3.0, *) {
add(function: .localizedCapitalize)
add(function: .localizedLowercase)
add(function: .localizedUppercase)
Expand Down Expand Up @@ -413,7 +413,7 @@ extension Database {
#if GRDBCUSTOMSQLITE || GRDBCIPHER
closeConnection_v2(sqliteConnection, sqlite3_close_v2)
#else
if #available(OSX 10.10, OSXApplicationExtension 10.10, *) {
if #available(iOS 8.2, OSX 10.10, OSXApplicationExtension 10.10, *) {
closeConnection_v2(sqliteConnection, sqlite3_close_v2)
} else {
closeConnection_v1(sqliteConnection)
Expand Down
2 changes: 1 addition & 1 deletion GRDB/Core/DatabaseError.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ extension ResultCode {
#if GRDBCUSTOMSQLITE || GRDBCIPHER
return String(cString: sqlite3_errstr(rawValue))
#else
if #available(OSX 10.10, OSXApplicationExtension 10.10, *) {
if #available(iOS 8.2, OSX 10.10, OSXApplicationExtension 10.10, *) {
return String(cString: sqlite3_errstr(rawValue))
} else {
return nil
Expand Down
6 changes: 3 additions & 3 deletions GRDB/Core/Support/StandardLibrary/StandardLibrary.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ extension DatabaseFunction {
/// let nameColumn = Column("name")
/// let request = Player.select(nameColumn.localizedCapitalized)
/// let names = try String.fetchAll(dbQueue, request) // [String]
@available(OSX 10.11, watchOS 3.0, *)
@available(iOS 9.0, OSX 10.11, watchOS 3.0, *)
public static let localizedCapitalize = DatabaseFunction("swiftLocalizedCapitalizedString", argumentCount: 1, pure: true) { dbValues in
guard let string = String.fromDatabaseValue(dbValues[0]) else {
return nil
Expand All @@ -579,7 +579,7 @@ extension DatabaseFunction {
/// let nameColumn = Column("name")
/// let request = Player.select(nameColumn.localizedLowercased)
/// let names = try String.fetchAll(dbQueue, request) // [String]
@available(OSX 10.11, watchOS 3.0, *)
@available(iOS 9.0, OSX 10.11, watchOS 3.0, *)
public static let localizedLowercase = DatabaseFunction("swiftLocalizedLowercaseString", argumentCount: 1, pure: true) { dbValues in
guard let string = String.fromDatabaseValue(dbValues[0]) else {
return nil
Expand All @@ -599,7 +599,7 @@ extension DatabaseFunction {
/// let nameColumn = Column("name")
/// let request = Player.select(nameColumn.localizedUppercased)
/// let names = try String.fetchAll(dbQueue, request) // [String]
@available(OSX 10.11, watchOS 3.0, *)
@available(iOS 9.0, OSX 10.11, watchOS 3.0, *)
public static let localizedUppercase = DatabaseFunction("swiftLocalizedUppercaseString", argumentCount: 1, pure: true) { dbValues in
guard let string = String.fromDatabaseValue(dbValues[0]) else {
return nil
Expand Down
6 changes: 3 additions & 3 deletions GRDB/QueryInterface/SQL/SQLFunctions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ extension SQLSpecificExpressible {
/// let nameColumn = Column("name")
/// let request = Player.select(nameColumn.localizedCapitalized)
/// let names = try String.fetchAll(dbQueue, request) // [String]
@available(OSX 10.11, watchOS 3.0, *)
@available(iOS 9.0, OSX 10.11, watchOS 3.0, *)
public var localizedCapitalized: SQLExpression {
return DatabaseFunction.localizedCapitalize.apply(sqlExpression)
}
Expand All @@ -199,7 +199,7 @@ extension SQLSpecificExpressible {
/// let nameColumn = Column("name")
/// let request = Player.select(nameColumn.localizedLowercased)
/// let names = try String.fetchAll(dbQueue, request) // [String]
@available(OSX 10.11, watchOS 3.0, *)
@available(iOS 9.0, OSX 10.11, watchOS 3.0, *)
public var localizedLowercased: SQLExpression {
return DatabaseFunction.localizedLowercase.apply(sqlExpression)
}
Expand All @@ -210,7 +210,7 @@ extension SQLSpecificExpressible {
/// let nameColumn = Column("name")
/// let request = Player.select(nameColumn.localizedUppercased)
/// let names = try String.fetchAll(dbQueue, request) // [String]
@available(OSX 10.11, watchOS 3.0, *)
@available(iOS 9.0, OSX 10.11, watchOS 3.0, *)
public var localizedUppercased: SQLExpression {
return DatabaseFunction.localizedUppercase.apply(sqlExpression)
}
Expand Down