Skip to content

preparing for 0.9.0 release #102

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.

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 5 commits into from
May 3, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ jdk:
notifications:
email:
- [email protected]
- [email protected]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## 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)
## 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)

A Java 8 compatibility kit for Scala.

Expand Down
6 changes: 4 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -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)
}

Expand All @@ -24,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")
)

Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/scala/compat/java8/DurationConverters.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down