Skip to content

Update scala-java-locales #86

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

Merged
merged 1 commit into from
Oct 21, 2018
Merged

Update scala-java-locales #86

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
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ scala:
- 2.10.7
- 2.11.12
- 2.12.7
- 2.13.0-M4
- 2.13.0-M5

before_install:
- export PATH=${PATH}:./vendor/bundle
Expand Down Expand Up @@ -48,7 +48,7 @@ cache:
script:
- sudo chmod +x /usr/local/bin/sbt
- sbt ++$TRAVIS_SCALA_VERSION -J-Xmx4G clean scalajavatimeJVM/compile scalajavatimeTestsJVM/compile
- 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;
- 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;
# docs/makeMicrosite
# Tricks to avoid unnecessary cache updates, from
# http://www.scala-sbt.org/0.13/docs/Travis-CI-with-sbt.html
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 @@ -21,9 +21,9 @@ lazy val commonSettings = Seq(
scalaVersion := scalaVer,
crossScalaVersions := {
if (scalaJSVersion.startsWith("0.6")) {
Seq("2.10.7", "2.11.12", "2.12.7", "2.13.0-M4")
Seq("2.10.7", "2.11.12", "2.12.7", "2.13.0-M5")
} else {
Seq("2.11.12", "2.12.7", "2.13.0-M4")
Seq("2.11.12", "2.12.7", "2.13.0-M5")
}
},
scalacOptions ++= Seq(
Expand Down Expand Up @@ -148,7 +148,7 @@ lazy val scalajavatime = crossProject(JVMPlatform, JSPlatform)
copyAndReplace(srcDirs, destinationDir)
}.taskValue,
libraryDependencies ++= Seq(
"io.github.cquiroz" %%% "scala-java-locales" % "0.3.11-cldr33"
"io.github.cquiroz" %%% "scala-java-locales" % "0.3.12-cldr34"
)
)

Expand Down
14 changes: 13 additions & 1 deletion changes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,19 @@
<!-- types are add, fix, remove, update -->
<release version="2.0.0-RC1" date="" description="v2.0.0-RC1">
<action dev="cquiroz" type="update" >
Revode DateTimeUtils
Support scala.js 1.0.0-M6
</action>
<action dev="cquiroz" type="update" >
Support scala 2.13.0-M6
</action>
<action dev="cquiroz" type="update" >
Update scala-java-locales to v0.3.12-cldr34
</action>
<action dev="cquiroz" type="update" >
Remove DateTimeUtils
</action>
<action dev="cquiroz" type="fix" >
Support tzdb 2018f
</action>
<action dev="cquiroz" type="update" >
Internal refactorings to reduce size
Expand Down