Fix 2.13 compilation, travis

softwaremill · Jun 12, 2019 · f5cc19c · f5cc19c
1 parent e3c7dd5
commit f5cc19c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: scala
 jdk:
-  - oraclejdk8
+  - openjdk8
 scala:
    - 2.12.8
    - 2.13.0

diff --git a/macrosAkkaTests/src/test/scala/com/softwaremill/macwire/akkasupport/AfterAllTerminate.scala b/macrosAkkaTests/src/test/scala/com/softwaremill/macwire/akkasupport/AfterAllTerminate.scala
@@ -25,7 +25,7 @@ object AfterAllTerminate {
       contextClassLoader = Some(Thread.currentThread().getContextClassLoader)).newThread(new Runnable {
       override def run(): Unit = {
         val terminate = system.terminate()
-        Await.result(terminate, 10 seconds)
+        Await.result(terminate, 10.seconds)
       }
     })
   )

diff --git a/tests2/src/test/scala/com/softwaremill/macwire/implicits/ImplicitAndUsageInObject.scala b/tests2/src/test/scala/com/softwaremill/macwire/implicits/ImplicitAndUsageInObject.scala
@@ -5,7 +5,7 @@ import com.softwaremill.macwire._
 // For some reason this compiles when run as a compile-test, hence putting it in tests2.
 object ImplicitAndUsageInObject {
   case class B()
-  case class A(implicit val b: B)
+  case class A()(implicit val b: B)
 
   implicit val b = new B
   val a = wire[A]

diff --git a/...2/src/test/scala/com/softwaremill/macwire/implicits/ImplicitFromParentUsageInObject.scala b/...2/src/test/scala/com/softwaremill/macwire/implicits/ImplicitFromParentUsageInObject.scala
@@ -5,7 +5,7 @@ import com.softwaremill.macwire._
 // For some reason this compiles when run as a compile-test, hence putting it in tests2.
 object ImplicitFromParentUsageInObject {
   case class B()
-  case class A(implicit val b: B)
+  case class A()(implicit val b: B)
 
   trait Parent {
     implicit val b = new B