From fad6d8784dad9bf20a932e59ab90ef2a0b1ae2a1 Mon Sep 17 00:00:00 2001
From: Gwynne Raskind <gwynne@vapor.codes>
Date: Thu, 14 Mar 2024 02:08:09 -0500
Subject: [PATCH] Update Package.swift, README, and package logo.

---
 Package.swift                                 | 28 ++++++--
 Package@swift-5.9.swift                       | 26 ++++----
 README.md                                     |  6 +-
 .../Documentation.docc/images/article.svg     |  1 -
 .../images/vapor-mysql-logo.svg               | 64 -------------------
 .../images/vapor-mysqlnio-logo.svg            | 21 ++++++
 .../Documentation.docc/theme-settings.json    | 61 ++++++------------
 7 files changed, 78 insertions(+), 129 deletions(-)
 delete mode 100644 Sources/MySQLNIOCore/Documentation.docc/images/article.svg
 delete mode 100644 Sources/MySQLNIOCore/Documentation.docc/images/vapor-mysql-logo.svg
 create mode 100644 Sources/MySQLNIOCore/Documentation.docc/images/vapor-mysqlnio-logo.svg

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 @@
 <a href="https://docs.vapor.codes/4.0/"><img src="https://design.vapor.codes/images/readthedocs.svg" alt="Documentation"></a>
 <a href="https://discord.gg/vapor"><img src="https://design.vapor.codes/images/discordchat.svg" alt="Team Chat"></a>
 <a href="LICENSE"><img src="https://design.vapor.codes/images/mitlicense.svg" alt="MIT License"></a>
-<a href="https://github.com/vapor/mysql-nio/actions/workflows/test.yml"><img src="https://img.shields.io/github/actions/workflow/status/vapor/mysql-nio/test.yml?event=push&style=plastic&logo=github&label=test&logoColor=%23ccc" alt="Continuous Integration"></a>
-<a href="https://codecov.io/github/vapor/mysql-nio"><img src="https://img.shields.io/codecov/c/github/vapor/mysql-nio?style=plastic&logo=codecov&label=Codecov"></a>
-<a href="https://swift.org"><img src="https://design.vapor.codes/images/swift57up.svg" alt="Swift 5.7+"></a>
+<a href="https://github.com/vapor/mysql-nio/actions/workflows/test.yml"><img src="https://img.shields.io/github/actions/workflow/status/vapor/mysql-nio/test.yml?event=push&style=plastic&logo=github&label=tests&logoColor=%23ccc" alt="Continuous Integration"></a>
+<a href="https://codecov.io/github/vapor/mysql-nio"><img src="https://img.shields.io/codecov/c/github/vapor/sqlite-nio?style=plastic&logo=codecov&label=codecov"></a>
+<a href="https://swift.org"><img src="https://design.vapor.codes/images/swift58up.svg" alt="Swift 5.8+"></a>
 </p>
 
 <br>
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 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 14 14" id="article"><g transform="translate(3.616699, 1.608398)"><path d="M0.0136063,12.3984375H6.948308c1.3516788,0,2.0242538-0.6856346,2.0242538-2.0438433V4.4254899c0-0.842351-0.0979481-1.2080226-0.6203365-1.7434704L4.7542777-0.9812267C4.2580094-1.490555,3.8466287-1.6015625,3.1152854-1.6015625H0.0136063c-1.3451493,0-2.0242538,0.6921641-2.0242538,2.0503731v9.9057837C-2.0106475,11.7193327-1.3380729,12.3984375,0.0136063,12.3984375zM0.0593152,11.3471317c-0.6725746,0-1.0186567-0.3591423-1.0186567-1.0121269V0.4684002c0-0.6464552,0.346082-1.0186567,1.0251865-1.0186567h2.9057837v3.7938433c0,0.8227613,0.4113805,1.2276118,1.227612,1.2276118h3.7220149v5.8638062c0,0.6529846-0.3460822,1.0121269-1.0251865,1.0121269H0.0593152zM4.3167777,3.4851911c-0.2611938,0-0.3591416-0.1044776-0.3591416-0.3656716v-3.4673507l3.761194,3.8330224H4.3167777zM5.8839421,6.2734375H0.9277854c-0.2350746,0-0.4113806,0.1763058-0.4113806,0.3983207c0,0.2285452,0.176306,0.404851,0.4113806,0.404851h4.9561567c0.2285447,0,0.3983207-0.1763058,0.3983207-0.404851C6.2822628,6.4497433,6.1124868,6.2734375,5.8839421,6.2734375zM5.8839421,8.5523558H0.9277854c-0.2350746,0-0.4113806,0.1828356-0.4113806,0.4113798c0,0.2220154,0.176306,0.3917913,0.4113806,0.3917913h4.9561567c0.2285447,0,0.3983207-0.169776,0.3983207-0.3917913C6.2822628,8.7351913,6.1124868,8.5523558,5.8839421,8.5523558z"></path></g></svg>
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 @@
-<svg viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg" id="technology">
-  <style>
-    @media (prefers-color-scheme: light) {
-      :root, body[data-color-scheme="auto"], body[data-color-scheme="light"] {
-        --color-documentation-intro-accent-outer: #000;
-        --color-documentation-intro-accent-inner: #fff;
-      }
-      body[data-color-scheme="dark"] {
-        --color-documentation-intro-accent-outer: #fff;
-        --color-documentation-intro-accent-inner: #000;
-      }
-    }
-    @media (prefers-color-scheme: dark) {
-      :root, body[data-color-scheme="auto"], body[data-color-scheme="dark"] {
-        --color-documentation-intro-accent-outer: #fff;
-        --color-documentation-intro-accent-inner: #000;
-      }
-      body[data-color-scheme="light"] {
-        --color-documentation-intro-accent-outer: #000;
-        --color-documentation-intro-accent-inner: #fff;
-      }
-    }
-  </style>
-  <defs>
-    <path id="diam"  d="M 0,0 l 55.5,-47 58.5,47 -57, 45 z" />
-    <path id="seg"   d="M 0,0 l    0, 12 57.0,45   0,-12 z" />
-    <path id="shape" d="M 59.50,70.34
-                        l -0.24,    0 -0.33, 0.32 -0.10, 0.21
-                        c -0.54, 1.50 -1.38, 3.33 -2.31, 4.68 l -2.37,-9.98 -0.10,-0.10
-                        c -3.41,-6.48 -5.49-17.17 -2.36-26.36 l  0.22,-0.62 -0.59,-0.32
-                        c -2.21,-1.20 -4.51,-0.70 -5.88,-0.40 l -0.10, 0.10
-                        c  0.13,-0.26  0.36,-0.57  0.65,-1.00    0.75,-1.17  1.60,-2.17  2.52,-3.03
-                        c  3.34,-3.11  6.91,-3.74  8.73,-3.84 l  0.29,    0  0.20,-0.19
-                        c  0.68,-0.64  1.44,-1.21  2.20,-1.74
-                        c 12.68,-8.73 20.40,-0.93 20.48,-0.85 l  0.23, 0.25  0.35,    0
-                        c  4.08,-0.10  4.86, 0.47  4.99, 0.60   -0.10, 0.10 -0.13, 0.29 -0.56, 0.69
-                        c -1.91, 1.79 -6.94, 3.95 -6.98, 3.98   -3.24, 1.44 -6.19, 3.27 -8.80, 5.45
-                        c     0,-0.84     0,-1.65 -0.10,-2.36 l -1.58, 0.10
-                        c  0.10, 1.25  0.19, 2.60     0, 3.64 v  1.75
-                        c     0, 0.68 -0.10, 1.33 -0.18, 1.90 v  0.24
-                        c -0.27, 1.87 -0.66, 2.36 -0.77, 2.45       0,    0 -0.52,    0 -1.62,-1.88
-                        l -0.10,-0.10
-                        c -0.44,-0.72 -0.97,-1.70 -1.60,-3.05 l -1.43, 0.68
-                        c  0.53, 1.12  1.01, 2.08  1.47, 2.87
-                        c -6.43, 8.76 -7.19,17.79 -7.21,18.17 l     0, 0.20  0.10, 0.21
-                        c  1.41, 3.12  4.89, 4.74  6.90, 5.44   -1.02, 0.73 -2.52, 1.67 -3.93, 1.86 z
-                        M 75.52,28.60
-                        c  0.61,-0.56  0.64,-1.51  0.10,-2.12   -0.56,-0.60 -1.51,-0.64 -2.12,-0.10
-                        c -0.61, 0.56 -0.64, 1.51 -0.10, 2.12    0.56, 0.60  1.51, 0.64  2.12, 0.10 z
-                        " />          
-  </defs>
-  <g transform="translate(7 47)">
-    <use href="#seg" transform="translate(0  0)" fill="hsl(199, 99%, 61%)" />
-    <use href="#seg" transform="translate(0 12)" fill="hsl(199, 99%, 71%)" />
-    <use href="#seg" transform="translate(0 24)" fill="hsl(199, 99%, 81%)" />
-    <g transform="translate(114 0) scale(-1 1)">
-      <use href="#seg" transform="translate(0  0)" fill="hsl(292, 96%, 61%)" />
-      <use href="#seg" transform="translate(0 12)" fill="hsl(292, 96%, 71%)" />
-      <use href="#seg" transform="translate(0 24)" fill="hsl(292, 96%, 81%)" />
-    </g>
-    <use href="#diam" style="fill: var(--color-documentation-intro-accent-outer);" />
-  </g>
-  <use href="#shape" style="fill: var(--color-documentation-intro-accent-inner);" />
-</svg>
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 @@
+<svg viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg" id="technology">
+  <defs>
+  <style>
+    @media(prefers-color-scheme:dark){:root{--color-logo-shape:#000;--color-logo-base:#fff}}
+    body[data-color-scheme="dark"]{--color-logo-shape:#000;--color-logo-base:#fff}
+  </style>
+  <path id="d" d="M6,47l58-47,58,47-58,45z" />
+  <path id="s" d="M6,47v12l58,45v-12z" />
+  <path id="h" d="m59.5,70.3c-.7-.2-.7,1.6-3,5.2-.8-3.3-1.5-6.8-2.5-10-6.8-13-2.6-25.7-2.1-27-2.1-1.3-4.3-1.2-6.6-.6,3.3-5.6,8.1-7.7,11.9-7.9.4.2.3-.2,2.7-1.9,12.7-8.8,20.4-1,20.5-.9.1.4.4.2.6.3,4.1-.1,4.8.4,5,.6-.1.1-.2.3-.6.7-3.2,3-9.3,3.9-15.8,9.4,0-.8,0-1.7-.1-2.4-.5,0-1,.1-1.5.1.2,2.6.1,9.1-1,10-1.2-.2-2.3-4.9-3.3-1.9-.5.2-.9.5-1.4.7.5,1.1,1,2,1.4,2.8-6.4,8.8-7.2,17.8-7.2,18.2-.1.2,1.2,3.8,7,5.8-1,.8-2.5,1.7-3.9,1.9zm16.1-43.8c-1.2-1.4-3.5.5-2.2,2,1.4,1.4,3.5-.7,2.2-2z" />
+  </defs>
+  <use href="#s" fill="#9ee0ff"/>
+  <use href="#s" fill="#6bd0ff" y="12"/>
+  <use href="#s" fill="#38c0ff" y="24"/>
+  <g transform="matrix(-1 0 0 1 128 0)">
+    <use href="#s" fill="#f29eff"/>
+    <use href="#s" fill="#eb6bff" y="12"/>
+    <use href="#s" fill="#e438ff" y="24"/>
+  </g>
+  <use href="#d" style="fill:var(--color-logo-base,#000)"/>
+  <use href="#h" style="fill:var(--color-logo-shape,#fff)"/>
+</svg>
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 }
+  }
 }