Skip to content

Commit

Permalink
Switch to Scalafmt because Scalariform isn't being maintained
Browse files Browse the repository at this point in the history
  • Loading branch information
@lloydmeta
lloydmeta committed Sep 29, 2016
1 parent 47e8593 commit ce6c5bc
Show file tree
Hide file tree
Showing 47 changed files with 1,853 additions and 1,466 deletions.
2 changes: 2 additions & 0 deletions .scalafmt.conf
View file
@@ -0,0 +1,2 @@
style = defaultWithAlign
maxColumn = 100
275 changes: 157 additions & 118 deletions build.sbt
View file
@@ -1,109 +1,127 @@
import scalariform.formatter.preferences._
import com.typesafe.sbt.SbtScalariform
import com.typesafe.sbt.SbtScalariform.ScalariformKeys
import com.typesafe.sbt.SbtGit.{GitKeys => git}
import com.typesafe.sbt.SbtGhPages.ghpages
import com.typesafe.sbt.SbtSite.site
import sbtunidoc.Plugin.UnidocKeys._
import sbtunidoc.Plugin._

lazy val theVersion = "1.4.16-SNAPSHOT"
lazy val theVersion = "1.4.16-SNAPSHOT"
lazy val theScalaVersion = "2.11.8"
lazy val scalaVersions = Seq("2.10.6", "2.11.8")
def thePlayVersion(scalaVersion: String) = CrossVersion.partialVersion(scalaVersion) match {
case Some((2, scalaMajor)) if scalaMajor >= 11 => "2.5.6"
case Some((2, scalaMajor)) if scalaMajor == 10 => "2.4.8"
case _ => throw new IllegalArgumentException(s"Unsupported Scala version $scalaVersion")
}
lazy val scalaTestVersion = "3.0.0"
lazy val scalaVersions = Seq("2.10.6", "2.11.8")
def thePlayVersion(scalaVersion: String) =
CrossVersion.partialVersion(scalaVersion) match {
case Some((2, scalaMajor)) if scalaMajor >= 11 => "2.5.6"
case Some((2, scalaMajor)) if scalaMajor == 10 => "2.4.8"
case _ =>
throw new IllegalArgumentException(s"Unsupported Scala version $scalaVersion")
}
lazy val scalaTestVersion = "3.0.0"
lazy val reactiveMongoVersion = "0.11.14"

lazy val root = Project(id = "enumeratum-root", base = file("."), settings = commonWithPublishSettings)
.settings(
name := "enumeratum-root",
crossScalaVersions := scalaVersions,
crossVersion := CrossVersion.binary
)
.settings(unidocSettings: _*)
.settings(site.settings ++ ghpages.settings: _*)
.settings(
site.addMappingsToSiteDir(
mappings in (ScalaUnidoc, packageDoc), "latest/api"
),
git.gitRemoteRepo := "git@github.com:lloydmeta/enumeratum.git"
)
.settings(
scalacOptions in (ScalaUnidoc, unidoc) += "-Ymacro-no-expand",
// Do not publish the root project (it just serves as an aggregate)
publishArtifact := false,
publishLocal := {}
)
.aggregate(macrosJs, macrosJvm, coreJs, coreJvm, coreJVMTests, enumeratumPlay, enumeratumPlayJson, enumeratumUPickleJs, enumeratumUPickleJvm, enumeratumCirceJs, enumeratumCirceJvm, enumeratumReactiveMongoBson)
lazy val root =
Project(id = "enumeratum-root", base = file("."), settings = commonWithPublishSettings)
.settings(
name := "enumeratum-root",
crossScalaVersions := scalaVersions,
crossVersion := CrossVersion.binary
)
.settings(
git.gitRemoteRepo := "git@github.com:lloydmeta/enumeratum.git"
)
.settings(
// Do not publish the root project (it just serves as an aggregate)
publishArtifact := false,
publishLocal := {}
)
.aggregate(macrosJs,
macrosJvm,
coreJs,
coreJvm,
coreJVMTests,
enumeratumPlay,
enumeratumPlayJson,
enumeratumUPickleJs,
enumeratumUPickleJvm,
enumeratumCirceJs,
enumeratumCirceJvm,
enumeratumReactiveMongoBson)

lazy val core = crossProject.crossType(CrossType.Pure).in(file("enumeratum-core"))
lazy val core = crossProject
.crossType(CrossType.Pure)
.in(file("enumeratum-core"))
.settings(
name := "enumeratum"
)
.settings(testSettings:_*)
.settings(commonWithPublishSettings:_*)
.settings(testSettings: _*)
.settings(commonWithPublishSettings: _*)
.dependsOn(macros)

lazy val coreJs = core.js
lazy val coreJs = core.js
lazy val coreJvm = core.jvm

lazy val coreJVMTests = Project(id = "coreJVMTests", base = file("enumeratum-core-jvm-tests"), settings = commonWithPublishSettings)
lazy val coreJVMTests = Project(id = "coreJVMTests",
base = file("enumeratum-core-jvm-tests"),
settings = commonWithPublishSettings)
.settings(
name := "coreJVMTests",
libraryDependencies ++= Seq(
"org.scala-lang" % "scala-compiler" % scalaVersion.value % Test
),
publishArtifact := false
)
.settings(testSettings:_*)
.settings(testSettings: _*)
.dependsOn(coreJvm)

lazy val macros = crossProject.crossType(CrossType.Pure).in(file("macros"))
.settings(commonWithPublishSettings:_*)
lazy val macros = crossProject
.crossType(CrossType.Pure)
.in(file("macros"))
.settings(commonWithPublishSettings: _*)
.settings(
name := "enumeratum-macros",
libraryDependencies ++= Seq(
"org.scala-lang" % "scala-reflect" % scalaVersion.value
)
)
.settings(withCompatUnmanagedSources(jsJvmCrossProject = true, include_210Dir = true, includeTestSrcs = false):_*)
.settings(testSettings:_*)
lazy val macrosJs = macros.js
.settings(withCompatUnmanagedSources(jsJvmCrossProject = true,
include_210Dir = true,
includeTestSrcs = false): _*)
.settings(testSettings: _*)
lazy val macrosJs = macros.js
lazy val macrosJvm = macros.jvm

lazy val enumeratumReactiveMongoBson = Project(id = "enumeratum-reactivemongo-bson", base = file("enumeratum-reactivemongo-bson"), settings = commonWithPublishSettings)
.settings(
libraryDependencies ++= Seq(
"org.reactivemongo" %% "reactivemongo" % reactiveMongoVersion
lazy val enumeratumReactiveMongoBson =
Project(id = "enumeratum-reactivemongo-bson",
base = file("enumeratum-reactivemongo-bson"),
settings = commonWithPublishSettings)
.settings(
libraryDependencies ++= Seq(
"org.reactivemongo" %% "reactivemongo" % reactiveMongoVersion
)
)
)
.settings(testSettings:_*)
.dependsOn(coreJvm % "test->test;compile->compile")
.settings(testSettings: _*)
.dependsOn(coreJvm % "test->test;compile->compile")

lazy val enumeratumPlayJson = Project(id = "enumeratum-play-json", base = file("enumeratum-play-json"), settings = commonWithPublishSettings)
lazy val enumeratumPlayJson = Project(id = "enumeratum-play-json",
base = file("enumeratum-play-json"),
settings = commonWithPublishSettings)
.settings(
libraryDependencies ++= Seq(
"com.typesafe.play" %% "play-json" % thePlayVersion(scalaVersion.value)
)
)
.settings(testSettings:_*)
.settings(testSettings: _*)
.dependsOn(coreJvm % "test->test;compile->compile")

lazy val enumeratumPlay = Project(id = "enumeratum-play", base = file("enumeratum-play"), settings = commonWithPublishSettings)
lazy val enumeratumPlay = Project(id = "enumeratum-play",
base = file("enumeratum-play"),
settings = commonWithPublishSettings)
.settings(
libraryDependencies ++= Seq(
"com.typesafe.play" %% "play" % thePlayVersion(scalaVersion.value)
)
)
.settings(testSettings:_*)
.settings(testSettings: _*)
.dependsOn(coreJvm, enumeratumPlayJson % "test->test;compile->compile")

lazy val enumeratumUPickle = crossProject.crossType(CrossType.Pure).in(file("enumeratum-upickle"))
.settings(commonWithPublishSettings:_*)
lazy val enumeratumUPickle = crossProject
.crossType(CrossType.Pure)
.in(file("enumeratum-upickle"))
.settings(commonWithPublishSettings: _*)
.settings(
name := "enumeratum-upickle",
libraryDependencies ++= {
Expand All @@ -116,25 +134,27 @@ lazy val enumeratumUPickle = crossProject.crossType(CrossType.Pure).in(file("enu
}
Seq(impl.ScalaJSGroupID.withCross("com.lihaoyi", "upickle", cross) % "0.4.1")
} ++ {
val additionalMacroDeps = CrossVersion.partialVersion(scalaVersion.value) match {
// if scala 2.11+ is used, quasiquotes are merged into scala-reflect
case Some((2, scalaMajor)) if scalaMajor >= 11 =>
Nil
// in Scala 2.10, quasiquotes are provided by macro paradise
case Some((2, 10)) =>
Seq(
"org.scalamacros" %% "quasiquotes" % "2.0.1" cross CrossVersion.binary )
}
val additionalMacroDeps =
CrossVersion.partialVersion(scalaVersion.value) match {
// if scala 2.11+ is used, quasiquotes are merged into scala-reflect
case Some((2, scalaMajor)) if scalaMajor >= 11 =>
Nil
// in Scala 2.10, quasiquotes are provided by macro paradise
case Some((2, 10)) =>
Seq("org.scalamacros" %% "quasiquotes" % "2.0.1" cross CrossVersion.binary)
}
additionalMacroDeps
}
)
.settings(testSettings:_*)
.settings(testSettings: _*)
.dependsOn(core % "test->test;compile->compile")
lazy val enumeratumUPickleJs = enumeratumUPickle.js
lazy val enumeratumUPickleJs = enumeratumUPickle.js
lazy val enumeratumUPickleJvm = enumeratumUPickle.jvm

lazy val enumeratumCirce = crossProject.crossType(CrossType.Pure).in(file("enumeratum-circe"))
.settings(commonWithPublishSettings:_*)
lazy val enumeratumCirce = crossProject
.crossType(CrossType.Pure)
.in(file("enumeratum-circe"))
.settings(commonWithPublishSettings: _*)
.settings(
name := "enumeratum-circe",
libraryDependencies ++= {
Expand All @@ -148,30 +168,22 @@ lazy val enumeratumCirce = crossProject.crossType(CrossType.Pure).in(file("enume
Seq(impl.ScalaJSGroupID.withCross("io.circe", "circe-core", cross) % "0.5.1")
}
)
.settings(testSettings:_*)
.settings(testSettings: _*)
.dependsOn(core % "test->test;compile->compile")
lazy val enumeratumCirceJs = enumeratumCirce.js
lazy val enumeratumCirceJs = enumeratumCirce.js
lazy val enumeratumCirceJvm = enumeratumCirce.jvm


lazy val commonSettings = Seq(
organization := "com.beachape",
version := theVersion,
incOptions := incOptions.value.withLogRecompileOnMacro(false),
scalaVersion := theScalaVersion
) ++
scalariformSettings ++
scoverageSettings ++
formatterPrefs ++
compilerSettings ++
resolverSettings ++
ideSettings

lazy val formatterPrefs = Seq(
ScalariformKeys.preferences := ScalariformKeys.preferences.value
.setPreference(AlignParameters, true)
.setPreference(DoubleIndentClassDeclaration, true)
)
organization := "com.beachape",
version := theVersion,
incOptions := incOptions.value.withLogRecompileOnMacro(false),
scalaVersion := theScalaVersion
) ++
scoverageSettings ++
reformatOnCompileSettings ++
compilerSettings ++
resolverSettings ++
ideSettings

lazy val commonWithPublishSettings =
commonSettings ++
Expand Down Expand Up @@ -225,65 +237,92 @@ lazy val publishSettings = Seq(
if (v.trim.endsWith("SNAPSHOT"))
Some("snapshots" at nexus + "content/repositories/snapshots")
else
Some("releases" at nexus + "service/local/staging/deploy/maven2")
Some("releases" at nexus + "service/local/staging/deploy/maven2")
},
publishMavenStyle := true,
publishArtifact in Test := false,
pomIncludeRepository := { _ => false }
pomIncludeRepository := { _ =>
false
}
)

val testSettings = {
Seq(
libraryDependencies += {
import org.scalajs.sbtplugin._
val crossVersion = if (ScalaJSPlugin.autoImport.jsDependencies.?.value.isDefined)
ScalaJSCrossVersion.binary
else
CrossVersion.binary
impl.ScalaJSGroupID.withCross("org.scalatest", "scalatest", crossVersion) % scalaTestVersion % Test
val crossVersion =
if (ScalaJSPlugin.autoImport.jsDependencies.?.value.isDefined)
ScalaJSCrossVersion.binary
else
CrossVersion.binary
impl.ScalaJSGroupID
.withCross("org.scalatest", "scalatest", crossVersion) % scalaTestVersion % Test
},
scalaJSStage in Test := FastOptStage
)
}

lazy val benchmarking = Project(id = "benchmarking", base = file("benchmarking"), settings = commonWithPublishSettings)
.settings(
name := "benchmarking",
crossScalaVersions := scalaVersions,
crossVersion := CrossVersion.binary,
// Do not publish
publishArtifact := false,
publishLocal := {}
)
.dependsOn(macrosJs, macrosJvm, coreJs, coreJvm, coreJVMTests, enumeratumPlay, enumeratumPlayJson, enumeratumUPickleJs, enumeratumUPickleJvm, enumeratumCirceJs, enumeratumCirceJvm, enumeratumReactiveMongoBson)
.enablePlugins(JmhPlugin)
.settings(libraryDependencies += "org.slf4j" % "slf4j-simple" % "1.7.21")
lazy val benchmarking =
Project(id = "benchmarking", base = file("benchmarking"), settings = commonWithPublishSettings)
.settings(
name := "benchmarking",
crossScalaVersions := scalaVersions,
crossVersion := CrossVersion.binary,
// Do not publish
publishArtifact := false,
publishLocal := {}
)
.dependsOn(macrosJs,
macrosJvm,
coreJs,
coreJvm,
coreJVMTests,
enumeratumPlay,
enumeratumPlayJson,
enumeratumUPickleJs,
enumeratumUPickleJvm,
enumeratumCirceJs,
enumeratumCirceJvm,
enumeratumReactiveMongoBson)
.enablePlugins(JmhPlugin)
.settings(libraryDependencies += "org.slf4j" % "slf4j-simple" % "1.7.21")

/**
* Helper function to add unmanaged source compat directories for different scala versions
*/
def withCompatUnmanagedSources(jsJvmCrossProject: Boolean, include_210Dir: Boolean, includeTestSrcs: Boolean): Seq[Setting[_]] = {
def withCompatUnmanagedSources(jsJvmCrossProject: Boolean,
include_210Dir: Boolean,
includeTestSrcs: Boolean): Seq[Setting[_]] = {
def compatDirs(projectbase: File, scalaVersion: String, isMain: Boolean) = {
val base = if (jsJvmCrossProject ) projectbase / ".." else projectbase
val base = if (jsJvmCrossProject) projectbase / ".." else projectbase
CrossVersion.partialVersion(scalaVersion) match {
case Some((2, scalaMajor)) if scalaMajor >= 11 => Seq(base / "compat" / "src" / (if (isMain) "main" else "test") / "scala-2.11").map(_.getCanonicalFile)
case Some((2, scalaMajor)) if scalaMajor == 10 && include_210Dir => Seq(base / "compat" / "src" / (if (isMain) "main" else "test") / "scala-2.10").map(_.getCanonicalFile)
case Some((2, scalaMajor)) if scalaMajor >= 11 =>
Seq(base / "compat" / "src" / (if (isMain) "main" else "test") / "scala-2.11")
.map(_.getCanonicalFile)
case Some((2, scalaMajor)) if scalaMajor == 10 && include_210Dir =>
Seq(base / "compat" / "src" / (if (isMain) "main" else "test") / "scala-2.10")
.map(_.getCanonicalFile)
case _ => Nil
}
}
val unmanagedMainDirsSetting = Seq(
unmanagedSourceDirectories in Compile ++= {
compatDirs(projectbase = baseDirectory.value, scalaVersion = scalaVersion.value, isMain = true)
compatDirs(projectbase = baseDirectory.value,
scalaVersion = scalaVersion.value,
isMain = true)
}
)
if (includeTestSrcs) {
unmanagedMainDirsSetting ++ {
unmanagedSourceDirectories in Test ++= {
compatDirs(projectbase = baseDirectory.value, scalaVersion = scalaVersion.value, isMain = false)
compatDirs(projectbase = baseDirectory.value,
scalaVersion = scalaVersion.value,
isMain = false)
}
}
} else {
unmanagedMainDirsSetting
}
}

scalafmtConfig := Some(file(".scalafmt.conf"))

0 comments on commit ce6c5bc

Please sign in to comment.