Skip to content

Commit bf274f2

Browse files
authored
Merge pull request #86 from cquiroz/cldr-update
Update scala-java-locales
2 parents 9fc5b0f + f5e98bc commit bf274f2

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ scala:
1717
- 2.10.7
1818
- 2.11.12
1919
- 2.12.7
20-
- 2.13.0-M4
20+
- 2.13.0-M5
2121

2222
before_install:
2323
- export PATH=${PATH}:./vendor/bundle
@@ -48,7 +48,7 @@ cache:
4848
script:
4949
- sudo chmod +x /usr/local/bin/sbt
5050
- sbt ++$TRAVIS_SCALA_VERSION -J-Xmx4G clean scalajavatimeJVM/compile scalajavatimeTestsJVM/compile
51-
- if [[ $TRAVIS_SCALA_VERSION != "2.13.0-M4" ]]; then sbt ++$TRAVIS_SCALA_VERSION -J-Xmx4G clean scalajavatimeTestsJVM/test scalajavatimeTestsJS/test scalajavatimeJVM/publishLocal scalajavatimeJS/publishLocal scalajavatimeTZDBJVM/publishLocal scalajavatimeTZDBJS/publishLocal; fi;
51+
- if [[ $TRAVIS_SCALA_VERSION != "2.13.0-M5" ]]; then sbt ++$TRAVIS_SCALA_VERSION -J-Xmx4G clean scalajavatimeTestsJVM/test scalajavatimeTestsJS/test scalajavatimeJVM/publishLocal scalajavatimeJS/publishLocal scalajavatimeTZDBJVM/publishLocal scalajavatimeTZDBJS/publishLocal; fi;
5252
# docs/makeMicrosite
5353
# Tricks to avoid unnecessary cache updates, from
5454
# http://www.scala-sbt.org/0.13/docs/Travis-CI-with-sbt.html

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ lazy val commonSettings = Seq(
2121
scalaVersion := scalaVer,
2222
crossScalaVersions := {
2323
if (scalaJSVersion.startsWith("0.6")) {
24-
Seq("2.10.7", "2.11.12", "2.12.7", "2.13.0-M4")
24+
Seq("2.10.7", "2.11.12", "2.12.7", "2.13.0-M5")
2525
} else {
26-
Seq("2.11.12", "2.12.7", "2.13.0-M4")
26+
Seq("2.11.12", "2.12.7", "2.13.0-M5")
2727
}
2828
},
2929
scalacOptions ++= Seq(
@@ -148,7 +148,7 @@ lazy val scalajavatime = crossProject(JVMPlatform, JSPlatform)
148148
copyAndReplace(srcDirs, destinationDir)
149149
}.taskValue,
150150
libraryDependencies ++= Seq(
151-
"io.github.cquiroz" %%% "scala-java-locales" % "0.3.11-cldr33"
151+
"io.github.cquiroz" %%% "scala-java-locales" % "0.3.12-cldr34"
152152
)
153153
)
154154

changes.xml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,19 @@
1111
<!-- types are add, fix, remove, update -->
1212
<release version="2.0.0-RC1" date="" description="v2.0.0-RC1">
1313
<action dev="cquiroz" type="update" >
14-
Revode DateTimeUtils
14+
Support scala.js 1.0.0-M6
15+
</action>
16+
<action dev="cquiroz" type="update" >
17+
Support scala 2.13.0-M6
18+
</action>
19+
<action dev="cquiroz" type="update" >
20+
Update scala-java-locales to v0.3.12-cldr34
21+
</action>
22+
<action dev="cquiroz" type="update" >
23+
Remove DateTimeUtils
24+
</action>
25+
<action dev="cquiroz" type="fix" >
26+
Support tzdb 2018f
1527
</action>
1628
<action dev="cquiroz" type="update" >
1729
Internal refactorings to reduce size

0 commit comments

Comments
 (0)