Skip to content

Commit a743b4a

Browse files
authored
Merge pull request #277 from cquiroz/scala3
Support scala3
2 parents 59ece8b + b5a7c84 commit a743b4a

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

.github/workflows/ci.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
matrix:
2525
os: [ubuntu-latest]
26-
scala: [2.11.12, 2.12.12, 2.13.3, 3.0.0-RC2, 3.0.0-RC3]
26+
scala: [2.11.12, 2.12.12, 2.13.3, 3.0.0-RC3, 3.0.0]
2727
2828
runs-on: ${{ matrix.os }}
2929
steps:
@@ -127,22 +127,22 @@ jobs:
127127
tar xf targets.tar
128128
rm targets.tar
129129
130-
- name: Download target directories (3.0.0-RC2)
130+
- name: Download target directories (3.0.0-RC3)
131131
uses: actions/download-artifact@v2
132132
with:
133-
name: target-${{ matrix.os }}-3.0.0-RC2-${{ matrix.java }}
133+
name: target-${{ matrix.os }}-3.0.0-RC3-${{ matrix.java }}
134134

135-
- name: Inflate target directories (3.0.0-RC2)
135+
- name: Inflate target directories (3.0.0-RC3)
136136
run: |
137137
tar xf targets.tar
138138
rm targets.tar
139139
140-
- name: Download target directories (3.0.0-RC3)
140+
- name: Download target directories (3.0.0)
141141
uses: actions/download-artifact@v2
142142
with:
143-
name: target-${{ matrix.os }}-3.0.0-RC3-${{ matrix.java }}
143+
name: target-${{ matrix.os }}-3.0.0-${{ matrix.java }}
144144

145-
- name: Inflate target directories (3.0.0-RC3)
145+
- name: Inflate target directories (3.0.0)
146146
run: |
147147
tar xf targets.tar
148148
rm targets.tar

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
Simply add the following line to your sbt settings:
1313

1414
```scala
15-
libraryDependencies += "io.github.cquiroz" %%% "scala-java-locales" % "1.1.3"
15+
libraryDependencies += "io.github.cquiroz" %%% "scala-java-locales" % "1.2.0"
1616
```
1717

1818
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:
2121
lazy val myCross = crossProject.
2222
...
2323
.jsSettings(
24-
libraryDependencies += "io.github.cquiroz" %%% "scala-java-locales" % "1.1.3"
24+
libraryDependencies += "io.github.cquiroz" %%% "scala-java-locales" % "1.2.0"
2525
)
2626
```
2727

@@ -47,7 +47,7 @@ size benefit and a larger speed improvement doing so as scala.js has less code t
4747
For the common cases that you just need date formatting in angling you can just include
4848

4949
```scala
50-
libraryDependencies += "io.github.cquiroz" %%% "locales-minimal-en-db" % "1.1.3"
50+
libraryDependencies += "io.github.cquiroz" %%% "locales-minimal-en-db" % "1.2.0"
5151
```
5252

5353
## Default Locale

build.sbt

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import sbtcrossproject.CrossPlugin.autoImport.{ CrossType, crossProject }
22
import sbt.Keys._
33
import locales._
44

5-
lazy val cldrApiVersion = "2.5.0"
5+
lazy val cldrApiVersion = "2.7.0"
66

77
Global / onChangedBuildSource := ReloadOnSourceChanges
88

99
resolvers in Global += Resolver.sonatypeRepo("public")
1010

1111
ThisBuild / scalaVersion := "2.13.3"
12-
ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.12", "2.13.3", "3.0.0-RC2", "3.0.0-RC3")
12+
ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.12", "2.13.3", "3.0.0-RC3", "3.0.0")
1313

1414
ThisBuild / githubWorkflowTargetTags ++= Seq("v*")
1515
ThisBuild / githubWorkflowPublishTargetBranches +=
@@ -167,7 +167,7 @@ lazy val localesFullCurrenciesDb = project
167167
supportNumberFormats := true,
168168
supportISOCodes := true,
169169
libraryDependencies += ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.1")
170-
.withDottyCompat(scalaVersion.value)
170+
.cross(CrossVersion.for3Use2_13)
171171
)
172172

173173
lazy val localesFullDb = project
@@ -186,7 +186,7 @@ lazy val localesFullDb = project
186186
supportNumberFormats := true,
187187
supportISOCodes := true,
188188
libraryDependencies += ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.1")
189-
.withDottyCompat(scalaVersion.value)
189+
.cross(CrossVersion.for3Use2_13)
190190
)
191191

192192
lazy val localesMinimalEnDb = project
@@ -205,7 +205,7 @@ lazy val localesMinimalEnDb = project
205205
supportNumberFormats := true,
206206
supportISOCodes := false,
207207
libraryDependencies += ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.1")
208-
.withDottyCompat(scalaVersion.value)
208+
.cross(CrossVersion.for3Use2_13)
209209
)
210210

211211
lazy val testSuite = crossProject(JVMPlatform, JSPlatform)
@@ -216,7 +216,7 @@ lazy val testSuite = crossProject(JVMPlatform, JSPlatform)
216216
publishLocal := {},
217217
publishArtifact := false,
218218
name := "scala-java-locales test",
219-
libraryDependencies += "org.scalameta" %%% "munit" % "0.7.25" % Test,
219+
libraryDependencies += "org.scalameta" %%% "munit" % "0.7.26" % Test,
220220
testFrameworks += new TestFramework("munit.Framework"),
221221
scalacOptions ~= (_.filterNot(
222222
Set(

0 commit comments

Comments
 (0)