Skip to content

Commit

Permalink
Backport things from tree-sitter branch (#486)
Browse files Browse the repository at this point in the history
* Backport things from tree-sitter branch

* ignore deprecations in examples

* Use nixpkgs 24.05

* oops

* Use nixpkgs-unstable
  • Loading branch information
kubukoz authored Nov 5, 2024
1 parent 26744fe commit 332c10d
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 18 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,8 @@
**/.DS_Store
.smithy.lsp.log
.sbt
**/node_modules
smithyql-log.txt

result
.version
4 changes: 3 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)

Expand Down Expand Up @@ -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)

Expand Down
7 changes: 4 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 4 additions & 14 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 332c10d

Please sign in to comment.