Skip to content
This repository has been archived by the owner on Jan 24, 2025. It is now read-only.

Update magnolia #451

Merged
merged 4 commits into from
Sep 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use flake
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ index.scip
node_modules
package.json
package-lock.json

.direnv
10 changes: 7 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ lazy val core = (projectMatrix in file("core"))
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, _)) =>
Seq(
"com.softwaremill.magnolia1_3" %%% "magnolia" % "1.1.2"
"com.softwaremill.magnolia1_3" %%% "magnolia" % "1.1.4"
)
case _ =>
Seq(
"com.softwaremill.magnolia1_2" %%% "magnolia" % "1.1.2",
"com.softwaremill.magnolia1_2" %%% "magnolia" % "1.1.4",
"org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided
)
}
Expand All @@ -92,7 +92,11 @@ lazy val core = (projectMatrix in file("core"))
"org.scalatest" %%% "scalatest-shouldmatchers" % scalatestVersion % Test,
"io.github.cquiroz" %%% "scala-java-time" % "2.4.0" % Test
),
versionSpecificScalaSources
versionSpecificScalaSources,
scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, _)) => Seq("-Xmax-inlines:64")
case _ => Seq()
})
)
.jvmPlatform(
scalaVersions = List(scala212, scala213, scala3),
Expand Down
19 changes: 9 additions & 10 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,18 @@
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = import nixpkgs { inherit system; };
shellPackages = [
"jre"
"sbt"
"nodejs"
"yarn"
];
in
{
devShell = pkgs.mkShell {
buildInputs = map (pkgName: pkgs.${pkgName}) shellPackages;
buildInputs = with pkgs; [
(sbt.override {
jre = temurin-jre-bin-17;
})
nodejs
yarn
];
welcomeMessage = ''
Welcome to the Diffx Nix shell! 👋
Available packages:
${builtins.concatStringsSep "\n" (map (n : "- ${n}") shellPackages)}
'';

shellHook = ''
Expand All @@ -28,4 +26,5 @@
};
}
);
}
}