From 753ba23586c5bee4a0420baca3f25f425987d18e Mon Sep 17 00:00:00 2001 From: Juan Pedro Moreno Date: Mon, 8 Aug 2016 11:13:49 +0200 Subject: [PATCH] Enables sbt-headers plugin --- build.sbt | 3 +++ .../org/scalaexercises/evaluator/Decoders.scala | 5 +++++ .../evaluator/EvaluatorResponses.scala | 5 +++++ .../scalaexercises/evaluator/api/Evaluator.scala | 5 +++++ .../scalaexercises/evaluator/http/HttpClient.scala | 5 +++++ .../evaluator/http/HttpRequestBuilder.scala | 5 +++++ project/EvaluatorBuild.scala | 14 +++++++++++++- project/plugins.sbt | 1 + server/src/main/scala/auth.scala | 5 +++++ server/src/main/scala/codecs.scala | 5 +++++ server/src/main/scala/evaluation.scala | 2 +- server/src/main/scala/services.scala | 5 +++++ server/src/test/scala/EvalEndpointSpec.scala | 3 ++- server/src/test/scala/EvaluatorSpec.scala | 3 ++- .../scala/org/scalaexercises/evaluator/types.scala | 5 +++++ 15 files changed, 67 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 324faa65..ca1bc0f1 100644 --- a/build.sbt +++ b/build.sbt @@ -2,10 +2,12 @@ lazy val root = (project in file(".")) .aggregate(`evaluator-server`, `evaluator-shared`, `evaluator-client`) lazy val `evaluator-shared` = (project in file("shared")) + .enablePlugins(AutomateHeaderPlugin) .settings(name := "evaluator-shared") lazy val `evaluator-client` = (project in file("client")) .dependsOn(`evaluator-shared`) + .enablePlugins(AutomateHeaderPlugin) .settings( name := "evaluator-client", libraryDependencies <++= libraryVersions { v => Seq( @@ -25,6 +27,7 @@ lazy val `evaluator-client` = (project in file("client")) lazy val `evaluator-server` = (project in file("server")) .dependsOn(`evaluator-shared`) .enablePlugins(JavaAppPackaging) + .enablePlugins(AutomateHeaderPlugin) .settings( name := "evaluator-server", libraryDependencies <++= libraryVersions { v => Seq( diff --git a/client/src/main/scala/org/scalaexercises/evaluator/Decoders.scala b/client/src/main/scala/org/scalaexercises/evaluator/Decoders.scala index fdfeff1e..d594d443 100644 --- a/client/src/main/scala/org/scalaexercises/evaluator/Decoders.scala +++ b/client/src/main/scala/org/scalaexercises/evaluator/Decoders.scala @@ -1,3 +1,8 @@ +/* + * scala-exercises-evaluator-client + * Copyright (C) 2015-2016 47 Degrees, LLC. + */ + package org.scalaexercises.evaluator import io.circe._, io.circe.jawn._, io.circe.syntax._ diff --git a/client/src/main/scala/org/scalaexercises/evaluator/EvaluatorResponses.scala b/client/src/main/scala/org/scalaexercises/evaluator/EvaluatorResponses.scala index 69808ff7..0fd79bc1 100644 --- a/client/src/main/scala/org/scalaexercises/evaluator/EvaluatorResponses.scala +++ b/client/src/main/scala/org/scalaexercises/evaluator/EvaluatorResponses.scala @@ -1,3 +1,8 @@ +/* + * scala-exercises-evaluator-client + * Copyright (C) 2015-2016 47 Degrees, LLC. + */ + package org.scalaexercises.evaluator import cats.data.Xor diff --git a/client/src/main/scala/org/scalaexercises/evaluator/api/Evaluator.scala b/client/src/main/scala/org/scalaexercises/evaluator/api/Evaluator.scala index 141502c3..e49dc5e8 100644 --- a/client/src/main/scala/org/scalaexercises/evaluator/api/Evaluator.scala +++ b/client/src/main/scala/org/scalaexercises/evaluator/api/Evaluator.scala @@ -1,3 +1,8 @@ +/* + * scala-exercises-evaluator-client + * Copyright (C) 2015-2016 47 Degrees, LLC. + */ + package org.scalaexercises.evaluator.api import org.scalaexercises.evaluator.EvaluatorResponses.EvaluationResponse diff --git a/client/src/main/scala/org/scalaexercises/evaluator/http/HttpClient.scala b/client/src/main/scala/org/scalaexercises/evaluator/http/HttpClient.scala index c8be8057..62e3a44e 100644 --- a/client/src/main/scala/org/scalaexercises/evaluator/http/HttpClient.scala +++ b/client/src/main/scala/org/scalaexercises/evaluator/http/HttpClient.scala @@ -1,3 +1,8 @@ +/* + * scala-exercises-evaluator-client + * Copyright (C) 2015-2016 47 Degrees, LLC. + */ + package org.scalaexercises.evaluator.http import io.circe.Decoder diff --git a/client/src/main/scala/org/scalaexercises/evaluator/http/HttpRequestBuilder.scala b/client/src/main/scala/org/scalaexercises/evaluator/http/HttpRequestBuilder.scala index 75f103eb..46e84671 100644 --- a/client/src/main/scala/org/scalaexercises/evaluator/http/HttpRequestBuilder.scala +++ b/client/src/main/scala/org/scalaexercises/evaluator/http/HttpRequestBuilder.scala @@ -1,3 +1,8 @@ +/* + * scala-exercises-evaluator-client + * Copyright (C) 2015-2016 47 Degrees, LLC. + */ + package org.scalaexercises.evaluator.http import org.scalaexercises.evaluator.http.HttpClient._ diff --git a/project/EvaluatorBuild.scala b/project/EvaluatorBuild.scala index 9063b427..983f0e1b 100644 --- a/project/EvaluatorBuild.scala +++ b/project/EvaluatorBuild.scala @@ -1,11 +1,13 @@ import org.scalafmt.sbt.ScalaFmtPlugin import org.scalafmt.sbt.ScalaFmtPlugin.autoImport._ +import de.heikoseeberger.sbtheader.{HeaderPattern, HeaderPlugin} +import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._ import sbt.Keys._ import sbt._ object EvaluatorBuild extends AutoPlugin { - override def requires = plugins.JvmPlugin && ScalaFmtPlugin + override def requires = plugins.JvmPlugin && ScalaFmtPlugin && HeaderPlugin override def trigger = allRequirements @@ -69,6 +71,16 @@ object EvaluatorBuild extends AutoPlugin { ) private[this] def miscSettings = Seq( + headers <<= (name, version) { (name, version) => Map( + "scala" -> ( + HeaderPattern.cStyleBlockComment, + s"""|/* + | * scala-exercises-$name + | * Copyright (C) 2015-2016 47 Degrees, LLC. + | */ + | + |""".stripMargin) + )}, shellPrompt := { s: State => val c = scala.Console val blue = c.RESET + c.BLUE + c.BOLD diff --git a/project/plugins.sbt b/project/plugins.sbt index 48907822..cb9aafca 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,3 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.1") addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.2.11") +addSbtPlugin("de.heikoseeberger" % "sbt-header" % "1.6.0") diff --git a/server/src/main/scala/auth.scala b/server/src/main/scala/auth.scala index b3e2f472..d914f904 100644 --- a/server/src/main/scala/auth.scala +++ b/server/src/main/scala/auth.scala @@ -1,3 +1,8 @@ +/* + * scala-exercises-evaluator-server + * Copyright (C) 2015-2016 47 Degrees, LLC. + */ + package org.scalaexercises.evaluator import org.http4s._, org.http4s.dsl._, org.http4s.server._ diff --git a/server/src/main/scala/codecs.scala b/server/src/main/scala/codecs.scala index 208defc2..30c6002b 100644 --- a/server/src/main/scala/codecs.scala +++ b/server/src/main/scala/codecs.scala @@ -1,3 +1,8 @@ +/* + * scala-exercises-evaluator-server + * Copyright (C) 2015-2016 47 Degrees, LLC. + */ + package org.scalaexercises.evaluator import org.http4s._, org.http4s.dsl._ diff --git a/server/src/main/scala/evaluation.scala b/server/src/main/scala/evaluation.scala index 3e958935..17e1c761 100644 --- a/server/src/main/scala/evaluation.scala +++ b/server/src/main/scala/evaluation.scala @@ -1,5 +1,5 @@ /* - * scala-exercises-evaluator + * scala-exercises-evaluator-server * Copyright (C) 2015-2016 47 Degrees, LLC. */ diff --git a/server/src/main/scala/services.scala b/server/src/main/scala/services.scala index 23a676a8..034c3bdc 100644 --- a/server/src/main/scala/services.scala +++ b/server/src/main/scala/services.scala @@ -1,3 +1,8 @@ +/* + * scala-exercises-evaluator-server + * Copyright (C) 2015-2016 47 Degrees, LLC. + */ + package org.scalaexercises.evaluator import org.http4s._, org.http4s.dsl._, org.http4s.server._ diff --git a/server/src/test/scala/EvalEndpointSpec.scala b/server/src/test/scala/EvalEndpointSpec.scala index c9e27978..9f6258c9 100644 --- a/server/src/test/scala/EvalEndpointSpec.scala +++ b/server/src/test/scala/EvalEndpointSpec.scala @@ -1,7 +1,8 @@ /* - * scala-exercises-evaluator + * scala-exercises-evaluator-server * Copyright (C) 2015-2016 47 Degrees, LLC. */ + package org.scalaexercises.evaluator import org.scalatest._ diff --git a/server/src/test/scala/EvaluatorSpec.scala b/server/src/test/scala/EvaluatorSpec.scala index 33b5a820..41f2cc88 100644 --- a/server/src/test/scala/EvaluatorSpec.scala +++ b/server/src/test/scala/EvaluatorSpec.scala @@ -1,11 +1,12 @@ /* - * scala-exercises-evaluator + * scala-exercises-evaluator-server * Copyright (C) 2015-2016 47 Degrees, LLC. */ package org.scalaexercises.evaluator import scala.concurrent.duration._ +import scala.language.postfixOps import monix.execution.Scheduler import org.scalatest._ diff --git a/shared/src/main/scala/org/scalaexercises/evaluator/types.scala b/shared/src/main/scala/org/scalaexercises/evaluator/types.scala index fd97cac3..7abdb336 100644 --- a/shared/src/main/scala/org/scalaexercises/evaluator/types.scala +++ b/shared/src/main/scala/org/scalaexercises/evaluator/types.scala @@ -1,3 +1,8 @@ +/* + * scala-exercises-evaluator-shared + * Copyright (C) 2015-2016 47 Degrees, LLC. + */ + package org.scalaexercises.evaluator import scala.concurrent.duration._