Skip to content

Commit ff46371

Browse files
Prepare repository for next .github release and SBT build improvements (#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
1 parent fa50c77 commit ff46371

File tree

8 files changed

+23
-29
lines changed

8 files changed

+23
-29
lines changed

AUTHORS.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@
88

99
The maintainers of the project are:
1010

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

1314
## Contributors
1415

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

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

build.sbt

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,30 @@ ThisBuild / organization := "org.scala-exercises"
22
ThisBuild / githubOrganization := "47degrees"
33
ThisBuild / scalaVersion := V.scala212
44

5+
publish / skip := true
6+
57
addCommandAlias(
68
"ci-test",
7-
";scalafmtCheckAll; scalafmtSbtCheck; +test; +publishLocal; sbt-exercise/test; sbt-exercise/scripted"
9+
";scalafmtCheckAll; scalafmtSbtCheck; +test; +publishLocal; sbt-exercise/scripted"
810
)
9-
addCommandAlias("ci-docs", ";github; project-docs/mdoc; headerCreateAll")
11+
addCommandAlias("ci-docs", ";github; mdoc; headerCreateAll")
12+
addCommandAlias("ci-publish", ";github; ci-release")
1013

1114
lazy val V = new {
1215
val cats: String = "2.1.1"
1316
val collectioncompat: String = "2.1.6"
1417
val github4s: String = "0.24.0"
15-
val http4s: String = "0.21.3"
18+
val http4s: String = "0.21.4"
1619
val runtime: String = "0.6.0"
1720
val scala: String = "2.13.2"
1821
val scala212: String = "2.12.11"
1922
val scalacheck: String = "1.14.3"
2023
val scalacheckShapeless: String = "1.2.5"
2124
val scalamacros: String = "2.1.1"
2225
val scalariform: String = "0.2.10"
23-
val scalatest: String = "3.1.1"
26+
val scalatest: String = "3.1.2"
2427
}
2528

26-
lazy val root = project
27-
.in(file("."))
28-
.settings(moduleName := "sbt-exercise")
29-
.settings(skip in publish := true)
30-
.aggregate(definitions, compiler, `sbt-exercise`)
31-
.dependsOn(definitions, compiler, `sbt-exercise`)
32-
3329
lazy val definitions = (project in file("definitions"))
3430
.settings(name := "definitions")
3531
.settings(
@@ -69,10 +65,8 @@ lazy val `sbt-exercise` = (project in file("sbt-exercise"))
6965
.settings(name := "sbt-exercise")
7066
.settings(
7167
scalacOptions -= "-Xfatal-warnings",
72-
libraryDependencies ++= Seq(
73-
"org.typelevel" %% "cats-core" % V.cats % Compile
74-
),
7568
scalacOptions += "-Ypartial-unification",
69+
libraryDependencies += "org.typelevel" %% "cats-core" % V.cats % Compile,
7670
addCompilerPlugin("org.scalamacros" % "paradise" % V.scalamacros cross CrossVersion.full),
7771
// Leverage build info to populate compiler classpath--
7872
compilerClasspath := { fullClasspath in (compiler, Compile) }.value,
@@ -102,10 +96,7 @@ lazy val `sbt-exercise` = (project in file("sbt-exercise"))
10296
.enablePlugins(SbtPlugin)
10397
.enablePlugins(BuildInfoPlugin)
10498

105-
lazy val `project-docs` = (project in file(".docs"))
106-
.aggregate(definitions, compiler)
107-
.settings(moduleName := "sbt-exercise-project-docs")
108-
.settings(mdocIn := file(".docs"))
99+
lazy val documentation = project
109100
.settings(mdocOut := file("."))
110-
.settings(skip in publish := true)
101+
.settings(publish / skip := true)
111102
.enablePlugins(MdocPlugin)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

project/plugins.sbt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
2-
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.1.5")
3-
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.4")
4-
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")
5-
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
6-
addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.8.1")
7-
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.8.1")
8-
addSbtPlugin("com.alejandrohdezma" % "sbt-mdoc-toc" % "0.2")
9-
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.11")
1+
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
2+
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.1.5")
3+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")
4+
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")
5+
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
6+
addSbtPlugin("com.alejandrohdezma" % "sbt-github" % "0.8.2")
7+
addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.8.2")
8+
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.8.2")
9+
addSbtPlugin("com.alejandrohdezma" % "sbt-remove-test-from-pom" % "0.1.0")
10+
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.12")

0 commit comments

Comments
 (0)