Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* scala-exercises-evaluator-client
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package org.scalaexercises.evaluator

import io.circe._, io.circe.jawn._, io.circe.syntax._
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* scala-exercises-evaluator-client
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package org.scalaexercises.evaluator

import cats.data.Xor
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* scala-exercises-evaluator-client
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package org.scalaexercises.evaluator.api

import org.scalaexercises.evaluator.EvaluatorResponses.EvaluationResponse
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* scala-exercises-evaluator-client
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package org.scalaexercises.evaluator.http

import io.circe.Decoder
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* scala-exercises-evaluator-client
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package org.scalaexercises.evaluator.http

import org.scalaexercises.evaluator.http.HttpClient._
Expand Down
14 changes: 13 additions & 1 deletion project/EvaluatorBuild.scala
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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. <http://www.47deg.com>
| */
|
|""".stripMargin)
)},
shellPrompt := { s: State =>
val c = scala.Console
val blue = c.RESET + c.BLUE + c.BOLD
Expand Down
1 change: 1 addition & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
5 changes: 5 additions & 0 deletions server/src/main/scala/auth.scala
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* scala-exercises-evaluator-server
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package org.scalaexercises.evaluator

import org.http4s._, org.http4s.dsl._, org.http4s.server._
Expand Down
5 changes: 5 additions & 0 deletions server/src/main/scala/codecs.scala
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* scala-exercises-evaluator-server
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package org.scalaexercises.evaluator

import org.http4s._, org.http4s.dsl._
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/scala/evaluation.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* scala-exercises-evaluator
* scala-exercises-evaluator-server
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*/

Expand Down
5 changes: 5 additions & 0 deletions server/src/main/scala/services.scala
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* scala-exercises-evaluator-server
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package org.scalaexercises.evaluator

import org.http4s._, org.http4s.dsl._, org.http4s.server._
Expand Down
3 changes: 2 additions & 1 deletion server/src/test/scala/EvalEndpointSpec.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/*
* scala-exercises-evaluator
* scala-exercises-evaluator-server
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package org.scalaexercises.evaluator

import org.scalatest._
Expand Down
3 changes: 2 additions & 1 deletion server/src/test/scala/EvaluatorSpec.scala
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
/*
* scala-exercises-evaluator
* scala-exercises-evaluator-server
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package org.scalaexercises.evaluator

import scala.concurrent.duration._
import scala.language.postfixOps
import monix.execution.Scheduler
import org.scalatest._

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* scala-exercises-evaluator-shared
* Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package org.scalaexercises.evaluator

import scala.concurrent.duration._
Expand Down