raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Update headers for jdk9 related code. (#26236)

Browse source
This commit is contained in:
kerr 2019-01-15 20:35:53 +08:00 • committed by Johan Andrén
parent 36ade9685c
commit 75cb436ce7
11 changed files with 47 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-stream-tests-tck/src/test/scala-jdk9-only/akka/stream/tck/IterablePublisherViaJavaFlowPublisherTest.scala
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2018 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) 2017-2019 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.stream.tck

2
akka-stream-tests/src/test/java-jdk9-only/akka/stream/javadsl/JavaFlowSupportCompileTest.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2018 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) 2017-2019 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.stream.javadsl;

4
akka-stream-tests/src/test/scala-jdk9-only/akka/stream/scaladsl/FlowPublisherSinkSpec.scala
View file

@ -1,5 +1,5 @@
/**
* Copyright (C) 2014-2018 Lightbend Inc. <https://www.lightbend.com>
/*
* Copyright (C) 2014-2019 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.stream.scaladsl

2
akka-stream/src/main/java-jdk-9/akka/stream/javadsl/JavaFlowSupport.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2018 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) 2017-2019 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.stream.javadsl;

2
akka-stream/src/main/scala-jdk-9/akka/stream/impl/JavaFlowAndRsConverters.scala
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2018 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) 2017-2019 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.stream.impl

2
akka-stream/src/main/scala-jdk-9/akka/stream/scaladsl/JavaFlowSupport.scala
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2017-2018 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) 2017-2019 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.stream.scaladsl

2
project/CopyrightHeader.scala
View file

@ -15,7 +15,7 @@ trait CopyrightHeader extends AutoPlugin {
override def requires:Plugins = HeaderPlugin
override def trigger = allRequirements
override def trigger: PluginTrigger = allRequirements
protected def headerMappingSettings: Seq[Def.Setting[_]] =
Seq(Compile, Test, MultiJvm).flatMap { config =>

3
project/CopyrightHeaderForBoilerplate.scala
View file

@ -2,7 +2,8 @@
* Copyright (C) 2019 Lightbend Inc. <https://www.lightbend.com>
*/
import akka.CopyrightHeader
package akka
import de.heikoseeberger.sbtheader.HeaderPlugin
import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
import sbt.Keys.sourceDirectory

28
project/CopyrightHeaderForJdk9.scala Normal file
View file

@ -0,0 +1,28 @@
/*
* Copyright (C) 2019 Lightbend Inc. <https://www.lightbend.com>
*/
package akka
import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport.headerSources
import sbt.Keys.sourceDirectory
import sbt.{Compile, Def, Test, _}
object CopyrightHeaderForJdk9 extends CopyrightHeader {
override protected def headerMappingSettings: Seq[Def.Setting[_]] = {
super.headerMappingSettings
import Jdk9._
Seq(
headerSources in Compile ++=
(((sourceDirectory in Compile).value / SCALA_SOURCE_DIRECTORY) ** "*.scala").get,
headerSources in Test ++=
(((sourceDirectory in Test).value / SCALA_TEST_SOURCE_DIRECTORY) ** "*.scala").get,
headerSources in Compile ++=
(((sourceDirectory in Compile).value / JAVA_SOURCE_DIRECTORY) ** "*.java").get,
headerSources in Test ++=
(((sourceDirectory in Test).value / JAVA_TEST_SOURCE_DIRECTORY) ** "*.java").get,
)
}
}

3
project/CopyrightHeaderForProtobuf.scala
View file

@ -2,7 +2,8 @@
* Copyright (C) 2019 Lightbend Inc. <https://www.lightbend.com>
*/
import akka.CopyrightHeader
package akka
import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport.{HeaderFileType, headerMappings, headerSources}
import sbt.Keys.sourceDirectory
import sbt.{Compile, Def, Test, inConfig, _}

9
project/Jdk9.scala
View file

@ -20,11 +20,16 @@ object Jdk9 extends AutoPlugin {
if (System.getProperty("java.version").startsWith("1.")) Seq()
else values
val SCALA_SOURCE_DIRECTORY = "scala-jdk-9"
val SCALA_TEST_SOURCE_DIRECTORY = "scala-jdk9-only"
val JAVA_SOURCE_DIRECTORY = "java-jdk-9"
val JAVA_TEST_SOURCE_DIRECTORY = "java-jdk9-only"
val compileJdk9Settings = Seq(
// following the scala-2.12, scala-sbt-1.0, ... convention
unmanagedSourceDirectories := notOnJdk8(notOnScala211(scalaBinaryVersion.value, Seq(
(Compile / sourceDirectory).value / "scala-jdk-9",
(Compile / sourceDirectory).value / "java-jdk-9"
(Compile / sourceDirectory).value / SCALA_SOURCE_DIRECTORY,
(Compile / sourceDirectory).value / JAVA_SOURCE_DIRECTORY
))),
scalacOptions := AkkaBuild.DefaultScalacOptions ++ notOnJdk8(notOnScala211(scalaBinaryVersion.value, Seq("-release", "9"))),
javacOptions := AkkaBuild.DefaultJavacOptions ++ notOnJdk8(notOnScala211(scalaBinaryVersion.value, Seq("--release", "9")))