Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to scala 3.0.0-RC1 #253

Merged
merged 1 commit into from
Feb 19, 2021
Merged

Update to scala 3.0.0-RC1 #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
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-M2, 3.0.0-M3]
scala: [2.11.12, 2.12.12, 2.13.3, 3.0.0-M3, 3.0.0-RC1]
java: [adopt@1.8]
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-M2)
- name: Download target directories (3.0.0-M3)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-3.0.0-M2-${{ matrix.java }}
name: target-${{ matrix.os }}-3.0.0-M3-${{ matrix.java }}

- name: Inflate target directories (3.0.0-M2)
- name: Inflate target directories (3.0.0-M3)
run: |
tar xf targets.tar
rm targets.tar

- name: Download target directories (3.0.0-M3)
- name: Download target directories (3.0.0-RC1)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-3.0.0-M3-${{ matrix.java }}
name: target-${{ matrix.os }}-3.0.0-RC1-${{ matrix.java }}

- name: Inflate target directories (3.0.0-M3)
- name: Inflate target directories (3.0.0-RC1)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
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.0"
libraryDependencies += "io.github.cquiroz" %%% "scala-java-locales" % "1.1.1"
```

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.0"
libraryDependencies += "io.github.cquiroz" %%% "scala-java-locales" % "1.1.1"
)
```

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.0"
libraryDependencies += "io.github.cquiroz" %%% "locales-minimal-en-db" % "1.1.1"
```

## Default Locale
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
View file
Open in desktop
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.0.1"
lazy val cldrApiVersion = "2.2.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-M2", "3.0.0-M3")
ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.12", "2.13.3", "3.0.0-M3", "3.0.0-RC1")

ThisBuild / githubWorkflowTargetTags ++= Seq("v*")
ThisBuild / githubWorkflowPublishTargetBranches +=
Expand Down Expand Up @@ -218,7 +218,7 @@ lazy val testSuite = crossProject(JVMPlatform, JSPlatform)
publishLocal := {},
publishArtifact := false,
name := "scala-java-locales test",
libraryDependencies += "org.scalameta" %%% "munit" % "0.7.21" % Test,
libraryDependencies += "org.scalameta" %%% "munit" % "0.7.22" % Test,
testFrameworks += new TestFramework("munit.Framework"),
scalacOptions ~= (_.filterNot(
Set(
Expand Down