From c95a30edd07717a8ec91dd091c9a9cfa238c01c0 Mon Sep 17 00:00:00 2001 From: Anthony Cerruti Date: Thu, 2 Jul 2020 11:08:37 -0700 Subject: [PATCH] Lots of updates --- build.sbt | 18 +++++++++--------- .../scala/tf/bug/fancadegraph/Argument.scala | 2 +- .../main/scala/tf/bug/fancadegraph/Main.scala | 1 - project/plugins.sbt | 3 ++- .../scala/tf/bug/fancadescodec/Codecs.scala | 8 ++++---- .../scala/tf/bug/fancadescodec/Metadata.scala | 2 +- .../tf/bug/fancadetagless/Fanscript.scala | 1 - 7 files changed, 17 insertions(+), 18 deletions(-) diff --git a/build.sbt b/build.sbt index d598da6..9e613ad 100644 --- a/build.sbt +++ b/build.sbt @@ -2,15 +2,15 @@ lazy val scodec = (project in file("scodec")).settings( organization := "tf.bug", name := "fancadescodec", version := "0.1.0", - scalaVersion := "2.13.2", + scalaVersion := "2.13.3", libraryDependencies ++= Seq( "org.scodec" %% "scodec-core" % "1.11.7", - "org.scodec" %% "scodec-bits" % "1.1.14", + "org.scodec" %% "scodec-bits" % "1.1.17", "org.scodec" %% "scodec-stream" % "2.0.0", - "org.typelevel" %% "cats-effect" % "2.1.2", + "org.typelevel" %% "cats-effect" % "2.1.3", "org.typelevel" %% "cats-core" % "2.1.1", - "co.fs2" %% "fs2-core" % "2.3.0", - "co.fs2" %% "fs2-io" % "2.3.0", + "co.fs2" %% "fs2-core" % "2.4.2", + "co.fs2" %% "fs2-io" % "2.4.2", ), mainClass in assembly := Some("tf.bug.fancadescodec.Main"), ) @@ -19,7 +19,7 @@ lazy val graph = (project in file("graph")).settings( organization := "tf.bug", name := "fancadegraph", version := "0.1.0", - scalaVersion := "2.13.2", + scalaVersion := "2.13.3", libraryDependencies ++= Seq( "org.scala-graph" %% "graph-core" % "1.13.2", ), @@ -29,13 +29,13 @@ lazy val tagless = (project in file("tagless")).settings( organization := "tf.bug", name := "fancadetagless", version := "0.1.0", - scalaVersion := "2.13.1", + scalaVersion := "2.13.3", libraryDependencies ++= Seq( "org.scala-graph" %% "graph-core" % "1.13.2", "com.chuusai" %% "shapeless" % "2.3.3", "org.typelevel" %% "cats-core" % "2.1.1", - "org.typelevel" %% "cats-effect" % "2.1.2", - "io.chrisdavenport" %% "fuuid" % "0.3.0", + "org.typelevel" %% "cats-effect" % "2.1.3", + "io.chrisdavenport" %% "fuuid" % "0.4.0", "org.scalameta" %% "munit" % "0.7.9" % Test, ), testFrameworks += new TestFramework("munit.Framework"), diff --git a/graph/src/main/scala/tf/bug/fancadegraph/Argument.scala b/graph/src/main/scala/tf/bug/fancadegraph/Argument.scala index d59f729..438ddb2 100644 --- a/graph/src/main/scala/tf/bug/fancadegraph/Argument.scala +++ b/graph/src/main/scala/tf/bug/fancadegraph/Argument.scala @@ -22,7 +22,7 @@ object Argument { } implicit val soundOptionsArg: Argument[SoundOptions] = new Argument[SoundOptions] { override def encode(value: SoundOptions)(pos: fansc.Position): Vector[fansc.Metadata] = Vector( - fansc.Metadata.PlaySoundLoop(pos, value.loop), + fansc.Metadata.Bool(pos, value.loop), fansc.Metadata.PlaySoundSample(pos, value.sample) ) } diff --git a/graph/src/main/scala/tf/bug/fancadegraph/Main.scala b/graph/src/main/scala/tf/bug/fancadegraph/Main.scala index cfd0e07..8cb52cf 100644 --- a/graph/src/main/scala/tf/bug/fancadegraph/Main.scala +++ b/graph/src/main/scala/tf/bug/fancadegraph/Main.scala @@ -1,7 +1,6 @@ package tf.bug.fancadegraph import cats.effect.{Blocker, ExitCode, IO, IOApp} -import cats.implicits._ import fs2._ import java.nio.file.{Paths, StandardOpenOption} import scalax.collection.Graph diff --git a/project/plugins.sbt b/project/plugins.sbt index f0390ca..4ff411d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,3 @@ -addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.11") +addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.13") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10") +addSbtPlugin("org.jmotor.sbt" % "sbt-dependency-updates" % "1.2.2") diff --git a/scodec/src/main/scala/tf/bug/fancadescodec/Codecs.scala b/scodec/src/main/scala/tf/bug/fancadescodec/Codecs.scala index 145b203..71453c3 100644 --- a/scodec/src/main/scala/tf/bug/fancadescodec/Codecs.scala +++ b/scodec/src/main/scala/tf/bug/fancadescodec/Codecs.scala @@ -50,8 +50,8 @@ object Codecs { lazy val metadata: Codec[Metadata] = discriminated[Metadata].by(uint16L) .subcaseP(0x0100) { - case psl: Metadata.PlaySoundLoop => psl - } (metadataPlaySoundLoop) + case bool: Metadata.Bool => bool + } (metadataBool) .subcaseP(0x0201) { case pss: Metadata.PlaySoundSample => pss } (metadataPlaySoundSample) @@ -68,8 +68,8 @@ object Codecs { case terminal: Metadata.Terminal => terminal } (metadataTerminal) - lazy val metadataPlaySoundLoop: Codec[Metadata.PlaySoundLoop] = - (position :: bool(8).hlist).as[Metadata.PlaySoundLoop] + lazy val metadataBool: Codec[Metadata.Bool] = + (position :: bool(8).hlist).as[Metadata.Bool] lazy val metadataPlaySoundSample: Codec[Metadata.PlaySoundSample] = (position :: sample.hlist).as[Metadata.PlaySoundSample] lazy val metadataNumber: Codec[Metadata.Number] = diff --git a/scodec/src/main/scala/tf/bug/fancadescodec/Metadata.scala b/scodec/src/main/scala/tf/bug/fancadescodec/Metadata.scala index ad760aa..64004d5 100644 --- a/scodec/src/main/scala/tf/bug/fancadescodec/Metadata.scala +++ b/scodec/src/main/scala/tf/bug/fancadescodec/Metadata.scala @@ -4,7 +4,7 @@ sealed trait Metadata object Metadata { - case class PlaySoundLoop( + case class Bool( block: Position, doLoop: Boolean ) extends Metadata diff --git a/tagless/src/main/scala/tf/bug/fancadetagless/Fanscript.scala b/tagless/src/main/scala/tf/bug/fancadetagless/Fanscript.scala index 8e5f89c..8a26a2f 100644 --- a/tagless/src/main/scala/tf/bug/fancadetagless/Fanscript.scala +++ b/tagless/src/main/scala/tf/bug/fancadetagless/Fanscript.scala @@ -1,7 +1,6 @@ package tf.bug.fancadetagless import tf.bug.fancadetagless.Fanscript.{Position, ScreenSize} -import tf.bug.fancadegraph.BlockDefinition trait Fanscript[F[_]] {