Use scalafix to update scala 2.13.3, silencer 1.7.0 (#29367)

This commit is contained in:
ohze.net 2020-12-09 15:20:13 +07:00 committed by GitHub
parent 388fb73beb
commit 9416dedad7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
58 changed files with 131 additions and 115 deletions

View file

@ -1,5 +1,7 @@
import akka.{ AutomaticModuleName, CopyrightHeaderForBuild, Paradox, ScalafixIgnoreFilePlugin }
ThisBuild / scalafixScalaBinaryVersion := scalaBinaryVersion.value
enablePlugins(
UnidocRoot,
UnidocWithPrValidation,
@ -29,11 +31,11 @@ addCommandAlias("applyCodeStyle", "headerCreateAll; javafmtAll; scalafmtAll")
addCommandAlias(
name = "fixall",
value =
";scalafixEnable; compile:scalafix; test:scalafix; multi-jvm:scalafix; scalafmtAll; test:compile; multi-jvm:compile; reload")
";scalafixEnable; scalafixAll; scalafmtAll; test:compile; multi-jvm:compile; reload")
addCommandAlias(
name = "sortImports",
value = ";scalafixEnable; compile:scalafix SortImports; test:scalafix SortImports; scalafmtAll")
value = ";scalafixEnable; scalafixAll SortImports; scalafmtAll")
import akka.AkkaBuild._
import akka.{ AkkaBuild, Dependencies, OSGi, Protobuf, SigarLoader, VersionGenerator }
@ -248,7 +250,7 @@ lazy val docs = akkaModule("akka-docs")
StreamOperatorsIndexGenerator,
Jdk9)
.disablePlugins(MimaPlugin, WhiteSourcePlugin)
.disablePlugins(ScalafixPlugin)
.disablePlugins((if (ScalafixSupport.fixTestScope) Nil else Seq(ScalafixPlugin)): _*)
lazy val jackson = akkaModule("akka-serialization-jackson")
.dependsOn(
@ -332,6 +334,7 @@ lazy val protobuf = akkaModule("akka-protobuf")
.settings(AutomaticModuleName.settings("akka.protobuf"))
.enablePlugins(ScaladocNoVerificationOfDiagrams)
.disablePlugins(MimaPlugin)
.settings(autoScalaLibrary := false) // Pure java project
lazy val protobufV3 = akkaModule("akka-protobuf-v3")
.settings(OSGi.protobufV3)