Skip to content

Commit

Permalink
Remove todos
Browse files Browse the repository at this point in the history
  • Loading branch information
lloydmeta committed Nov 10, 2016
1 parent 0d357ad commit d1585d5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 14 deletions.
17 changes: 5 additions & 12 deletions build.sbt
Expand Up @@ -60,7 +60,7 @@ lazy val scala_2_12 = Project(id = "scala_2_12",
// Do not publish this project (it just serves as an aggregate)
publishArtifact := false,
publishLocal := {})
.aggregate((baseProjectRefs ++ Seq(enumeratumCirceJs, enumeratumCirceJvm).map(Project.projectToRef)): _*) // base plus known 2.12 friendly libs
.aggregate(baseProjectRefs ++ Seq(enumeratumCirceJs, enumeratumCirceJvm).map(Project.projectToRef): _*) // base plus known 2.12 friendly libs

lazy val core = crossProject
.crossType(CrossType.Pure)
Expand Down Expand Up @@ -215,13 +215,9 @@ lazy val commonSettings = Seq(
resolverSettings ++
ideSettings

lazy val commonSettingsWithTrimmings = commonSettings ++
scoverageSettings // ++
// TODO: Add back ScalaFMT when it works
// Seq(
// scalafmtConfig := Some(file(".scalafmt.conf"))
// ) ++
// reformatOnCompileSettings
lazy val commonSettingsWithTrimmings =
commonSettings ++
scoverageSettings

lazy val commonWithPublishSettings =
commonSettingsWithTrimmings ++
Expand All @@ -243,7 +239,6 @@ lazy val compilerSettings = Seq(
scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature", "-Xlint", "-Xlog-free-terms")
)

// TODO add back Scoverage
lazy val scoverageSettings = Seq(
coverageExcludedPackages := """enumeratum\.EnumMacros;enumeratum\.ContextUtils;enumeratum\.ValueEnumMacros""",
coverageHighlighting := true
Expand Down Expand Up @@ -351,6 +346,4 @@ def withCompatUnmanagedSources(jsJvmCrossProject: Boolean,
} else {
unmanagedMainDirsSetting
}
}
// TODO Add back ScalaFMT
//scalafmtConfig := Some(file(".scalafmt.conf"))
}
2 changes: 0 additions & 2 deletions project/plugins.sbt
Expand Up @@ -2,8 +2,6 @@ resolvers ++= Seq(
Classpaths.sbtPluginReleases
)

// TODO add back Scalafmt for code formatting
//addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.4.1")
addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0")

addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")
Expand Down

0 comments on commit d1585d5

Please sign in to comment.