From 71808113377036d491181245975d5e6e07391270 Mon Sep 17 00:00:00 2001 From: fwcd Date: Fri, 5 Jan 2024 22:15:45 +0000 Subject: [PATCH] Bump minimum Swift to 5.9 --- .github/workflows/build.yml | 2 +- .gitlab-ci.yml | 2 +- Dockerfile | 3 +-- Package.swift | 2 +- README.md | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 475956ac..e544af19 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: ['ubuntu-latest', 'macos-13'] - swift: ['5.8', '5.9'] + swift: ['5.9'] runs-on: ${{ matrix.os }} steps: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1a681f08..abb943ae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "swift:5.8" +image: "swift:5.9" stages: - build diff --git a/Dockerfile b/Dockerfile index 7c2276c3..cdb6daac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -# FIXME: There are still issues with 5.9, see https://github.com/apple/swift-sdk-generator/issues/12#issuecomment-1777670789 -ARG SWIFTVERSION=5.8.1 +ARG SWIFTVERSION=5.9.1 ARG UBUNTUDISTRO=jammy FROM swift:${SWIFTVERSION}-${UBUNTUDISTRO} AS sysroot diff --git a/Package.swift b/Package.swift index 69426b6c..fb69573d 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.8 +// swift-tools-version:5.9 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription diff --git a/README.md b/README.md index dca2bf8c..57d1910c 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ General-purpose assistant for Discord and IRC with more than 340 commands, inclu To build and run D2 locally, make sure to have the following installed: - Linux or macOS 10.15+ -- Swift 5.8+ +- Swift 5.9+ - Node.js and npm (for LaTeX rendering) On Ubuntu, run