From 39d920d6a24697f407fab0d28bc24da809a3e20b Mon Sep 17 00:00:00 2001
From: Jamie Thompson <bishbashboshjt@gmail.com>
Date: Fri, 16 Jan 2026 14:39:51 +0100
Subject: [PATCH 1/2] add sbt to flake

---
 .gitignore                 |  1 +
 flake.lock                 | 18 +++++++++---------
 flake.nix                  |  2 +-
 project/build.properties   |  2 +-
 project/project/metals.sbt | 14 --------------
 5 files changed, 12 insertions(+), 25 deletions(-)
 delete mode 100644 project/project/metals.sbt

diff --git a/.gitignore b/.gitignore
index c376a78..b8657cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -188,6 +188,7 @@ local.properties
 .cache-main
 .scala_dependencies
 .worksheet
+metals.sbt
 
 # Uncomment this line if you wish to ignore the project description file.
 # Typically, this file would be tracked if it contains build/dependency configurations:
diff --git a/flake.lock b/flake.lock
index 807a125..48b69f8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1751413152,
-        "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
+        "lastModified": 1768135262,
+        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
+        "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1751271578,
-        "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
+        "lastModified": 1768305791,
+        "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df",
+        "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e",
         "type": "github"
       },
       "original": {
@@ -36,11 +36,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1751159883,
-        "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
+        "lastModified": 1765674936,
+        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab",
+        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 684cb57..8ac7e34 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,7 @@
         # Equivalent to  inputs'.nixpkgs.legacyPackages.hello;
         # packages.default = pkgs.hello;
         devShells.default = pkgs.mkShell {
-          buildInputs = with pkgs; [ jdk21 scala-cli metals scalafmt ];
+          buildInputs = with pkgs; [ jdk21 scala-cli metals scalafmt sbt ];
         };
       };
       flake = {
diff --git a/project/build.properties b/project/build.properties
index 04267b1..30b7fd9 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.9
+sbt.version=1.12.0
diff --git a/project/project/metals.sbt b/project/project/metals.sbt
deleted file mode 100644
index d9e4707..0000000
--- a/project/project/metals.sbt
+++ /dev/null
@@ -1,14 +0,0 @@
-// format: off
-// DO NOT EDIT! This file is auto-generated.
-
-// This plugin enables semantic information to be produced by sbt.
-// It also adds support for debugging using the Debug Adapter Protocol
-
-addSbtPlugin("org.scalameta" % "sbt-metals" % "1.6.0")
-
-// This plugin makes sure that the JDI tools are in the sbt classpath.
-// JDI tools are used by the debug adapter server.
-
-addSbtPlugin("com.github.sbt" % "sbt-jdi-tools" % "1.2.0")
-
-// format: on

From 734c047532aa8f03855bec20825aaf0bb5c1b291 Mon Sep 17 00:00:00 2001
From: Jamie Thompson <bishbashboshjt@gmail.com>
Date: Fri, 16 Jan 2026 16:14:20 +0100
Subject: [PATCH 2/2] switch to 3.8.0-RC6 to bring in scala3-repl

going beyond to the 3.8.1 RCs crash compiler, also will not commit to the 3.8.0 tasty until the release is confirmed.
---
 build.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index 9ed323c..b19ff85 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,4 +1,4 @@
-val scala3Version = "3.8.0-RC1-bin-20250818-aaa39c5-NIGHTLY"
+val scala3Version = "3.8.0-RC6"
 resolvers += ("Artifactory" at "https://repo.scala-lang.org/artifactory/maven-nightlies/")
 
 inThisBuild(