diff --git a/akka-actor/src/main/scala-2.11/akka/compat/Future.scala b/akka-actor/src/main/scala-2.11/akka/compat/Future.scala index 07b4650b2c..bf39c0c087 100644 --- a/akka-actor/src/main/scala-2.11/akka/compat/Future.scala +++ b/akka-actor/src/main/scala-2.11/akka/compat/Future.scala @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2009-2018 Lightbend Inc. */ diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 0866bc9fc9..822fa9e3af 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -98,7 +98,8 @@ object AkkaBuild { // invocation of 'ByteBuffer.clear()' in EnvelopeBuffer.class with 'javap -c': it should refer to // "java/nio/ByteBuffer.clear:()Ljava/nio/Buffer" and not "java/nio/ByteBuffer.clear:()Ljava/nio/ByteBuffer": scalacOptions in Compile ++= ( - if (System.getProperty("java.version").startsWith("1.")) Seq() + if (System.getProperty("java.version").startsWith("1.")) + Seq("-target:jvm-1.8") else if (scalaBinaryVersion.value == "2.11") Seq("-target:jvm-1.8", "-javabootclasspath", CrossJava.Keys.fullJavaHomes.value("8") + "/jre/lib/rt.jar")