From 751ddae7a2ce86f9390a40d98919ea7c549b4db7 Mon Sep 17 00:00:00 2001
From: Andrew Kaster <akaster@serenityos.org>
Date: Mon, 22 Apr 2024 20:23:58 -0600
Subject: [PATCH] DevContainer: Recommend clang-18, and bump feature version

---
 .devcontainer/devcontainer.json                           | 2 +-
 .devcontainer/features/serenity/devcontainer-feature.json | 4 +++-
 .devcontainer/features/serenity/install.sh                | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index bc61fb9ecd3..40073c86373 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -7,7 +7,7 @@
         "ghcr.io/devcontainers/features/github-cli:1": {},
         "ghcr.io/devcontainers-contrib/features/pre-commit:1": {},
         "./features/serenity": {
-            "llvm_version": 16,
+            "llvm_version": 18,
             "enable_ladybird": true,
             "enable_serenity": true
         },
diff --git a/.devcontainer/features/serenity/devcontainer-feature.json b/.devcontainer/features/serenity/devcontainer-feature.json
index 5a1bd2ca52f..79450f3d8a8 100644
--- a/.devcontainer/features/serenity/devcontainer-feature.json
+++ b/.devcontainer/features/serenity/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
     "name": "Serenity Development",
     "id": "serenity",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Enable development of Serenity and Lagom libraries and applications",
     "options": {
         "llvm_version": {
@@ -9,6 +9,8 @@
             "proposals": [
                 15,
                 16,
+                17,
+                18,
                 "trunk"
             ],
             "default": 16,
diff --git a/.devcontainer/features/serenity/install.sh b/.devcontainer/features/serenity/install.sh
index 6d97e236556..07f20143a9a 100755
--- a/.devcontainer/features/serenity/install.sh
+++ b/.devcontainer/features/serenity/install.sh
@@ -3,7 +3,7 @@ set -e
 
 # Feature options
 
-LLVM_VERSION=${LLVM_VERSION:-16}
+LLVM_VERSION=${LLVM_VERSION:-18}
 ENABLE_LADYBIRD=${ENABLE_LADYBIRD:-true}
 ENABLE_SERENITY=${ENABLE_SERENITY:-true}