From f5cc19cb986aab99e8d2a0ab09bb7aa07fad74f6 Mon Sep 17 00:00:00 2001
From: adamw <adam@warski.org>
Date: Wed, 12 Jun 2019 12:35:56 +0200
Subject: [PATCH] Fix 2.13 compilation, travis

---
 .travis.yml                                                     | 2 +-
 .../softwaremill/macwire/akkasupport/AfterAllTerminate.scala    | 2 +-
 .../macwire/implicits/ImplicitAndUsageInObject.scala            | 2 +-
 .../macwire/implicits/ImplicitFromParentUsageInObject.scala     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b9747b78..c66754d5 100644
--- 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
index f335a399..c1ae9931 100644
--- 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
index 18f1ce36..5bc2d46c 100644
--- 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/tests2/src/test/scala/com/softwaremill/macwire/implicits/ImplicitFromParentUsageInObject.scala b/tests2/src/test/scala/com/softwaremill/macwire/implicits/ImplicitFromParentUsageInObject.scala
index b9be7470..ff41937f 100644
--- a/tests2/src/test/scala/com/softwaremill/macwire/implicits/ImplicitFromParentUsageInObject.scala
+++ b/tests2/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