diff --git a/build.sbt b/build.sbt index e5f8020..9091e43 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,8 @@ -scalaVersion := "2.12.10" - -initialCommands in console := "import com.htmlism._" - -libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.0" % "test" - -scalafmtOnCompile := true +lazy val root = + project + .in(file(".")) + .settings( + initialCommands in console := "import com.htmlism._", + libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.1" % "test", + scalafmtOnCompile := true + ) diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala new file mode 100644 index 0000000..944600d --- /dev/null +++ b/project/ProjectPlugin.scala @@ -0,0 +1,10 @@ +import sbt.Keys._ +import sbt._ + +object ProjectPlugin extends AutoPlugin { + override def trigger = allRequirements + + override lazy val projectSettings = Seq( + scalaVersion := "2.13.1" + ) +} diff --git a/project/plugins.sbt b/project/plugins.sbt index 0f431ab..7456865 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.2.0") -addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.10") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.2") +addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.11") diff --git a/src/main/scala/com/htmlism/MatchOpcodes.scala b/src/main/scala/com/htmlism/MatchOpcodes.scala index 0228cc5..d391e10 100644 --- a/src/main/scala/com/htmlism/MatchOpcodes.scala +++ b/src/main/scala/com/htmlism/MatchOpcodes.scala @@ -92,7 +92,8 @@ object MatchOpcodes { case Some((ints, mode)) => val hex = f"$fullInt%2X" out.print( - s"$ints $mode
$hex") + s"$ints $mode
$hex" + ) case None => out.print(s"UNDEF") @@ -128,7 +129,8 @@ object MatchOpcodes { case Some((ints, mode)) => val hex = f"$fullInt%2X" out.print( - s"$ints $mode
$hex") + s"$ints $mode
$hex" + ) case None => out.print(s"UNDEF") @@ -183,7 +185,8 @@ object MatchOpcodes { case Some((ints, mode)) => val hex = f"$fullInt%2X" out.print( - s"$ints $mode
$hex") + s"$ints $mode
$hex" + ) case None => out.print(s"UNDEF")