Skip to content

Commit

Permalink
Merge pull request #277 from cquiroz/scala3
Browse files Browse the repository at this point in the history
Support scala3
  • Loading branch information
cquiroz authored May 15, 2021
2 parents 59ece8b + b5a7c84 commit a743b4a
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"
)
```

Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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 +=
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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)
Expand All @@ -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(
Expand Down

0 comments on commit a743b4a

Please sign in to comment.