Merged in fabiopakk_dependencies_update (pull request #8)

Dependencies update in Viper Server

Approved-by: Malte Schwerhoff <malte.schwerhoff@inf.ethz.ch>

See comments for the further steps that are needed.

.hgignore

@@ -3,3 +3,8 @@ target
 tmp
 .idea
 .DS_Store
+*.swp
+lib/
+silver
+silicon
+carbon

build.sbt

@@ -0,0 +1,38 @@
+// Import general settings from Silver, Silicon and Carbon
+lazy val silver = project in file("silver")
+lazy val silicon = project in file("silicon")
+lazy val carbon = project in file("carbon")
+
+lazy val common = (project in file("common"))
+
+// Viper Server specific project settings
+lazy val server = (project in file("."))
+    .dependsOn(silver % "compile->compile;test->test")
+    .dependsOn(silicon % "compile->compile;test->test")
+    .dependsOn(carbon % "compile->compile;test->test")
+    .dependsOn(common)
+    .aggregate(common)
+    .enablePlugins(JavaAppPackaging)
+    .settings(
+        // General settings
+        name := "ViperServer",
+        organization := "viper",
+        version := "1.1-SNAPSHOT",
+
+        // Compilation settings
+        libraryDependencies += "com.typesafe.akka" %% "akka-actor" % "2.5.17",
+        libraryDependencies += "com.typesafe.akka" %% "akka-http-spray-json" % "10.1.5",
+        libraryDependencies += "com.typesafe.akka" %% "akka-stream" % "2.5.17",
+        libraryDependencies += "com.typesafe.akka" %% "akka-http-testkit" % "10.1.5" % Test,
+
+        // Assembly settings
+        assembly / assemblyJarName := "viper.jar",                      // JAR filename
+        assembly / mainClass := Some("viper.server.ViperServerRunner"), // Define JAR's entry point
+        assembly / test := {},                                          // Prevent testing before packaging
+        assembly / assemblyMergeStrategy := {
+            case "logback.xml" => MergeStrategy.first
+            case x =>
+                val fallbackStrategy = (assembly / assemblyMergeStrategy).value
+                fallbackStrategy(x)
+        }
+    )

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.9
+sbt.version=1.2.6

project/plugins.sbt

@@ -1 +1,2 @@
-resolvers +=  Resolver.url("bintray-mschwerhoff-sbt-plugins",               url("https://dl.bintray.com/mschwerhoff/sbt-plugins/"))(Resolver.ivyStylePatterns)addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.1.0")addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.2.0-M9")addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3")addSbtPlugin("de.oakgrove" % "sbt-hgid" % "0.3")addSbtPlugin("de.oakgrove" % "sbt-brand" % "0.3")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.8")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.12")

src/test/scala/AllTests.scala

@@ -4,34 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import java.nio.file.Path
-
-//import viper.server.ViperCarbonFrontend
-import viper.silver.frontend.Frontend
-import viper.silver.reporter.StdIOReporter
-import viper.silver.testing.SilSuite
-import viper.silver.verifier.Verifier
-
-/*
-class AllTests extends SilSuite {
-  override def testDirectories: Seq[String] = Vector(
-    "local"
-    //, "all", "quantifiedpermissions", "quantifiedpredicates", "quantifiedcombinations", "wands", "examples"
-    //, "generated"
-  )
-
-  override def frontend(verifier: Verifier, files: Seq[Path]): Frontend = {
-    require(files.length == 1, "tests should consist of exactly one file")
-    val fe = new ViperCarbonFrontend(new StdIOReporter("carbon_tests_reporter"))
-    fe.init(verifier)
-    fe.reset(files.head)
-    fe
-  }
-
-  lazy val verifiers = List(CarbonVerifier())
-}
-*/
-
 import org.scalatest.{ Matchers, WordSpec }
 import akka.http.scaladsl.model.StatusCodes
 import akka.http.scaladsl.testkit.ScalatestRouteTest
@@ -62,8 +34,6 @@ class ViperServerSpec extends WordSpec with Matchers with ScalatestRouteTest {
         status should ===(StatusCodes.OK)
 
         contentType should ===(ContentTypes.`text/plain(UTF-8)`)
-
-
       }
     }
   }