Library updates

cquiroz · May 7, 2024 · 82a712f · 82a712f
1 parent 88cf8cf
commit 82a712f
Show file tree

Hide file tree

Showing 9 changed files with 195 additions and 8 deletions.
diff --git a/.envrc b/.envrc
@@ -0,0 +1,3 @@
+use flake
+layout node
+eval "$shellHook"
diff --git a/build.sbt b/build.sbt
@@ -43,10 +43,10 @@ lazy val api = crossProject(JSPlatform, JVMPlatform, NativePlatform)
     name := "cldr-api",
     scalaVersion := scalaVersion212,
     description := "scala-java-locales cldrl api",
-    crossScalaVersions := Seq(scalaVersion212, "2.13.13", "3.3.3"),
+    crossScalaVersions := Seq(scalaVersion212, "2.13.14", "3.4.1"),
     libraryDependencies ++= List(
       ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.2").cross(CrossVersion.for3Use2_13),
-      "org.scalameta"       %%% "munit"                  % "1.0.0-M7" % Test
+      "org.scalameta"       %%% "munit"                  % "1.0.0-RC1" % Test
     ),
     testFrameworks += new TestFramework("munit.Framework")
   )

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -0,0 +1,28 @@
+{
+  inputs = {
+    typelevel-nix.url = "github:typelevel/typelevel-nix";
+    nixpkgs.follows = "typelevel-nix/nixpkgs";
+    flake-utils.follows = "typelevel-nix/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils, typelevel-nix }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs-x86_64 = import nixpkgs { system = "x86_64-darwin"; };
+        scala-cli-overlay = final: prev: { scala-cli = pkgs-x86_64.scala-cli; };
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [ typelevel-nix.overlay scala-cli-overlay ];
+        };
+      in {
+        devShell = pkgs.devshell.mkShell {
+          imports = [ typelevel-nix.typelevelShell ];
+          typelevelShell = {
+            nodejs.enable = true;
+            jdk.package = pkgs.jdk8;
+          };
+        };
+      }
+
+    );
+}
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.9
+sbt.version=1.10.0
diff --git a/sbt-locales/src/sbt-test/sbt-locales/common-filtering/build.sbt b/sbt-locales/src/sbt-test/sbt-locales/common-filtering/build.sbt
@@ -17,5 +17,5 @@ lazy val root =
       libraryDependencies += ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.1").withDottyCompat(scalaVersion.value)
     )
     .nativeSettings(
-      scalaVersion := "2.13.4"
+      scalaVersion := "2.13.14"
     )
diff --git a/sbt-locales/src/sbt-test/sbt-locales/common-filtering/project/plugins.sbt b/sbt-locales/src/sbt-test/sbt-locales/common-filtering/project/plugins.sbt
@@ -6,6 +6,6 @@ addSbtPlugin(
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "1.3.2")
 addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.16.0")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
-addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.4.3")
+addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.4.17")
 addSbtPlugin("org.typelevel"      % "sbt-tpolecat"                  % "0.5.1")
 addSbtPlugin("ch.epfl.lamp"       % "sbt-dotty"                     % "0.5.5")
diff --git a/sbt-locales/src/sbt-test/sbt-locales/no-filtering/build.sbt b/sbt-locales/src/sbt-test/sbt-locales/no-filtering/build.sbt
@@ -7,7 +7,7 @@ lazy val root =
     .in(file("."))
     .settings(
       name := "no-filtering",
-      scalaVersion := "2.13.4",
+      scalaVersion := "2.13.14",
       cldrVersion := CLDRVersion.Version("35.0"),
       localesFilter := LocalesFilter.All,
       nsFilter := NumberingSystemFilter.All,

diff --git a/sbt-locales/src/sbt-test/sbt-locales/no-filtering/project/plugins.sbt b/sbt-locales/src/sbt-test/sbt-locales/no-filtering/project/plugins.sbt
@@ -4,6 +4,6 @@ addSbtPlugin(
 )
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "1.3.2")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
-addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.1.0")
-addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.4.3")
+addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.16.0")
+addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.4.17")
 addSbtPlugin("org.typelevel"      % "sbt-tpolecat"                  % "0.5.1")