From 8b422e566ae20c695d79b3d8faa02b3f71eb2a98 Mon Sep 17 00:00:00 2001 From: Carlos Quiroz Date: Fri, 14 May 2021 21:47:00 -0400 Subject: [PATCH 1/2] Support scala3 Signed-off-by: Carlos Quiroz --- .github/workflows/ci.yml | 14 +++++++------- build.sbt | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32832f88..1176a81a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.11.12, 2.12.12, 2.13.3, 3.0.0-RC2, 3.0.0-RC3] + scala: [2.11.12, 2.12.12, 2.13.3, 3.0.0-RC3, 3.0.0] java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: @@ -127,22 +127,22 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (3.0.0-RC2) + - name: Download target directories (3.0.0-RC3) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-3.0.0-RC2-${{ matrix.java }} + name: target-${{ matrix.os }}-3.0.0-RC3-${{ matrix.java }} - - name: Inflate target directories (3.0.0-RC2) + - name: Inflate target directories (3.0.0-RC3) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.0.0-RC3) + - name: Download target directories (3.0.0) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-3.0.0-RC3-${{ matrix.java }} + name: target-${{ matrix.os }}-3.0.0-${{ matrix.java }} - - name: Inflate target directories (3.0.0-RC3) + - name: Inflate target directories (3.0.0) run: | tar xf targets.tar rm targets.tar diff --git a/build.sbt b/build.sbt index 58be6a7a..5a7e93cb 100644 --- a/build.sbt +++ b/build.sbt @@ -2,14 +2,14 @@ import sbtcrossproject.CrossPlugin.autoImport.{ CrossType, crossProject } import sbt.Keys._ import locales._ -lazy val cldrApiVersion = "2.5.0" +lazy val cldrApiVersion = "2.7.0" Global / onChangedBuildSource := ReloadOnSourceChanges resolvers in Global += Resolver.sonatypeRepo("public") ThisBuild / scalaVersion := "2.13.3" -ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.12", "2.13.3", "3.0.0-RC2", "3.0.0-RC3") +ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.12", "2.13.3", "3.0.0-RC3", "3.0.0") ThisBuild / githubWorkflowTargetTags ++= Seq("v*") ThisBuild / githubWorkflowPublishTargetBranches += @@ -167,7 +167,7 @@ lazy val localesFullCurrenciesDb = project supportNumberFormats := true, supportISOCodes := true, libraryDependencies += ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.1") - .withDottyCompat(scalaVersion.value) + .cross(CrossVersion.for3Use2_13) ) lazy val localesFullDb = project @@ -186,7 +186,7 @@ lazy val localesFullDb = project supportNumberFormats := true, supportISOCodes := true, libraryDependencies += ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.1") - .withDottyCompat(scalaVersion.value) + .cross(CrossVersion.for3Use2_13) ) lazy val localesMinimalEnDb = project @@ -205,7 +205,7 @@ lazy val localesMinimalEnDb = project supportNumberFormats := true, supportISOCodes := false, libraryDependencies += ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.1") - .withDottyCompat(scalaVersion.value) + .cross(CrossVersion.for3Use2_13) ) lazy val testSuite = crossProject(JVMPlatform, JSPlatform) @@ -216,7 +216,7 @@ lazy val testSuite = crossProject(JVMPlatform, JSPlatform) publishLocal := {}, publishArtifact := false, name := "scala-java-locales test", - libraryDependencies += "org.scalameta" %%% "munit" % "0.7.25" % Test, + libraryDependencies += "org.scalameta" %%% "munit" % "0.7.26" % Test, testFrameworks += new TestFramework("munit.Framework"), scalacOptions ~= (_.filterNot( Set( From b5a7c84698a9fdfdcf9029d4b34e8b2e6fbf4816 Mon Sep 17 00:00:00 2001 From: Carlos Quiroz Date: Fri, 14 May 2021 21:57:12 -0400 Subject: [PATCH 2/2] Update version in readme Signed-off-by: Carlos Quiroz --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 65a4f8e7..2d683f31 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Simply add the following line to your sbt settings: ```scala -libraryDependencies += "io.github.cquiroz" %%% "scala-java-locales" % "1.1.3" +libraryDependencies += "io.github.cquiroz" %%% "scala-java-locales" % "1.2.0" ``` If you have a `crossProject`, the setting must be used only in the JS part: @@ -21,7 +21,7 @@ If you have a `crossProject`, the setting must be used only in the JS part: lazy val myCross = crossProject. ... .jsSettings( - libraryDependencies += "io.github.cquiroz" %%% "scala-java-locales" % "1.1.3" + libraryDependencies += "io.github.cquiroz" %%% "scala-java-locales" % "1.2.0" ) ``` @@ -47,7 +47,7 @@ size benefit and a larger speed improvement doing so as scala.js has less code t For the common cases that you just need date formatting in angling you can just include ```scala -libraryDependencies += "io.github.cquiroz" %%% "locales-minimal-en-db" % "1.1.3" +libraryDependencies += "io.github.cquiroz" %%% "locales-minimal-en-db" % "1.2.0" ``` ## Default Locale