Nix definition and library updates

.envrc

@@ -0,0 +1,3 @@
+use flake
+layout node
+eval "$shellHook" 

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        scala: [2.11.12, 2.12.17, 2.13.10, 3.2.0]
+        scala: [2.11.12, 2.12.17, 2.13.10, 3.2.1]
         java: [temurin@8, temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
@@ -149,12 +149,12 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.2.0)
+      - name: Download target directories (3.2.1)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-3.2.0-${{ matrix.java }}
+          name: target-${{ matrix.os }}-3.2.1-${{ matrix.java }}
 
-      - name: Inflate target directories (3.2.0)
+      - name: Inflate target directories (3.2.1)
         run: |
           tar xf targets.tar
           rm targets.tar

.gitignore

@@ -9,3 +9,4 @@ target/
 .idea
 metals.sbt
 node_modules/
+.direnv/

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = "3.5.9"
+version = "3.6.1"
 style = default
 
 maxColumn = 100

build.sbt

@@ -2,12 +2,12 @@ import locales._
 import sbt.Keys._
 import sbtcrossproject.CrossPlugin.autoImport.{ CrossType, crossProject }
 
-lazy val cldrApiVersion = "3.1.0"
+lazy val cldrApiVersion = "4.0.0"
 
 Global / onChangedBuildSource := ReloadOnSourceChanges
 
 lazy val scalaVersion213 = "2.13.10"
-lazy val scalaVersion3   = "3.2.0"
+lazy val scalaVersion3   = "3.2.1"
 ThisBuild / scalaVersion       := scalaVersion213
 ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.17", scalaVersion213, scalaVersion3)
 

core/native/src/main/scala/locales/NormalizerImpl.scala

@@ -56,8 +56,8 @@ private object NormalizerImpl {
 @link("utf8proc")
 @extern
 private object utf8proc {
-  def utf8proc_NFD(str: CString): CString  = extern
-  def utf8proc_NFC(str: CString): CString  = extern
+  def utf8proc_NFD(str:  CString): CString = extern
+  def utf8proc_NFC(str:  CString): CString = extern
   def utf8proc_NFKD(str: CString): CString = extern
   def utf8proc_NFKC(str: CString): CString = extern
 }

core/shared/src/main/scala/java/text/NumberFormat.scala

@@ -32,7 +32,7 @@ abstract class NumberFormat protected () extends Format {
   // def parse(source: String, parsePosition: ParsePosition): Number
   // def parse(source: String): Number
 
-  def isParseIntegerOnly(): Boolean             = this.parseIntegerOnly
+  def isParseIntegerOnly(): Boolean = this.parseIntegerOnly
   def setParseIntegerOnly(value: Boolean): Unit = this.parseIntegerOnly = value
 
   def isGroupingUsed(): Boolean
@@ -53,7 +53,7 @@ abstract class NumberFormat protected () extends Format {
   def getCurrency(): Currency
   def setCurrency(currency: Currency): Unit
 
-  def getRoundingMode(): RoundingMode           = roundingMode
+  def getRoundingMode(): RoundingMode = roundingMode
   def setRoundingMode(mode: RoundingMode): Unit = this.roundingMode = mode
 }
 

flake.nix

@@ -0,0 +1,31 @@
+{
+  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 ];
+          packages = [
+            pkgs.nodePackages.vscode-langservers-extracted
+          ];
+          typelevelShell = {
+            nodejs.enable = true;
+            jdk.package = pkgs.jdk17;
+          };
+        };
+      }
+
+    );
+}