Skip to content

Commit

Permalink
Update Silencer (#98)
Browse files Browse the repository at this point in the history
* Update Silencer

* Update Silencer

* Update README

* Missinglink ignore org.scala-sbt:main_2.12
  • Loading branch information
sideeffffect authored Mar 8, 2021
1 parent 2d469dd commit 37b2a6c
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 28 deletions.
24 changes: 2 additions & 22 deletions .scalafix.conf
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,7 @@ rules = [
]

OrganizeImports {
expandRelative = true
groupedImports = Merge
# IntelliJ IDEA's order so that they don't fight each other
groups = [
"java."
"*"
"scala."
]
}

RemoveUnused {
Expand All @@ -29,7 +22,8 @@ RemoveUnused {
Disable {
ifSynthetic = [
"java/io/Serializable"
"scala/Any"
"scala/Option.option2Iterable"
"scala/Predef.any2stringadd"
]
}

Expand All @@ -50,17 +44,3 @@ DisableSyntax {
noWhileLoops = true
noXml = true
}

ExplicitResultTypes {
unsafeShortenNames = true

fatalWarnings = true

# these apply to non-implicits
memberKind = [Def, Val]
memberVisibility = [Public, Protected]

# turn to the max...
skipSimpleDefinitions = false
skipLocalImplicits = false
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ sbt plugin for decent Scala

```scala
// project/plugins.sbt
addSbtPlugin("com.github.sideeffffect" % "sbt-decent-scala" % "0.5.0")
addSbtPlugin("com.github.sideeffffect" % "sbt-decent-scala" % "0.6.4")
```


Expand Down
7 changes: 4 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import sbt.Defaults.sbtPluginExtra

Global / onChangedBuildSource := ReloadOnSourceChanges
ThisBuild / turbo := true
ThisBuild / scalaVersion := "2.12.12"
ThisBuild / scalaVersion := "2.12.13"

lazy val sbtDecentScala = project
.in(file("."))
Expand Down Expand Up @@ -53,10 +53,11 @@ lazy val commonSettings: List[Def.Setting[_]] = List(
),
),
missinglinkExcludedDependencies ++= List(
moduleFilter(organization = "org.apache.logging.log4j", name = "log4j-core"),
moduleFilter(organization = "org.apache.logging.log4j", name = "log4j-slf4j-impl"),
moduleFilter(organization = "com.squareup.okhttp3", name = "okhttp"),
moduleFilter(organization = "com.timushev.sbt", name = "sbt-rewarn"),
moduleFilter(organization = "org.apache.logging.log4j", name = "log4j-core"),
moduleFilter(organization = "org.apache.logging.log4j", name = "log4j-slf4j-impl"),
moduleFilter(organization = "org.scala-sbt", name = "main_2.12"),
),
mimaPreviousArtifacts := previousStableVersion.value.map { version =>
sbtPluginExtra(
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ object Dependencies {
val sbtScalafix = "0.9.26"
val sbtTpolecat = "0.1.16"
val scaluzzi = "0.1.18"
val silencer = "1.7.1"
val silencer = "1.7.3"

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ object DecentScalaPlugin extends AutoPlugin {
},
mimaPreviousArtifacts := previousStableVersion.value
.map(organization.value %% moduleName.value % _)
.toList
.toSet,
) ++
addCommandAlias("check", "; lint; +missinglinkCheck; +mimaReportBinaryIssues; +test") ++
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ object Dependencies {
val kindProjector: String = "0.10.3"
val organizeImports: String = "0.5.0"
val scaluzzi: String = "0.1.18"
val silencer: String = "1.7.1"
val silencer: String = "1.7.3"

}

Expand Down

0 comments on commit 37b2a6c

Please sign in to comment.