From 6c17692bcc2560cb9851f7ef7b96ece71803ae19 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flow@cs.fau.de>
Date: Thu, 10 Jun 2021 10:54:39 +0200
Subject: [PATCH] DRAFT: Scala 3
---
benchmark-runner/build.sc | 22 +++++++++----------
.../cs/mazstab/ExperimentDescription.scala | 2 +-
.../main/src/de/fau/cs/mazstab/Mazstab.scala | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/benchmark-runner/build.sc b/benchmark-runner/build.sc
index af56149..c6a99ba 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 ebdc1fb..9f0c0ec 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 ced5bc8..c100a7c 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() = {
--
GitLab