Prepare repository for next .github release and SBT build improveme…

…nts (#4) * Removes root project * Bumps deps up * Bumps sbt up * Updates command aliases * Moves .docs to docs. Updates sbt module too * Removes sbt-mdoc-toc since it is not being used * Updates sbt plugins * Removes unused defs and vals * Removes cross-compilation with Scala 2.12
scala-exercises · Jun 9, 2020 · b951b8a · b951b8a
1 parent 2dfcf1f
commit b951b8a
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 31 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,28 +1,22 @@
 ThisBuild / organization := "org.scala-exercises"
 ThisBuild / githubOrganization := "47degrees"
 ThisBuild / scalaVersion := V.scala
-ThisBuild / crossScalaVersions := Seq(V.scala212, V.scala)
 
-addCommandAlias("ci-test", ";scalafmtCheckAll; scalafmtSbtCheck; +test")
-addCommandAlias("ci-docs", ";github; project-docs/mdoc; headerCreateAll")
+publish / skip := true
+
+addCommandAlias("ci-test", "scalafmtCheckAll; scalafmtSbtCheck; test")
+addCommandAlias("ci-docs", "github; mdoc; headerCreateAll")
+addCommandAlias("ci-publish", "github; ci-release")
 
 lazy val V = new {
   val cats: String      = "2.1.1"
   val circe: String     = "0.13.0"
   val classutil: String = "1.5.1"
-  val http4s: String    = "0.21.3"
+  val http4s: String    = "0.21.4"
   val scala: String     = "2.13.2"
-  val scala212: String  = "2.12.11"
-  val scalatest: String = "3.1.1"
+  val scalatest: String = "3.1.2"
 }
 
-lazy val root = project
-  .in(file("."))
-  .settings(moduleName := "scala-exercises-runtime")
-  .settings(skip in publish := true)
-  .aggregate(runtime, `evaluator-client`)
-  .dependsOn(runtime, `evaluator-client`)
-
 lazy val runtime = project
   .dependsOn(`evaluator-client`)
   .settings(name := "runtime")
@@ -46,10 +40,7 @@ lazy val `evaluator-client` = project
     )
   )
 
-lazy val `project-docs` = (project in file(".docs"))
-  .aggregate(runtime, `evaluator-client`)
-  .settings(moduleName := "runtime-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 → docs/AUTHORS.md b/.docs/AUTHORS.md → docs/AUTHORS.md
diff --git a/.docs/CODE_OF_CONDUCT.md → docs/CODE_OF_CONDUCT.md b/.docs/CODE_OF_CONDUCT.md → docs/CODE_OF_CONDUCT.md
diff --git a/.docs/CONTRIBUTING.md → docs/CONTRIBUTING.md b/.docs/CONTRIBUTING.md → docs/CONTRIBUTING.md
diff --git a/.docs/LICENSE.md → docs/LICENSE.md b/.docs/LICENSE.md → docs/LICENSE.md
diff --git a/.docs/NOTICE.md → docs/NOTICE.md b/.docs/NOTICE.md → docs/NOTICE.md
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.10
+sbt.version=1.3.12
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,9 +1,10 @@
-addSbtPlugin("com.eed3si9n"        % "sbt-buildinfo"     % "0.9.0")
-addSbtPlugin("org.scoverage"       % "sbt-scoverage"     % "1.6.1")
-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("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")
diff --git a/runtime/src/test/scala/com/fortysevendeg/exercises/ExampleTarget.scala b/runtime/src/test/scala/com/fortysevendeg/exercises/ExampleTarget.scala
@@ -31,5 +31,4 @@ object ExampleTarget extends AnyFlatSpec with Matchers {
   def throwsExceptionMethod(): Unit =
     throw new ExampleException
 
-  def takesEitherMethod(either: Either[_, _]): Boolean = true
 }
diff --git a/runtime/src/test/scala/com/fortysevendeg/exercises/LibraryDiscoverySpec.scala b/runtime/src/test/scala/com/fortysevendeg/exercises/LibraryDiscoverySpec.scala
@@ -29,7 +29,7 @@ class LibraryDiscoverySpec extends AnyFunSpec with Matchers {
 
   describe("exercise discovery") {
     it("should be able to load libraries") {
-      val (errors, discovered) = Exercises.discoverLibraries()
+      val (_, discovered) = Exercises.discoverLibraries()
 
       discovered.toSet shouldEqual Set(
         LibraryA,
@@ -39,7 +39,7 @@ class LibraryDiscoverySpec extends AnyFunSpec with Matchers {
     }
 
     it("libraries that are not objects should trigger errors") {
-      val (errors, discovered) = Exercises.discoverLibraries()
+      val (errors, _) = Exercises.discoverLibraries()
 
       errors.size shouldEqual 1
     }