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..76a0d945 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, ) @@ -143,6 +143,8 @@ lazy val examples = module("examples") "com.disneystreaming.smithy4s" %% "smithy4s-aws-kernel" % smithy4sVersion.value, ), publish := false, + // generated code + scalacOptions += "-Wconf:cat=deprecation:silent", ) .enablePlugins(Smithy4sCodegenPlugin) diff --git a/flake.lock b/flake.lock index 1c25de58..42bd7c08 100644 --- a/flake.lock +++ b/flake.lock @@ -20,15 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713905099, - "narHash": "sha256-6+M6qG/7PmDxYeXdutxS6gcS2MQR50ilEaIcNwnAmto=", + "lastModified": 1730272153, + "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0e7e9561350c68125627534b7c0f2d3cd5d32151", + "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 9afa5030..35a33a30 100644 --- a/flake.nix +++ b/flake.nix @@ -1,27 +1,17 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; 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