From 52e03cabd0baa7d1a1299e6bd42a05d86a9cbf88 Mon Sep 17 00:00:00 2001 From: "N. Justus" Date: Fri, 30 Nov 2018 15:30:13 +0100 Subject: [PATCH] use omc-java-api directly from repository --- build.sbt | 1 + project/Dependencies.scala | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 662bc8b..1ac5bda 100644 --- a/build.sbt +++ b/build.sbt @@ -33,6 +33,7 @@ lazy val root = Project(id = "moie-server", base = file(".")). javacOptions ++= Seq("-source", "1.8"), mainClass in Compile := Some("de.thm.mope.MoPE"), configDir := new File(System.getProperty("user.home")) / ".mope", + resolvers += Dependencies.jitpack, libraryDependencies ++= Dependencies.usedDependencies, parallelExecution in Test := false, aggregate in Test := false diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c734a76..8c902a5 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,6 +4,11 @@ object Dependencies { def fromGithub(url:String) = RootProject(uri(url)) def fromFile(url:String) = RootProject(file(url)) + def omcApi(snapshot:Boolean=false) = + if(snapshot) "com.github.THM-MoTE" % "omc-java-api" % "zeromq-SNAPSHOT" + else "de.thm.mni.mote" % "omc-java-api" % "0.3.4" + + val jitpack = Resolver.url("jitpack", ulr("https://jitpack.io/")) private val akkaVersion = "2.4.19" private val akkaHTTPVersion = "10.0.10" @@ -29,8 +34,7 @@ object Dependencies { private val scalaUtilsGroup = "org.scala-lang.modules" val utils = Seq( - "de.thm.mni.mote" % "omc-java-api" % "0.3.4", - "com.typesafe" % "config" % "1.3.0", + omcApi(true), scalaUtilsGroup %% "scala-parser-combinators" % scalaUtilsVersion, "org.rogach" %% "scallop" % "3.1.1" )