diff --git a/benchmark-runner/build.sc b/benchmark-runner/build.sc index af56149cf1bd5e6efe081d4d63862cd6440a92f3..c6a99ba574179e1ab299a20d971d97820c0aeaef 100644 --- a/benchmark-runner/build.sc +++ b/benchmark-runner/build.sc @@ -1,5 +1,5 @@ -import $ivy.`com.goyeau::mill-scalafix:0.2.2` -import com.goyeau.mill.scalafix.ScalafixModule +//import $ivy.`com.goyeau::mill-scalafix:0.2.2` +//import com.goyeau.mill.scalafix.ScalafixModule import mill._, scalalib._, scalafmt._ // Would allow to use @@ -9,17 +9,17 @@ import mill._, scalalib._, scalafmt._ object main extends ScalaModule - with ScalafmtModule with ScalafixModule { - def scalaVersion = "2.13.5" + with ScalafmtModule { + def scalaVersion = "3.0.0" def ivyDeps = Agg( - ivy"com.nrinaudo::kantan.csv-enumeratum:0.6.1", - ivy"com.nrinaudo::kantan.csv-generic:0.6.1", - ivy"com.nrinaudo::kantan.csv:0.6.1", - ivy"net.jcazevedo::moultingyaml:0.4.2", - ivy"org.apache.commons:commons-math3:3.6.1", - ivy"com.lihaoyi:::ammonite:2.3.8-124-2da846d2", + ivy"com.nrinaudo::kantan.csv-enumeratum:0.6.1".withDottyCompat(scalaVersion()), + ivy"com.nrinaudo::kantan.csv-generic:0.6.1".withDottyCompat(scalaVersion()), + ivy"com.nrinaudo::kantan.csv:0.6.1".withDottyCompat(scalaVersion()), + ivy"net.jcazevedo::moultingyaml:0.4.2".withDottyCompat(scalaVersion()), + ivy"org.apache.commons:commons-math3:3.6.1".withDottyCompat(scalaVersion()), + ivy"com.lihaoyi:::ammonite:2.3.8-124-2da846d2".withDottyCompat(scalaVersion()), ivy"org.eclipse.jgit:org.eclipse.jgit:5.12.0.202106070339-r", - ivy"org.rogach::scallop:4.0.3", + ivy"org.rogach::scallop:4.0.3".withDottyCompat(scalaVersion()), ) def scalacOptions = Seq( diff --git a/benchmark-runner/main/src/de/fau/cs/mazstab/ExperimentDescription.scala b/benchmark-runner/main/src/de/fau/cs/mazstab/ExperimentDescription.scala index ebdc1fb2db1bc5194d83d4f45da2f5bbd8125980..9f0c0ecfd072a50425b7bb3a828f31c3dcccb026 100644 --- a/benchmark-runner/main/src/de/fau/cs/mazstab/ExperimentDescription.scala +++ b/benchmark-runner/main/src/de/fau/cs/mazstab/ExperimentDescription.scala @@ -11,5 +11,5 @@ case class ExperimentDescription( ) object ExperimentDescriptionYamlProtocol extends DefaultYamlProtocol { - implicit val experimentDescriptionFormat = yamlFormat3(ExperimentDescription) + implicit val experimentDescgriptionFormat: YamlFormat[ExperimentDescription] = yamlFormat3(ExperimentDescription.apply) } diff --git a/benchmark-runner/main/src/de/fau/cs/mazstab/Mazstab.scala b/benchmark-runner/main/src/de/fau/cs/mazstab/Mazstab.scala index ced5bc8efbdea53e5020660ce9b764c766ce2685..c100a7c3856365be9eb2cc995b53a048c3993dcb 100644 --- a/benchmark-runner/main/src/de/fau/cs/mazstab/Mazstab.scala +++ b/benchmark-runner/main/src/de/fau/cs/mazstab/Mazstab.scala @@ -9,7 +9,7 @@ import net.jcazevedo.moultingyaml._ import os._ class MazstabContext(val conf: MazstabConf) { - private val postProcessedDirectory = conf + private val postProcessedDirectory: Path = conf .experimentDirectory() / "post-processed" / Mazstab.getTimestamp() def getPostProcessedDirectory() = {