From 940ef393ce37280857be5cdea8732c8e642679f7 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 3 May 2018 11:06:44 +0200 Subject: [PATCH 1/5] drop 2.13 from the cross-build temporarily references #97 --- build.sbt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 4dbf529..8fc7179 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,9 @@ import ScalaModulePlugin._ scalaVersionsByJvm in ThisBuild := { - val versions = List("2.12.4", "2.11.12", "2.13.0-M3").map(_ -> true) + // no 2.13 for now in cross-build because of + // https://github.com/scala/scala-java8-compat/issues/97 + val versions = List("2.12.4", "2.11.12").map(_ -> true) Map(8 -> versions, 9 -> versions, 10 -> versions) } From 96becf38e8c75e25509f9a11ac4f79bef402061c Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 3 May 2018 11:10:28 +0200 Subject: [PATCH 2/5] bump version number --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 8fc7179..725b9f2 100644 --- a/build.sbt +++ b/build.sbt @@ -26,7 +26,7 @@ def osgiExport(scalaVersion: String, version: String) = { lazy val commonSettings = Seq( organization := "org.scala-lang.modules", - version := "0.9.0-SNAPSHOT", + version := "0.9.1-SNAPSHOT", scalacOptions ++= Seq("-feature", "-deprecation", "-unchecked") ) From 7e4c4bb7e26e699ffa3e0440e4d80845628e7eb9 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 3 May 2018 11:12:31 +0200 Subject: [PATCH 3/5] drop broken Travis-CI badge from readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index acd7d53..4f89b6d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## scala-java8-compat [](https://travis-ci.org/scala/scala-java8-compat) [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-java8-compat_2.11) [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-java8-compat_2.12) +## scala-java8-compat [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-java8-compat_2.11) [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-java8-compat_2.12) A Java 8 compatibility kit for Scala. From 84edd3ce2bd0b37ef84dfd58488a64f2d37c097f Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 3 May 2018 11:25:29 +0200 Subject: [PATCH 4/5] add myself to Travis-CI notifications --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1baf295..2ca42a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,3 +15,4 @@ jdk: notifications: email: - jason.zaugg@lightbend.com + - seth.tisue@lightbend.com From 36974288f63da33d401cbb853acb18f1ba8956c8 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 3 May 2018 11:26:34 +0200 Subject: [PATCH 5/5] fix doc syntax --- src/main/scala/scala/compat/java8/DurationConverters.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/scala/compat/java8/DurationConverters.scala b/src/main/scala/scala/compat/java8/DurationConverters.scala index 8cdd688..27f3c46 100644 --- a/src/main/scala/scala/compat/java8/DurationConverters.scala +++ b/src/main/scala/scala/compat/java8/DurationConverters.scala @@ -64,14 +64,14 @@ object DurationConverters { implicit final class DurationOps(val duration: java.time.Duration) extends AnyVal { /** - * See [[DurationConverters.toScala]] + * See [[DurationConverters#toScala]] */ def toScala: scala.concurrent.duration.FiniteDuration = DurationConverters.toScala(duration) } implicit final class FiniteDurationops(val duration: scala.concurrent.duration.FiniteDuration) extends AnyVal { /** - * See [[DurationConverters.toJava]] + * See [[DurationConverters#toJava]] */ def toJava: java.time.Duration = DurationConverters.toJava(duration) }