Skip to content

Commit 064d56a

Browse files
authored
Merge pull request #46 from sjrd/upgrades
Upgrades.
2 parents 12d1fa6 + e636669 commit 064d56a

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,18 @@ scala:
1111
- 2.11.12
1212
- 2.12.5
1313
- 2.13.0-M3
14+
- 2.13.0-M4
1415
jdk:
1516
- oraclejdk8
1617
env:
17-
- SCALAJS_VERSION=0.6.22
18+
- SCALAJS_VERSION=0.6.23
1819
- SCALAJS_VERSION=1.0.0-M3
1920
matrix:
2021
exclude:
2122
- scala: 2.10.7
2223
env: SCALAJS_VERSION=1.0.0-M3
24+
- scala: 2.13.0-M4
25+
env: SCALAJS_VERSION=1.0.0-M3
2326

2427
cache:
2528
directories:

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import sbtcrossproject.crossProject
22

3-
crossScalaVersions in ThisBuild := Seq("2.12.5", "2.11.12", "2.10.7", "2.13.0-M3")
3+
crossScalaVersions in ThisBuild := Seq("2.12.5", "2.11.12", "2.10.7", "2.13.0-M3", "2.13.0-M4")
44
scalaVersion in ThisBuild := (crossScalaVersions in ThisBuild).value.head
55

66
val commonSettings: Seq[Setting[_]] = Seq(

project/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
val scalaJSVersion =
2-
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.22")
2+
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.23")
33

44
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
55
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.3.0")

src/main/scala/java/time/LocalDate.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ object LocalDate {
379379

380380
private final val iso = IsoChronology.INSTANCE
381381

382-
private val daysBeforeYears = Stream.iterate(1970 -> 0) { case (year, day) =>
382+
private val daysBeforeYears = Iterator.iterate(1970 -> 0) { case (year, day) =>
383383
if (iso.isLeapYear(year)) (year + 1) -> (day + 366)
384384
else (year + 1) -> (day + 365)
385385
}.take(400).toVector

0 commit comments

Comments
 (0)