Skip to content

Commit

Permalink
Compile under Swift 6 (#345)
Browse files Browse the repository at this point in the history
  • Loading branch information
Joannis authored Aug 15, 2024
1 parent b0619d4 commit 416cffe
Show file tree
Hide file tree
Showing 3 changed files with 117 additions and 2 deletions.
115 changes: 115 additions & 0 deletions [email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
// swift-tools-version:6.0
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription

let package = Package(
name: "MongoKitten",
platforms: [
.macOS(.v13),
.iOS(.v13)
],
products: [
// Products define the executables and libraries produced by a package, and make them visible to other packages.
.library(
name: "MongoKitten",
targets: ["MongoKitten"]),
.library(
name: "Meow",
targets: ["Meow"]),
.library(
name: "MongoClient",
targets: ["MongoClient"]),
.library(
name: "MongoCore",
targets: ["MongoCore"]),
],
dependencies: [
// ✏️
.package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),

// 📈
.package(url: "https://github.com/apple/swift-metrics.git", "1.0.0" ..< "3.0.0"),

// ✅
.package(url: "https://github.com/apple/swift-atomics.git", from: "1.0.0"),

// 💾
.package(url: "https://github.com/orlandos-nl/BSON.git", from: "8.0.9"),

// 🚀
.package(url: "https://github.com/apple/swift-nio.git", from: "2.43.0"),

// 📚
.package(url: "https://github.com/orlandos-nl/DNSClient.git", from: "2.2.1"),

// 🔑
.package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.0.0"),

// 🔍
.package(url: "https://github.com/apple/swift-distributed-tracing.git", from: "1.0.0"),
],
targets: [
.target(
name: "_MongoKittenCrypto",
dependencies: [],
swiftSettings: [
.enableExperimentalFeature("StrictConcurrency=complete"),
]),
.target(
name: "MongoCore",
dependencies: [
.product(name: "BSON", package: "BSON"),
.product(name: "NIO", package: "swift-nio"),
.product(name: "NIOSSL", package: "swift-nio-ssl"),
.product(name: "NIOFoundationCompat", package: "swift-nio"),
.product(name: "Logging", package: "swift-log"),
.product(name: "Metrics", package: "swift-metrics"),
.product(name: "Atomics", package: "swift-atomics"),
],
swiftSettings: [
.enableExperimentalFeature("StrictConcurrency=complete"),
]),
.target(
name: "MongoKittenCore",
dependencies: ["MongoClient"],
swiftSettings: [
.enableExperimentalFeature("StrictConcurrency=complete"),
]),
.target(
name: "MongoKitten",
dependencies: ["MongoClient", "MongoKittenCore"],
swiftSettings: [
.enableExperimentalFeature("StrictConcurrency=complete"),
]),
.target(
name: "Meow",
dependencies: ["MongoKitten"],
swiftSettings: [
.enableExperimentalFeature("StrictConcurrency=complete"),
]),
.target(
name: "MongoClient",
dependencies: [
"MongoCore",
"_MongoKittenCrypto",
.product(name: "DNSClient", package: "DNSClient"),
.product(name: "Tracing", package: "swift-distributed-tracing")
],
swiftSettings: [
.enableExperimentalFeature("StrictConcurrency=complete"),
]
),
.testTarget(
name: "MongoCoreTests",
dependencies: ["MongoCore"]),
.testTarget(
name: "MongoKittenTests",
dependencies: [
"MongoKitten",
]),
.testTarget(
name: "MeowTests",
dependencies: ["Meow"]),
]
)
2 changes: 1 addition & 1 deletion Sources/Meow/Database.swift
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class MeowDatabase: @unchecked Sendable {
/// let mongodb: MongoDatabase = mongoCluster["superapp"]
/// let meow = MeowDatabase(mongodb)
/// let users: MeowCollection<User> = meow[User.self]
public final class MeowTransactionDatabase: MeowDatabase {
public final class MeowTransactionDatabase: MeowDatabase, @unchecked Sendable {
private let transaction: MongoTransactionDatabase

fileprivate init(_ transaction: MongoTransactionDatabase) {
Expand Down
2 changes: 1 addition & 1 deletion Sources/MongoKitten/MongoTransactionDatabase.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Tracing
import MongoCore

public final class MongoTransactionDatabase: MongoDatabase {
public final class MongoTransactionDatabase: MongoDatabase, @unchecked Sendable {
/// Commits the transaction and ends the session.
public func commit() async throws {
span?.addEvent(.init(name: "Commit Transaction"))
Expand Down

0 comments on commit 416cffe

Please sign in to comment.