Skip to content

Commit 057f1e3

Browse files
authored
Merge pull request #102 from SethTisue/prepare-0.9.0
preparing for 0.9.0 release
2 parents c44f93a + 3697428 commit 057f1e3

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ jdk:
1515
notifications:
1616
email:
1717
18+

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## scala-java8-compat [<img src="https://img.shields.io/travis/scala/scala-java8-compat.svg"/>](https://travis-ci.org/scala/scala-java8-compat) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-java8-compat_2.11.svg?label=latest%20release%20for%202.11"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-java8-compat_2.11) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-java8-compat_2.12.svg?label=latest%20release%20for%202.12"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-java8-compat_2.12)
1+
## scala-java8-compat [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-java8-compat_2.11.svg?label=latest%20release%20for%202.11"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-java8-compat_2.11) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-java8-compat_2.12.svg?label=latest%20release%20for%202.12"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-java8-compat_2.12)
22

33
A Java 8 compatibility kit for Scala.
44

build.sbt

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import ScalaModulePlugin._
22

33
scalaVersionsByJvm in ThisBuild := {
4-
val versions = List("2.12.4", "2.11.12", "2.13.0-M3").map(_ -> true)
4+
// no 2.13 for now in cross-build because of
5+
// https://github.com/scala/scala-java8-compat/issues/97
6+
val versions = List("2.12.4", "2.11.12").map(_ -> true)
57
Map(8 -> versions, 9 -> versions, 10 -> versions)
68
}
79

@@ -24,7 +26,7 @@ def osgiExport(scalaVersion: String, version: String) = {
2426

2527
lazy val commonSettings = Seq(
2628
organization := "org.scala-lang.modules",
27-
version := "0.9.0-SNAPSHOT",
29+
version := "0.9.1-SNAPSHOT",
2830
scalacOptions ++= Seq("-feature", "-deprecation", "-unchecked")
2931
)
3032

src/main/scala/scala/compat/java8/DurationConverters.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ object DurationConverters {
6464

6565
implicit final class DurationOps(val duration: java.time.Duration) extends AnyVal {
6666
/**
67-
* See [[DurationConverters.toScala]]
67+
* See [[DurationConverters#toScala]]
6868
*/
6969
def toScala: scala.concurrent.duration.FiniteDuration = DurationConverters.toScala(duration)
7070
}
7171

7272
implicit final class FiniteDurationops(val duration: scala.concurrent.duration.FiniteDuration) extends AnyVal {
7373
/**
74-
* See [[DurationConverters.toJava]]
74+
* See [[DurationConverters#toJava]]
7575
*/
7676
def toJava: java.time.Duration = DurationConverters.toJava(duration)
7777
}

0 commit comments

Comments
 (0)