Merge pull request #333 from cquiroz/update

Library updates
cquiroz · May 8, 2024 · 92ac620 · 92ac620
2 parents 88cf8cf + 1c1dc33
commit 92ac620
Show file tree

Hide file tree

Showing 11 changed files with 200 additions and 15 deletions.
diff --git a/.envrc b/.envrc
@@ -0,0 +1,3 @@
+use flake
+layout node
+eval "$shellHook"
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,4 @@ project/metals.sbt
 .bloop
 /project/project/
 /project/target/
+.direnv/
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
@@ -8,14 +8,11 @@ lazy val root =
     .settings(
       name := "no-filtering",
       cldrVersion := CLDRVersion.Version("38.1"),
-      scalaVersion := "3.0.0-M3",
+      scalaVersion := "3.4.1",
       localesFilter := LocalesFilter.Selection("en-US", "fi", "fi-FI"),
       nsFilter := NumberingSystemFilter.Minimal,
       currencyFilter := CurrencyFilter.Selection("EUR"),
       supportISOCodes := true,
       supportNumberFormats := true,
-      libraryDependencies += ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.1").withDottyCompat(scalaVersion.value)
-    )
-    .nativeSettings(
-      scalaVersion := "2.13.4"
+      libraryDependencies += ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.2").cross(CrossVersion.for3Use2_13)
     )
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
@@ -4,8 +4,8 @@ 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-js"       % "sbt-scalajs"                   % "1.16.0")
+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/common-filtering/test b/sbt-locales/src/sbt-test/sbt-locales/common-filtering/test
@@ -1,3 +1,3 @@
 > managedSources
-$ exec cat jvm/target/scala-3.0.0-M3/src_managed/main/locales/cldr/data/data.scala
+$ exec cat jvm/target/scala-3.4.1/src_managed/main/locales/cldr/data/data.scala
 > compile
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,10 +7,10 @@ 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,
       calendarFilter := CalendarFilter.All,
-      libraryDependencies += "org.portable-scala" %%% "portable-scala-reflect" % "1.1.1"
+      libraryDependencies += "org.portable-scala" %%% "portable-scala-reflect" % "1.1.2"
     )
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")