Skip to content

Commit 5eab2f5

Browse files
committed
Remove evicted plugin
1 parent e3997b1 commit 5eab2f5

File tree

5 files changed

+17
-10
lines changed

5 files changed

+17
-10
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
run: sbt ++${{ matrix.scala }} mdocCheck
6363

6464
- name: Check dependencies
65-
run: sbt ++${{ matrix.scala }} evictionCheck undeclaredCompileDependenciesTest unusedCompileDependenciesTest dependencyCheckAggregate
65+
run: sbt ++${{ matrix.scala }} evicted undeclaredCompileDependenciesTest unusedCompileDependenciesTest dependencyCheckAggregate
6666

6767
- name: Build and test
6868
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" % "0.0.0+67-ed9e4cf5+20210305-1051-SNAPSHOT")
36+
addSbtPlugin("nz.co.bottech" % "sbt-scala2plantuml" % "0.0.0+68-e3997b1f+20210305-1242-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 0.0.0+67-ed9e4cf5+20210305-1051-SNAPSHOT
52+
Scala2PlantUML version 0.0.0+68-e3997b1f+20210305-1242-SNAPSHOT
5353
Usage: scala2plantuml [options] symbol
5454
5555
Scala2PlantUML generates PlantUML Class Diagrams from Scala SemanticDB files.

build.sbt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ addCommandAlias(
1919
"+versionPolicyCheck",
2020
"+githubWorkflowCheck",
2121
"mdocCheck",
22-
"+evictionCheck",
22+
"evicted",
2323
"+undeclaredCompileDependenciesTest",
2424
"+unusedCompileDependenciesTest",
2525
"+dependencyCheckAggregate",
@@ -43,6 +43,8 @@ inThisBuild(
4343
crossScalaVersions := supportedScalaVersions,
4444
dependencyCheckAssemblyAnalyzerEnabled := Some(false),
4545
description := "Scala2PlantUML generates PlantUML diagrams from Scala code.",
46+
// TODO: Add this when sbt 1.5.0 is released.
47+
// evictionErrorLevel := Level.Error,
4648
homepage := Some(url("https://github.com/BotTech/scala2plantuml")),
4749
licenses := List("MIT" -> url("https://github.com/BotTech/scala2plantuml/blob/main/LICENSE")),
4850
organization := "nz.co.bottech",
@@ -53,7 +55,7 @@ inThisBuild(
5355
WorkflowStep.Sbt(List("mdocCheck"), name = Some("Check documentation has been generated")),
5456
WorkflowStep.Sbt(
5557
List(
56-
"evictionCheck",
58+
"evicted",
5759
"undeclaredCompileDependenciesTest",
5860
"unusedCompileDependenciesTest",
5961
"dependencyCheckAggregate"
@@ -76,7 +78,7 @@ inThisBuild(
7678
githubWorkflowPublishTargetBranches := List(RefPredicate.StartsWith(Ref.Tag("v"))),
7779
githubWorkflowTargetTags ++= Seq("v*"),
7880
versionPolicyIntention := Compatibility.BinaryAndSourceCompatible,
79-
versionScheme := Some("semver-spec")
81+
versionScheme := Some("early-semver")
8082
)
8183
)
8284

@@ -116,9 +118,6 @@ lazy val root = (project in file("."))
116118
lazy val core = project
117119
.settings(libraryProjectSettings)
118120
.settings(
119-
name := s"${(LocalRootProject / name).value}",
120-
semanticdbEnabled := true,
121-
semanticdbVersion := "4.4.10",
122121
libraryDependencies ++= collectionsCompatibilityDependency.value,
123122
libraryDependencies ++= List(
124123
"org.scalameta" %% "scalameta" % semanticdbVersion.value,
@@ -128,6 +127,9 @@ lazy val core = project
128127
"ch.qos.logback" % "logback-core" % logbackVersion % Test,
129128
"com.lihaoyi" %% "utest" % utestVersion % Test
130129
),
130+
name := s"${(LocalRootProject / name).value}",
131+
semanticdbEnabled := true,
132+
semanticdbVersion := "4.4.10",
131133
testFrameworks += new TestFramework("utest.runner.Framework"),
132134
Test / managedSourceDirectories += (Test / semanticdbTargetRoot).value,
133135
Test / fullClasspath += (Test / semanticdbTargetRoot).value

project/SbtSubProjectPluginPlugin.scala

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,16 @@ object SbtSubProjectPluginPlugin extends AutoPlugin {
1111
override def projectSettings: Seq[Def.Setting[_]] =
1212
List(
1313
crossScalaVersions := Nil,
14+
evicted := evictedTask.value,
1415
skip := skipTask.value,
1516
update := updateTask.value
1617
)
1718

19+
private def evictedTask = Def.task {
20+
val report = update.value
21+
EvictionWarning(ivyModule.value, (evicted / evictionWarningOptions).value, report)
22+
}
23+
1824
private def skipTask =
1925
Def.task {
2026
val versions =

project/plugins.sbt

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

0 commit comments

Comments
 (0)