5 files changed, 58 insertions, 14 deletions

diff --git a/build.sbt b/build.sbt
index 34e5232..040f7c3 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,16 +1,38 @@
-//import Dependencies._
+import Dependencies._
 
-ThisBuild / scalaVersion := "2.13.1"
-ThisBuild / version := "0.1.0"
-//ThisBuild / organization     := "com.example"
-//ThisBuild / organizationName := "example"
+ThisBuild / scalaVersion          := "2.13.3"
+ThisBuild / version               := "0.1.0"
+ThisBuild / organization          := "uk.ac.ox.cs.rsacomb"
+ThisBuild / organizationName      := "Department of Computer Science - University of Oxford"
+ThisBuild / organizationHomepage  := Some(url("https://www.cs.ox.ac.uk"))
+
+ThisBuild / scmInfo := Some(
+  ScmInfo(
+    url("https://github.com/KRR-Oxford/RSA-combined-approach"),
+    "scm:git@github.com:KRR-Oxford/RSA-combined-approach.git"
+  )
+)
+// ThisBuild / developers := List(
+//   Developer(
+//     id    = "Your identifier",
+//     name  = "Your Name",
+//     email = "your@email",
+//     url   = url("http://your.url")
+//   )
+// )
+
+ThisBuild / description := "Re-implementation of the combined approach for CQ answering over RSA ontologies."
+// ThisBuild / licenses := List("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt"))
+ThisBuild / homepage := Some(url("https://github.com/KRR-Oxford/RSA-combined-approach"))
 
 lazy val root = (project in file("."))
   .settings(
     name := "RSAComb",
     libraryDependencies ++= Seq(
-      "org.scalatest" %% "scalatest" % "3.1.0" % "test",
-      "net.sourceforge.owlapi" % "owlapi-apibinding" % "5.1.13",
-      "org.scala-graph" %% "graph-core" % "1.13.2"
+      scalatest % Test,
+      scalatestFlatSpec % Test,
+      scalatestShouldMatchers % Test,
+      apibinding,
+      graphcore
     )
   )
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
new file mode 100644
index 0000000..1cafe11
--- /dev/null
+++ b/project/Dependencies.scala
@@ -0,0 +1,15 @@
+import sbt._
+
+object Dependencies {
+  // Versions
+  lazy val scalatestVersion = "3.2.2"
+  lazy val owlapiVersion = "5.1.16"
+  lazy val scalagraphVersion = "1.13.2"
+
+  // Libraries
+  val scalatest = "org.scalatest" %% "scalatest" % scalatestVersion
+  val scalatestFlatSpec = "org.scalatest" %% "scalatest-flatspec" % scalatestVersion
+  val scalatestShouldMatchers = "org.scalatest" %% "scalatest-shouldmatchers" % scalatestVersion
+  val apibinding = "net.sourceforge.owlapi" % "owlapi-apibinding" % owlapiVersion
+  val graphcore = "org.scala-graph" %% "graph-core" % scalagraphVersion
+}
diff --git a/src/test/scala/rsacomb/CanonicalModelSpec.scala b/src/test/scala/rsacomb/CanonicalModelSpec.scala
index d783b12..c528328 100644
--- a/src/test/scala/rsacomb/CanonicalModelSpec.scala
+++ b/src/test/scala/rsacomb/CanonicalModelSpec.scala
@@ -1,7 +1,10 @@
 package rsacomb
 
 import java.io.File
-import org.scalatest.{FlatSpec, Matchers, LoneElement}
+import org.scalatest.LoneElement
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
+
 
 import org.semanticweb.owlapi.model._
 import uk.ac.manchester.cs.owl.owlapi._
@@ -48,7 +51,7 @@ object Ontology1_CanonicalModelSpec {
 } // object OWLAxiomSpec
 
 class Ontology1_CanonicalModelSpec
-    extends FlatSpec
+    extends AnyFlatSpec
     with Matchers
     with LoneElement {
 
diff --git a/src/test/scala/rsacomb/OWLAxiomSpec.scala b/src/test/scala/rsacomb/OWLAxiomSpec.scala
index c5b8763..a389242 100644
--- a/src/test/scala/rsacomb/OWLAxiomSpec.scala
+++ b/src/test/scala/rsacomb/OWLAxiomSpec.scala
@@ -1,7 +1,9 @@
 package rsacomb
 
 import java.util.ArrayList
-import org.scalatest.{FlatSpec, Matchers, LoneElement}
+import org.scalatest.LoneElement
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 import uk.ac.manchester.cs.owl.owlapi.{OWLSubClassOfAxiomImpl}
 import uk.ac.manchester.cs.owl.owlapi.{
@@ -168,7 +170,7 @@ object OWLAxiomSpec {
 
 } // object OWLAxiomSpec
 
-class OWLAxiomSpec extends FlatSpec with Matchers with LoneElement {
+class OWLAxiomSpec extends AnyFlatSpec with Matchers with LoneElement {
 
   // Import required data
   import OWLAxiomSpec._
diff --git a/src/test/scala/rsacomb/OWLClassSpec.scala b/src/test/scala/rsacomb/OWLClassSpec.scala
index d1e9fdb..74c641e 100644
--- a/src/test/scala/rsacomb/OWLClassSpec.scala
+++ b/src/test/scala/rsacomb/OWLClassSpec.scala
@@ -1,6 +1,8 @@
 package rsacomb
 
-import org.scalatest.{FlatSpec, Matchers, LoneElement}
+import org.scalatest.LoneElement
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 import uk.ac.manchester.cs.owl.owlapi.{
   OWLClassImpl,
@@ -99,7 +101,7 @@ object OWLClassSpec {
     )
 } // object OWLClassSpec
 
-class OWLClassSpec extends FlatSpec with Matchers with LoneElement {
+class OWLClassSpec extends AnyFlatSpec with Matchers with LoneElement {
   // Import required data
   import OWLClassSpec._