Merge branch 'main' into update/sbt-scalajs-1.16.0

zarthross · Jul 25, 2024 · 73c00f9 · 73c00f9
2 parents ea2ab85 + 9fdcec8
commit 73c00f9
Show file tree

Hide file tree

Showing 4 changed files with 146 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,4 @@ metals.sbt
 
 # npm
 node_modules/
+/.direnv/
diff --git a/build.sbt b/build.sbt
@@ -17,7 +17,7 @@ ThisBuild / tlSonatypeUseLegacyHost := false
 // publish website from this branch
 ThisBuild / tlSitePublishBranch := Some("main")
 
-val Scala213 = "2.13.12"
+val Scala213 = "2.13.14"
 ThisBuild / crossScalaVersions := Seq(Scala213, "3.3.3")
 ThisBuild / scalaVersion := Scala213 // the default Scala
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -10,7 +10,7 @@
       let
         pkgs = import nixpkgs {
           inherit system;
-          overlays = [ typelevel-nix.overlay ];
+          overlays = [ typelevel-nix.overlays.default ];
         };
       in
       {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,3 +23,4 @@ metals.sbt

		# npm
		node_modules/
		/.direnv/