diff --git a/AUTHORS.md b/AUTHORS.md index e4118ad..1429482 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -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) \ No newline at end of file +- [![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) \ No newline at end of file diff --git a/build.sbt b/build.sbt index 82aeb76..fdf4a68 100755 --- a/build.sbt +++ b/build.sbt @@ -2,17 +2,20 @@ 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" @@ -20,16 +23,9 @@ lazy val V = new { 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( @@ -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, @@ -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) diff --git a/.docs/AUTHORS.md b/docs/AUTHORS.md similarity index 100% rename from .docs/AUTHORS.md rename to docs/AUTHORS.md diff --git a/.docs/CODE_OF_CONDUCT.md b/docs/CODE_OF_CONDUCT.md similarity index 100% rename from .docs/CODE_OF_CONDUCT.md rename to docs/CODE_OF_CONDUCT.md diff --git a/.docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md similarity index 100% rename from .docs/CONTRIBUTING.md rename to docs/CONTRIBUTING.md diff --git a/.docs/LICENSE.md b/docs/LICENSE.md similarity index 100% rename from .docs/LICENSE.md rename to docs/LICENSE.md diff --git a/.docs/NOTICE.md b/docs/NOTICE.md similarity index 100% rename from .docs/NOTICE.md rename to docs/NOTICE.md diff --git a/project/plugins.sbt b/project/plugins.sbt index 45d41de..a2cfc37 100755 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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")