diff --git a/.gitignore b/.gitignore index 9f5210f6..afc0453f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,8 @@ **/.DS_Store .smithy.lsp.log .sbt +**/node_modules smithyql-log.txt + +result .version diff --git a/build.sbt b/build.sbt index c2e02021..43c62c91 100644 --- a/build.sbt +++ b/build.sbt @@ -73,7 +73,7 @@ val commonSettings = Seq( Nil }, Test / scalacOptions += "-Wconf:cat=deprecation:silent,msg=Specify both message and version:silent", - scalacOptions ++= Seq("-release", "11"), + scalacOptions += "-release:11", mimaFailOnNoPrevious := false, ) diff --git a/flake.nix b/flake.nix index 9afa5030..e4e49875 100644 --- a/flake.nix +++ b/flake.nix @@ -4,24 +4,14 @@ flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { self, nixpkgs, flake-utils, ... }@inputs: + outputs = { nixpkgs, flake-utils, ... }: flake-utils.lib.eachDefaultSystem ( system: let - pkgs = import nixpkgs { - inherit system; - overlays = [ - (final: prev: - let - jre = final.openjdk11; - jdk = jre; - in - { inherit jdk jre; }) - ]; - }; + pkgs = import nixpkgs { inherit system; }; in { - devShell = pkgs.mkShell { + devShells.default = pkgs.mkShell { buildInputs = [ pkgs.yarn pkgs.nodejs