diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index ce9f08628..f298452cb 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.8.0 c7afd84c5921949600cd336bbc72acbb41d2342b + +# Scala Steward: Reformat with scalafmt 3.8.3 +fd4b05723aa0d0ab98f75475ed73c61549a08878 diff --git a/.scalafmt.conf b/.scalafmt.conf index c911c2cee..31d427c8a 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.1 +version = 3.8.3 runner.dialect = scala212 project.git = true diff --git a/build.sbt b/build.sbt index bfe4319f6..4afb5cd89 100644 --- a/build.sbt +++ b/build.sbt @@ -430,7 +430,8 @@ lazy val zincCompileCore = (projectMatrix in internalPath / "zinc-compile-core") ), Test / unmanagedJars := Seq((compilerBridge212 / Compile / packageSrc).value).classpath, Compile / managedSourceDirectories += (Compile / generateContrabands / sourceManaged).value, - Compile / generateContrabands / sourceManaged := (internalPath / "zinc-compile-core" / "src" / "main" / "contraband-java").getAbsoluteFile, + Compile / generateContrabands / sourceManaged := (internalPath / "zinc-compile-core" / "src" / "main" / "contraband-java") + .getAbsoluteFile, mimaSettings, mimaBinaryIssueFilters ++= ZincBuildUtil.excludeInternalProblems, ) diff --git a/internal/compiler-bridge/src/main/scala/xsbt/Dependency.scala b/internal/compiler-bridge/src/main/scala/xsbt/Dependency.scala index 1241b9468..e7425ca1b 100644 --- a/internal/compiler-bridge/src/main/scala/xsbt/Dependency.scala +++ b/internal/compiler-bridge/src/main/scala/xsbt/Dependency.scala @@ -452,7 +452,8 @@ final class Dependency(val global: CallbackGlobal) extends LocateClassFile with val inheritanceSymbols = inheritanceTypes.flatMap(flattenTypeToSymbols) debuglog( - "Parent types for " + tree.symbol + " (self: " + self.tpt.tpe + "): " + inheritanceTypes + " with symbols " + inheritanceSymbols + "Parent types for " + tree.symbol + " (self: " + self.tpt + .tpe + "): " + inheritanceTypes + " with symbols " + inheritanceSymbols .map(_.fullName) ) diff --git a/internal/zinc-apiinfo/src/main/scala/xsbt/api/SameAPI.scala b/internal/zinc-apiinfo/src/main/scala/xsbt/api/SameAPI.scala index 61701572f..bc926caa5 100644 --- a/internal/zinc-apiinfo/src/main/scala/xsbt/api/SameAPI.scala +++ b/internal/zinc-apiinfo/src/main/scala/xsbt/api/SameAPI.scala @@ -101,7 +101,8 @@ class SameAPI(includePrivate: Boolean, includeParamNames: Boolean) { ): Boolean = debug( sameStrings(a.keySet, b.keySet), - "\tDefinition strings differed (a: " + (a.keySet -- b.keySet) + ", b: " + (b.keySet -- a.keySet) + ")" + "\tDefinition strings differed (a: " + (a.keySet -- b.keySet) + ", b: " + (b.keySet -- a + .keySet) + ")" ) && zippedEntries(a, b).forall(tupled(sameNamedDefinitions)) @@ -236,7 +237,8 @@ class SameAPI(includePrivate: Boolean, includeParamNames: Boolean) { def sameFieldSpecificAPI(a: FieldLike, b: FieldLike): Boolean = debug( sameFieldCategory(a, b), - "Different field categories (" + a.name + "=" + a.getClass.getName + " -- " + a.name + "=" + a.getClass.getName + ")" + "Different field categories (" + a.name + "=" + a.getClass.getName + " -- " + a.name + "=" + a + .getClass.getName + ")" ) && debug(sameType(a.tpe, b.tpe), "Different field type for " + a.name) @@ -350,7 +352,8 @@ class SameAPI(includePrivate: Boolean, includeParamNames: Boolean) { def differentCategory(label: String, a: AnyRef, b: AnyRef): Boolean = debug( flag = false, - "Different category of " + label + " (" + a.getClass.getName + " and " + b.getClass.getName + ") for (" + a + " and " + b + ")" + "Different category of " + label + " (" + a.getClass.getName + " and " + b.getClass + .getName + ") for (" + a + " and " + b + ")" ) def sameParameterized(a: Parameterized, b: Parameterized): Boolean = diff --git a/internal/zinc-persist/src/main/scala/sbt/internal/inc/binary/converters/ProtobufDefaults.scala b/internal/zinc-persist/src/main/scala/sbt/internal/inc/binary/converters/ProtobufDefaults.scala index 6d801c226..792e397de 100644 --- a/internal/zinc-persist/src/main/scala/sbt/internal/inc/binary/converters/ProtobufDefaults.scala +++ b/internal/zinc-persist/src/main/scala/sbt/internal/inc/binary/converters/ProtobufDefaults.scala @@ -89,7 +89,7 @@ object ProtobufDefaults { object Feedback { implicit class StringToException(str: String) { - def `!!` : Nothing = sys.error(str) + def `!!`: Nothing = sys.error(str) } object Writers {