Skip to content

Commit

Permalink
Merge pull request #2784 from ennru/ennru-headers-n-plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
ennru authored Nov 25, 2021
2 parents b6f29e4 + 34fc287 commit 8142eb3
Show file tree
Hide file tree
Showing 37 changed files with 39 additions and 38 deletions.
1 change: 1 addition & 0 deletions .github/autolabeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ dependency-change: "/project/Dependencies.scala"
'p:ftp': ["/ftp"]
'p:geode': ["/geode"]
'p:google-cloud-bigquery': ["/google-cloud-bigquery"]
'p:google-cloud-bigquery-storage': ["/google-cloud-bigquery-storage"]
'p:google-cloud-pub-sub': ["/google-cloud-pub-sub"]
'p:google-cloud-pub-sub-grpc': ["/google-cloud-pub-sub-grpc"]
'p:google-cloud-storage': ["/google-cloud-storage"]
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ lazy val googleCloudBigQueryStorage = alpakkaProject(
akkaGrpcCodeGeneratorSettings ~= { _.filterNot(_ == "flat_package") },
akkaGrpcCodeGeneratorSettings += "server_power_apis",
akkaGrpcGeneratedSources := Seq(AkkaGrpc.Client),
akkaGrpcGeneratedSources in Test := Seq(AkkaGrpc.Server),
Test / akkaGrpcGeneratedSources := Seq(AkkaGrpc.Server),
akkaGrpcGeneratedLanguages := Seq(AkkaGrpc.Scala, AkkaGrpc.Java),
Compile / scalacOptions ++= Seq(
"-P:silencer:pathFilters=akka-grpc/main",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.impl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.impl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.impl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.impl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.impl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.javadsl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.javadsl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.javadsl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.scaladsl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.scaladsl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.scaladsl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.scaladsl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.scaladsl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.javadsl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.javadsl;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package docs.javadsl;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.mock
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.mock
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.scaladsl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.scaladsl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.scaladsl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.scaladsl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.googlecloud.bigquery.storage.scaladsl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package docs.scaladsl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package docs.javadsl;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.huawei.pushkit
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.huawei.pushkit.impl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package akka.stream.alpakka.huawei.pushkit.impl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2020 Lightbend Inc. <https://www.lightbend.com>
* Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>
*/

package docs.scaladsl
Expand Down
4 changes: 2 additions & 2 deletions project/Common.scala
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ object Common extends AutoPlugin {
// This should not impact the total test time as we don't expect to hit this
// timeout.
Test / testOptions += Tests.Argument(TestFrameworks.ScalaTest, "-F", "4"),
scalafmtOnCompile := insideCI.value,
javafmtOnCompile := insideCI.value,
scalafmtOnCompile := false,
javafmtOnCompile := false,
headerLicense := Some(
HeaderLicense.Custom("Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>")
),
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1")
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.5.1")
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0")
// docs
addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.39")
addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.40")
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-dependencies" % "0.2.1")
addSbtPlugin("com.lightbend.sbt" % "sbt-publish-rsync" % "0.2")
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3")
Expand Down

0 comments on commit 8142eb3

Please sign in to comment.