diff --git a/build.sbt b/build.sbt index fbcd448..806e79d 100644 --- a/build.sbt +++ b/build.sbt @@ -1,46 +1,38 @@ import sbtassembly.AssemblyPlugin.defaultShellScript -ThisBuild / scalaVersion := "2.13.4" +ThisBuild / scalaVersion := "2.13.12" ThisBuild / organizationName := "Alex Tucker" +ThisBuild / assemblyPrependShellScript := Some(defaultShellScript) +ThisBuild / assemblyMergeStrategy := { + case "module-info.class" => MergeStrategy.discard + case PathList("org", "apache", "commons", "logging", xs @ _*) => MergeStrategy.first + case PathList("org", "apache", "jena", "tdb", "tdb-properties.xml") => MergeStrategy.first + case x => + val oldStrategy = (assembly / assemblyMergeStrategy).value + oldStrategy(x) +} lazy val sparqlTestRunner = (project in file(".")) - .enablePlugins(NativeImagePlugin) .settings( name := "sparql-test-runner", version := "1.4", Compile / mainClass := Some("uk.org.floop.sparqlTestRunner.SparqlTestRunner"), - nativeImageOptions ++= List( - "-H:+ReportExceptionStackTraces", - "--no-fallback", - "--allow-incomplete-classpath", - "-H:ResourceConfigurationFiles=../../configs/resource-config.json", - "-H:ReflectionConfigurationFiles=../../configs/reflect-config.json", - "-H:JNIConfigurationFiles=../../configs/jni-config.json", - "-H:DynamicProxyConfigurationFiles=../../configs/proxy-config.json", - "-H:EnableURLProtocols=https"), libraryDependencies ++= Seq( "org.apache.jena" % "jena-arq" % "3.17.0", "org.apache.jena" % "jena-cmds" % "3.17.0", - "com.github.scopt" %% "scopt" % "4.0.0", - "org.scala-lang.modules" %% "scala-xml" % "1.3.0", + "com.github.scopt" %% "scopt" % "4.0.1", + "org.scala-lang.modules" %% "scala-xml" % "2.0.0", "org.slf4j" % "slf4j-simple" % "1.7.30", - "com.typesafe.scala-logging" %% "scala-logging" % "3.9.2", + "com.typesafe.scala-logging" %% "scala-logging" % "3.9.4", "xerces" % "xercesImpl" % "2.12.1", - "org.scalactic" %% "scalactic" % "3.2.5" % Test, - "org.scalatest" %% "scalatest" % "3.2.5" % Test, - "org.scalatest" %% "scalatest-flatspec" % "3.2.5" % Test, - "org.json4s" %% "json4s-native" % "3.6.11" % Test, + "org.scalactic" %% "scalactic" % "3.2.9" % Test, + "org.scalatest" %% "scalatest" % "3.2.9" % Test, + "org.scalatest" %% "scalatest-flatspec" % "3.2.9" % Test, + "org.json4s" %% "json4s-native" % "4.0.2" % Test, "com.github.tomakehurst" % "wiremock-jre8" % "2.27.2" % Test ), - assemblyMergeStrategy in assembly := { - case "module-info.class" => MergeStrategy.discard - case PathList("org", "apache", "commons", "logging", xs @ _*) => MergeStrategy.first - case PathList("org", "apache", "jena", "tdb", "tdb-properties.xml") => MergeStrategy.first - case x => - val oldStrategy = (assemblyMergeStrategy in assembly).value - oldStrategy(x) - }, - mainClass in assembly := Some("uk.org.floop.sparqlTestRunner.SparqlTestRunner"), - assemblyOption in assembly := (assemblyOption in assembly).value.copy(prependShellScript = Some(defaultShellScript)), - assemblyJarName in assembly := "sparql-test-runner" + + assembly / mainClass := Some("uk.org.floop.sparqlTestRunner.SparqlTestRunner"), + + assembly /assemblyJarName := "sparql-test-runner" ) diff --git a/project/assembly.sbt b/project/assembly.sbt index 09c90ca..f751db5 100644 --- a/project/assembly.sbt +++ b/project/assembly.sbt @@ -1 +1 @@ -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6") \ No newline at end of file +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5") \ No newline at end of file diff --git a/project/build.properties b/project/build.properties index 97a7ea7..331a838 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.4.7 \ No newline at end of file +sbt.version = 1.9.7 \ No newline at end of file