diff --git a/Package.swift b/Package.swift index 67d0c0c..bf1c696 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.7 +// swift-tools-version:5.8 import PackageDescription let package = Package( @@ -40,7 +40,8 @@ let package = Package( .product(name: "NIOFoundationCompat", package: "swift-nio"), .product(name: "NIOTransportServices", package: "swift-nio-transport-services"), .product(name: "NIOSSL", package: "swift-nio-ssl"), - ] + ], + swiftSettings: swiftSettings ), .target( name: "MySQLNIO", @@ -50,9 +51,26 @@ let package = Package( .product(name: "Logging", package: "swift-log"), .product(name: "NIO", package: "swift-nio"), .product(name: "NIOSSL", package: "swift-nio-ssl"), - ] + ], + swiftSettings: swiftSettings + ), + .testTarget( + name: "MySQLNIOCoreTests", + dependencies: [.target(name: "MySQLNIOCore")], + swiftSettings: swiftSettings + ), + .testTarget( + name: "MySQLNIOTests", + dependencies: [.target(name: "MySQLNIO")], + swiftSettings: swiftSettings ), - .testTarget(name: "MySQLNIOCoreTests", dependencies: [.target(name: "MySQLNIOCore")]), - .testTarget(name: "MySQLNIOTests", dependencies: [.target(name: "MySQLNIO")]), ] ) + +var swiftSettings: [SwiftSetting] { [ + .enableUpcomingFeature("ForwardTrailingClosures"), + .enableUpcomingFeature("ExistentialAny"), + .enableUpcomingFeature("ConciseMagicFile"), + .enableUpcomingFeature("DisableOutwardActorInference"), + .enableExperimentalFeature("StrictConcurrency=complete"), +] } diff --git a/Package@swift-5.9.swift b/Package@swift-5.9.swift index 1407bb7..2a81085 100644 --- a/Package@swift-5.9.swift +++ b/Package@swift-5.9.swift @@ -2,14 +2,6 @@ import CompilerPluginSupport import PackageDescription -let swiftFeatureSettings: [SwiftSetting] = [ - .enableUpcomingFeature("ForwardTrailingClosures"), - .enableUpcomingFeature("ExistentialAny"), - .enableUpcomingFeature("ConciseMagicFile"), - .enableUpcomingFeature("DisableOutwardActorInference"), - .enableExperimentalFeature("StrictConcurrency=complete"), -] - let package = Package( name: "mysql-nio", platforms: [ @@ -46,7 +38,7 @@ let package = Package( .product(name: "SwiftSyntaxMacros", package: "swift-syntax"), .product(name: "SwiftCompilerPlugin", package: "swift-syntax"), ], - swiftSettings: swiftFeatureSettings + swiftSettings: swiftSettings ), .target( name: "MySQLNIOCore", @@ -65,7 +57,7 @@ let package = Package( .product(name: "NIOSSL", package: "swift-nio-ssl"), .target(name: "MySQLNIOCoreMacros"), ], - swiftSettings: swiftFeatureSettings + swiftSettings: swiftSettings ), .target( name: "MySQLNIO", @@ -76,17 +68,25 @@ let package = Package( .product(name: "NIO", package: "swift-nio"), .product(name: "NIOSSL", package: "swift-nio-ssl"), ], - swiftSettings: swiftFeatureSettings + swiftSettings: swiftSettings ), .testTarget( name: "MySQLNIOCoreTests", dependencies: [.target(name: "MySQLNIOCore")], - swiftSettings: swiftFeatureSettings + swiftSettings: swiftSettings ), .testTarget( name: "MySQLNIOTests", dependencies: [.target(name: "MySQLNIO")], - swiftSettings: swiftFeatureSettings + swiftSettings: swiftSettings ), ] ) + +var swiftSettings: [SwiftSetting] { [ + .enableUpcomingFeature("ForwardTrailingClosures"), + .enableUpcomingFeature("ExistentialAny"), + .enableUpcomingFeature("ConciseMagicFile"), + .enableUpcomingFeature("DisableOutwardActorInference"), + .enableExperimentalFeature("StrictConcurrency=complete"), +] } diff --git a/README.md b/README.md index 3110076..96b66c9 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ Documentation Team Chat MIT License -Continuous Integration - -Swift 5.7+ +Continuous Integration + +Swift 5.8+


diff --git a/Sources/MySQLNIOCore/Documentation.docc/images/article.svg b/Sources/MySQLNIOCore/Documentation.docc/images/article.svg deleted file mode 100644 index 3dc6a66..0000000 --- a/Sources/MySQLNIOCore/Documentation.docc/images/article.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/Sources/MySQLNIOCore/Documentation.docc/images/vapor-mysql-logo.svg b/Sources/MySQLNIOCore/Documentation.docc/images/vapor-mysql-logo.svg deleted file mode 100644 index 503925e..0000000 --- a/Sources/MySQLNIOCore/Documentation.docc/images/vapor-mysql-logo.svg +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Sources/MySQLNIOCore/Documentation.docc/images/vapor-mysqlnio-logo.svg b/Sources/MySQLNIOCore/Documentation.docc/images/vapor-mysqlnio-logo.svg new file mode 100644 index 0000000..e680ab7 --- /dev/null +++ b/Sources/MySQLNIOCore/Documentation.docc/images/vapor-mysqlnio-logo.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + diff --git a/Sources/MySQLNIOCore/Documentation.docc/theme-settings.json b/Sources/MySQLNIOCore/Documentation.docc/theme-settings.json index 7b465f2..cc216f1 100644 --- a/Sources/MySQLNIOCore/Documentation.docc/theme-settings.json +++ b/Sources/MySQLNIOCore/Documentation.docc/theme-settings.json @@ -1,46 +1,21 @@ { - "theme": { - "aside": { - "border-radius": "6px", - "border-style": "double", - "border-width": "3px" - }, - "border-radius": "0", - "button": { - "border-radius": "16px", - "border-width": "1px", - "border-style": "solid" - }, - "code": { - "border-radius": "16px", - "border-width": "1px", - "border-style": "solid" - }, - "color": { - "fill": { - "dark": "rgb(20, 20, 22)", - "light": "rgb(255, 255, 255)" - }, - "mysql-turquoise": "#02758f", - "documentation-intro-fill": "radial-gradient(circle at top, var(--color-documentation-intro-accent) 30%, #1f1d1f 100%)", - "documentation-intro-accent": "var(--color-mysql-turquoise)", - "documentation-intro-accent-outer": { - "dark": "rgb(255, 255, 255)", - "light": "rgb(51, 51, 51)" - }, - "documentation-intro-accent-inner": { - "dark": "rgb(51, 51, 51)", - "light": "rgb(255, 255, 255)" - } - }, - "icons": { - "technology": "/mysqlnio/images/vapor-mysql-logo.svg", - "article": "/mysqlnio/images/article.svg" - } + "theme": { + "aside": { "border-radius": "6px", "border-style": "double", "border-width": "3px" }, + "border-radius": "0", + "button": { "border-radius": "16px", "border-width": "1px", "border-style": "solid" }, + "code": { "border-radius": "16px", "border-width": "1px", "border-style": "solid" }, + "color": { + "mysql-turquoise": "#02758f", + "documentation-intro-fill": "radial-gradient(circle at top, var(--color-mysql-turquoise) 30%, #000 100%)", + "documentation-intro-accent": "var(--color-mysql-turquoise)", + "logo-base": { "dark": "#fff", "light": "#000" }, + "logo-shape": { "dark": "#000", "light": "#fff" }, + "fill": { "dark": "#000", "light": "#fff" } }, - "features": { - "quickNavigation": { - "enable": true - } - } + "icons": { "technology": "/mysqlnio/images/vapor-mysqlnio-logo.svg" } + }, + "features": { + "quickNavigation": { "enable": true }, + "i18n": { "enable": true } + } }