Merge branch 'master' into 2.13.x

Author: lrytz

CODE_OF_CONDUCT.md

@@ -0,0 +1,7 @@
+all repositories in these organizations:
+
+* [scala](https://github.com/scala)
+* [scalacenter](https://github.com/scalacenter)
+* [lampepfl](https://github.com/lampepfl)
+
+are covered by the Scala Code of Conduct: https://scala-lang.org/conduct/

LICENSE

@@ -198,4 +198,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.

NOTICE

@@ -0,0 +1,14 @@
+scala-java8-compat
+Copyright (c) 2002-2019 EPFL
+Copyright (c) 2011-2019 Lightbend, Inc.
+
+scala-java8-compat includes software developed at
+LAMP/EPFL (https://lamp.epfl.ch/) and
+Lightbend, Inc. (https://www.lightbend.com/).
+
+Licensed under the Apache License, Version 2.0 (the "License").
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

README.md

@@ -268,7 +268,7 @@ Example of conversions from the Java type ways:
 
 ```scala
 import scala.concurrent.duration._
-import scala.compat.java8.DurationConverters
+import scala.compat.java8.DurationConverters._
 
 val javaDuration: java.time.Duration = 5.seconds.toJava
 val finiteDuration: FiniteDuration = javaDuration.toScala

build.sbt

@@ -52,7 +52,7 @@ lazy val root = (project in file(".")).
 
     libraryDependencies += "junit" % "junit" % "4.12" % "test",
 
-    libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.8.1" % "test",
+    libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.9" % "test",
 
     libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",