diff --git a/app/gateway/main.scala b/app/gateway/main.scala new file mode 100644 index 0000000..c8d7eef --- /dev/null +++ b/app/gateway/main.scala @@ -0,0 +1,10 @@ +package gateway; + +class Main { + import java.io.{InputStream, OutputStream, PrintStream} + + def router(input: InputStream, output: OutputStream): Unit = { + val result = s"Greetings." + output.write(result.getBytes("UTF-8")) + } +} \ No newline at end of file diff --git a/build.sbt b/build.sbt index b0b4404..79a76fa 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ resolvers ++= Seq( "scalaz-bintray" at "https://dl.bintray.com/scalaz/releases", "Akka Snapshot Repository" at "http://repo.akka.io/snapshots/" ) - + libraryDependencies ++= Seq( ehcache, ws, @@ -22,4 +22,11 @@ libraryDependencies ++= Seq( specs2 % Test, "com.typesafe.akka" %% "akka-testkit" % "2.5.4" % "test", "org.scalatest" %% "scalatest" % "3.0.4" % "test" -) \ No newline at end of file +) + +assemblyMergeStrategy in assembly <<= (assemblyMergeStrategy in assembly) { + (old) => { + case PathList("META-INF", xs @ _*) => MergeStrategy.discard + case x => MergeStrategy.first + } +} diff --git a/project/plugins.sbt b/project/plugins.sbt index 2998f1b..965c482 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,4 +2,5 @@ logLevel := Level.Warn resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/" -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.6") \ No newline at end of file +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.6") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.12.0") diff --git a/test/models/SubscriberTransitionsSpec.scala b/test/models/SubscriberTransitionsSpec.scala index 1381479..3d7e17a 100644 --- a/test/models/SubscriberTransitionsSpec.scala +++ b/test/models/SubscriberTransitionsSpec.scala @@ -156,7 +156,7 @@ class SubscriberTransitionsSpec extends FunSpec with Matchers { it ("should return the alert action if a report is sent") { val action = subscriberTransitions.action("report 1111 My Address Lane") action shouldBe 'isDefined - action.get shouldEqual AlertAction("1111 My Address Lane") + action.get shouldEqual SubscriberTransitions.AlertAction("1111 My Address Lane") } } }