Skip to content

Commit

Permalink
Merge pull request #11 from IBM-Swift/swift-4
Browse files Browse the repository at this point in the history
Support Swift 4
  • Loading branch information
quanvo87 authored Sep 18, 2017
2 parents 5a9d04e + 3a3fe9b commit dfd9c8a
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
/.build
/Packages
/*.xcodeproj
Package.resolved
47 changes: 47 additions & 0 deletions [email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
// swift-tools-version:4.0
// The swift-tools-version declares the minimum version of Swift required to build this package.

/**
* Copyright IBM Corporation 2017
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
**/

import PackageDescription

let package = Package(
name: "SwiftKueryMySQL",
products: [
// Products define the executables and libraries produced by a package, and make them visible to other packages.
.library(
name: "SwiftKueryMySQL",
targets: ["SwiftKueryMySQL"]
)
],
dependencies: [
.package(url: "https://github.com/IBM-Swift/CMySQL.git", .upToNextMinor(from: "0.1.0")),
.package(url: "https://github.com/IBM-Swift/Swift-Kuery.git", .upToNextMinor(from: "0.13.0"))
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
// Targets can depend on other targets in this package, and on products in packages which this package depends on.
.target(
name: "SwiftKueryMySQL",
dependencies: ["SwiftKuery", "CMySQL"]
),
.testTarget(
name: "SwiftKueryMySQLTests",
dependencies: ["SwiftKueryMySQL"]
)
]
)
2 changes: 1 addition & 1 deletion Tests/SwiftKueryMySQLTests/MySQLTest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class MySQLTest: XCTestCase {
private static var threadSafePool: ConnectionPool?
private static var threadUnsafePool: ConnectionPool?

func performTest(characterSet: String? = nil, timeout: TimeInterval = 10, line: Int = #line, asyncTasks: @escaping (Connection) -> Void...) {
func performTest(characterSet: String? = nil, timeout: TimeInterval = 10, line: Int = #line, asyncTasks: (Connection) -> Void...) {

var connection: Connection
guard let pool = getPool(taskCount: asyncTasks.count, characterSet: characterSet).pool else {
Expand Down

0 comments on commit dfd9c8a

Please sign in to comment.