Skip to content

Commit e3997b1

Browse files
committed
Add evicted check
1 parent ed9e4cf commit e3997b1

File tree

4 files changed

+22
-14
lines changed

4 files changed

+22
-14
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,14 @@ jobs:
5555
- name: Check formatting and style
5656
run: sbt ++${{ matrix.scala }} scalafmtCheckAll scalastyle
5757

58-
- name: Check documentation has been generated
59-
run: sbt ++${{ matrix.scala }} doc/mdoc
60-
61-
- name: Check declared dependencies
62-
run: sbt ++${{ matrix.scala }} undeclaredCompileDependenciesTest unusedCompileDependenciesTest
58+
- name: Check version adheres to the policy
59+
run: sbt ++${{ matrix.scala }} versionPolicyCheck
6360

64-
- name: Check for known vulnerabilities
65-
run: sbt ++${{ matrix.scala }} dependencyCheckAggregate
61+
- name: Check documentation has been generated
62+
run: sbt ++${{ matrix.scala }} mdocCheck
6663

67-
- name: Check binary compatibility
68-
run: sbt ++${{ matrix.scala }} mimaReportBinaryIssues
64+
- name: Check dependencies
65+
run: sbt ++${{ matrix.scala }} evictionCheck undeclaredCompileDependenciesTest unusedCompileDependenciesTest dependencyCheckAggregate
6966

7067
- name: Build and test
7168
run: sbt ++${{ matrix.scala }} test scripted

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ For most use cases you should add Scala2PlantUML as a global plugin since your b
3333
Create `~/.sbt/1.0/plugins/scala2PlantUML.sbt` containing:
3434

3535
```text
36-
addSbtPlugin("nz.co.bottech" % "sbt-scala2plantuml" % "9f5ed000bd2bc569a7b138dfa02eb575c79cf1f1-SNAPSHOT")
36+
addSbtPlugin("nz.co.bottech" % "sbt-scala2plantuml" % "0.0.0+67-ed9e4cf5+20210305-1051-SNAPSHOT")
3737
```
3838

3939
## CLI
@@ -49,7 +49,7 @@ cs install --channel https://git.io/Jqv1i scala2plantuml
4949
### Usage
5050

5151
```text
52-
Scala2PlantUML version 9f5ed000bd2bc569a7b138dfa02eb575c79cf1f1-SNAPSHOT
52+
Scala2PlantUML version 0.0.0+67-ed9e4cf5+20210305-1051-SNAPSHOT
5353
Usage: scala2plantuml [options] symbol
5454
5555
Scala2PlantUML generates PlantUML Class Diagrams from Scala SemanticDB files.

build.sbt

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ addCommandAlias(
1919
"+versionPolicyCheck",
2020
"+githubWorkflowCheck",
2121
"mdocCheck",
22+
"+evictionCheck",
2223
"+undeclaredCompileDependenciesTest",
2324
"+unusedCompileDependenciesTest",
2425
"+dependencyCheckAggregate",
@@ -51,10 +52,14 @@ inThisBuild(
5152
WorkflowStep.Sbt(List("versionPolicyCheck"), name = Some("Check version adheres to the policy")),
5253
WorkflowStep.Sbt(List("mdocCheck"), name = Some("Check documentation has been generated")),
5354
WorkflowStep.Sbt(
54-
List("undeclaredCompileDependenciesTest", "unusedCompileDependenciesTest"),
55-
name = Some("Check declared dependencies")
55+
List(
56+
"evictionCheck",
57+
"undeclaredCompileDependenciesTest",
58+
"unusedCompileDependenciesTest",
59+
"dependencyCheckAggregate"
60+
),
61+
name = Some("Check dependencies")
5662
),
57-
WorkflowStep.Sbt(List("dependencyCheckAggregate"), name = Some("Check for known vulnerabilities")),
5863
WorkflowStep.Sbt(List("test", "scripted"), name = Some("Build and test"))
5964
),
6065
githubWorkflowPublish := List(
@@ -179,6 +184,11 @@ lazy val docs = (project in file("doc-templates"))
179184
.enablePlugins(MdocPlugin)
180185
.settings(metaProjectSettings)
181186
.settings(
187+
libraryDependencies := libraryDependencies.value.map { module =>
188+
if (module.name.startsWith("mdoc"))
189+
module.exclude("io.undertow", "undertow-core").exclude("org.jboss.xnio", "xnio-nio")
190+
else module
191+
},
182192
mdocOut := (ThisBuild / baseDirectory).value,
183193
mdocVariables := Map(
184194
"VERSION" -> version.value

project/plugins.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
addSbtPlugin("ch.epfl.scala" % "sbt-eviction-rules" % "1.0.0-RC1")
12
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.0.0-RC5")
23
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.10.1")
34
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")

0 commit comments

Comments
 (0)