Skip to content

Commit

Permalink
Prepare repository for next .github release and SBT build improveme…
Browse files Browse the repository at this point in the history
…nts (#3)

* Removes root project

* Bumps deps up

* Updates command aliases

* Moves .docs to docs. Updates sbt module too

* Removes sbt-mdoc-toc since it is not being used

* Updates plugins

* Adds sbt-remove-test-from-pom

* Updates docs
  • Loading branch information
juanpedromoreno authored Jun 8, 2020
1 parent fa50c77 commit ff46371
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 29 deletions.
4 changes: 3 additions & 1 deletion AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@

The maintainers of the project are:

- [![47erbot](https://avatars1.githubusercontent.com/u/24799081?v=4&s=20) **47erbot**](https://github.com/47erbot)
- [![juanpedromoreno](https://avatars2.githubusercontent.com/u/4879373?v=4&s=20) **Juan Pedro Moreno (juanpedromoreno)**](https://github.com/juanpedromoreno)

## Contributors

These are the people that have contributed to the _sbt-exercise_ project:

- [![juanpedromoreno](https://avatars2.githubusercontent.com/u/4879373?v=4&s=20) **juanpedromoreno**](https://github.com/juanpedromoreno)
- [![juanpedromoreno](https://avatars2.githubusercontent.com/u/4879373?v=4&s=20) **juanpedromoreno**](https://github.com/juanpedromoreno)
- [![47erbot](https://avatars1.githubusercontent.com/u/24799081?v=4&s=20) **47erbot**](https://github.com/47erbot)
29 changes: 10 additions & 19 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,30 @@ ThisBuild / organization := "org.scala-exercises"
ThisBuild / githubOrganization := "47degrees"
ThisBuild / scalaVersion := V.scala212

publish / skip := true

addCommandAlias(
"ci-test",
";scalafmtCheckAll; scalafmtSbtCheck; +test; +publishLocal; sbt-exercise/test; sbt-exercise/scripted"
";scalafmtCheckAll; scalafmtSbtCheck; +test; +publishLocal; sbt-exercise/scripted"
)
addCommandAlias("ci-docs", ";github; project-docs/mdoc; headerCreateAll")
addCommandAlias("ci-docs", ";github; mdoc; headerCreateAll")
addCommandAlias("ci-publish", ";github; ci-release")

lazy val V = new {
val cats: String = "2.1.1"
val collectioncompat: String = "2.1.6"
val github4s: String = "0.24.0"
val http4s: String = "0.21.3"
val http4s: String = "0.21.4"
val runtime: String = "0.6.0"
val scala: String = "2.13.2"
val scala212: String = "2.12.11"
val scalacheck: String = "1.14.3"
val scalacheckShapeless: String = "1.2.5"
val scalamacros: String = "2.1.1"
val scalariform: String = "0.2.10"
val scalatest: String = "3.1.1"
val scalatest: String = "3.1.2"
}

lazy val root = project
.in(file("."))
.settings(moduleName := "sbt-exercise")
.settings(skip in publish := true)
.aggregate(definitions, compiler, `sbt-exercise`)
.dependsOn(definitions, compiler, `sbt-exercise`)

lazy val definitions = (project in file("definitions"))
.settings(name := "definitions")
.settings(
Expand Down Expand Up @@ -69,10 +65,8 @@ lazy val `sbt-exercise` = (project in file("sbt-exercise"))
.settings(name := "sbt-exercise")
.settings(
scalacOptions -= "-Xfatal-warnings",
libraryDependencies ++= Seq(
"org.typelevel" %% "cats-core" % V.cats % Compile
),
scalacOptions += "-Ypartial-unification",
libraryDependencies += "org.typelevel" %% "cats-core" % V.cats % Compile,
addCompilerPlugin("org.scalamacros" % "paradise" % V.scalamacros cross CrossVersion.full),
// Leverage build info to populate compiler classpath--
compilerClasspath := { fullClasspath in (compiler, Compile) }.value,
Expand Down Expand Up @@ -102,10 +96,7 @@ lazy val `sbt-exercise` = (project in file("sbt-exercise"))
.enablePlugins(SbtPlugin)
.enablePlugins(BuildInfoPlugin)

lazy val `project-docs` = (project in file(".docs"))
.aggregate(definitions, compiler)
.settings(moduleName := "sbt-exercise-project-docs")
.settings(mdocIn := file(".docs"))
lazy val documentation = project
.settings(mdocOut := file("."))
.settings(skip in publish := true)
.settings(publish / skip := true)
.enablePlugins(MdocPlugin)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
19 changes: 10 additions & 9 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.1.5")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.4")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.8.1")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.8.1")
addSbtPlugin("com.alejandrohdezma" % "sbt-mdoc-toc" % "0.2")
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.11")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.1.5")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-github" % "0.8.2")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.8.2")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.8.2")
addSbtPlugin("com.alejandrohdezma" % "sbt-remove-test-from-pom" % "0.1.0")
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.12")

0 comments on commit ff46371

Please sign in to comment.