update scalafmt config. re-format build files

This commit is contained in:
xuwei-k 2025-09-23 10:28:38 +09:00
parent 7e1d39e2e4
commit ecf6be6b6b
9 changed files with 32 additions and 21 deletions

View File

@ -26,3 +26,14 @@ trailingCommas = preserve
rewrite.scala3.convertToNewSyntax = true
rewrite.scala3.newSyntax.control = false
fileOverride {
"glob:**/project/**" {
runner.dialect = scala212source3
runner.dialectOverride.allowAsForImportRename = false
}
"glob:**/*.sbt" {
runner.dialect = scala212source3
runner.dialectOverride.allowAsForImportRename = false
}
}

View File

@ -1,6 +1,6 @@
import Dependencies._
import com.typesafe.tools.mima.core.ProblemFilters._
import com.typesafe.tools.mima.core._
import Dependencies.*
import com.typesafe.tools.mima.core.ProblemFilters.*
import com.typesafe.tools.mima.core.*
import local.Scripted
import java.nio.file.{ Files, Path => JPath }
import java.util.Locale
@ -146,7 +146,7 @@ val scriptedSbtMimaSettings = Def.settings(mimaPreviousArtifacts := Set())
lazy val sbtRoot: Project = (project in file("."))
.aggregate(
(allProjects diff Seq(lmCoursierShaded))
.map(p => LocalProject(p.id)): _*
.map(p => LocalProject(p.id))*
)
.settings(
minimalSettings,
@ -912,7 +912,7 @@ lazy val sbtBig = (project in file(".big"))
// util projects used by Zinc and Lm
lazy val lowerUtils = (project in (file("internal") / "lower"))
.aggregate(lowerUtilProjects.map(p => LocalProject(p.id)): _*)
.aggregate(lowerUtilProjects.map(p => LocalProject(p.id))*)
.settings(
Utils.noPublish
)
@ -920,7 +920,7 @@ lazy val lowerUtils = (project in (file("internal") / "lower"))
lazy val upperModules = (project in (file("internal") / "upper"))
.aggregate(
((allProjects diff lowerUtilProjects)
diff Seq(bundledLauncherProj, lmCoursierShaded)).map(p => LocalProject(p.id)): _*
diff Seq(bundledLauncherProj, lmCoursierShaded)).map(p => LocalProject(p.id))*
)
.settings(
Utils.noPublish
@ -1053,7 +1053,7 @@ lazy val scriptedProjects = ScopeFilter(inAnyProject)
def customCommands: Seq[Setting[?]] = Seq(
commands += Command.command("publishLocalAllModule") { state =>
val extracted = Project.extract(state)
import extracted._
import extracted.*
val sv = get(scalaVersion)
val projs = structure.allProjectRefs
val ioOpt = projs find { case ProjectRef(_, id) => id == "ioRoot"; case _ => false }
@ -1151,7 +1151,7 @@ lazy val lmCore = (project in file("lm-core"))
val srcs = (Compile / managedSources).value
val sdirs = (Compile / managedSourceDirectories).value
val base = baseDirectory.value
import Path._
import Path.*
(((srcs --- sdirs --- base) pair (relativeTo(sdirs) | relativeTo(base) | flat)) toSeq)
},
mimaSettings,

View File

@ -9,7 +9,7 @@ import Sxr.{ sxr, SxrConf }
*/
object Docs {
def settings: Seq[Setting[_]] = Nil
def settings: Seq[Setting[?]] = Nil
/*
val siteExcludes = Set(".buildinfo", "objects.inv")

View File

@ -5,9 +5,9 @@ object HouseRulesPlugin extends AutoPlugin {
override def requires = plugins.JvmPlugin
override def trigger = allRequirements
override def projectSettings: Seq[Def.Setting[_]] = baseSettings
override def projectSettings: Seq[Def.Setting[?]] = baseSettings
lazy val baseSettings: Seq[Def.Setting[_]] = Seq(
lazy val baseSettings: Seq[Def.Setting[?]] = Seq(
scalacOptions ++= Seq("-encoding", "utf8"),
scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked"),
scalacOptions += "-language:higherKinds",

View File

@ -20,7 +20,7 @@ object Mima {
.filter(stable)
.toSet
def settings: Seq[Setting[_]] = Seq(
def settings: Seq[Setting[?]] = Seq(
MimaPlugin.autoImport.mimaPreviousArtifacts := Set.empty,
// MimaPlugin.autoImport.mimaPreviousArtifacts := {
// binaryCompatibilityVersions.map { ver =>

View File

@ -23,10 +23,10 @@ object NightlyPlugin extends AutoPlugin {
}
import autoImport.*
override def buildSettings: Seq[Setting[_]] = Seq(
override def buildSettings: Seq[Setting[?]] = Seq(
includeTestDependencies := true
)
override def projectSettings: Seq[Setting[_]] = Seq(
override def projectSettings: Seq[Setting[?]] = Seq(
)
}

View File

@ -18,7 +18,7 @@ object PublishBinPlugin extends AutoPlugin {
private val dummyDoc = taskKey[File]("").withRank(Int.MaxValue)
override val globalSettings = Seq(publishLocalBin := (()))
override val projectSettings: Seq[Def.Setting[_]] = Def settings (
override val projectSettings: Seq[Def.Setting[?]] = Def settings (
publishLocalBin := Classpaths
.publishOrSkip(publishLocalBinConfig, publishLocalBin / skip)
.value,

View File

@ -14,7 +14,7 @@ object SbtLauncherPlugin extends AutoPlugin {
import autoImport.*
override def projectConfigurations: Seq[Configuration] = Seq(SbtLaunchConfiguration)
override def projectSettings: Seq[Setting[_]] = Seq(
override def projectSettings: Seq[Setting[?]] = Seq(
libraryDependencies += Dependencies.rawLauncher % SbtLaunchConfiguration.name,
rawSbtLaunchJar := {
Classpaths.managedJars(SbtLaunchConfiguration, Set("jar"), update.value).headOption match {

View File

@ -18,12 +18,12 @@ object Utils {
publish / skip := true,
)
def crossBuild: Seq[Setting[_]] =
def crossBuild: Seq[Setting[?]] =
Seq(
crossPaths := true
)
lazy val javaOnlySettings: Seq[Setting[_]] = Seq(
lazy val javaOnlySettings: Seq[Setting[?]] = Seq(
// crossPaths := false,
// compileOrder := CompileOrder.JavaThenScala,
Compile / unmanagedSourceDirectories := Seq((Compile / javaSource).value)
@ -104,7 +104,7 @@ object Utils {
def binID = "compiler-interface-bin"
def srcID = "compiler-interface-src"
def publishPomSettings: Seq[Setting[_]] = Seq(
def publishPomSettings: Seq[Setting[?]] = Seq(
pomPostProcess := cleanPom _
)
@ -158,7 +158,7 @@ object Utils {
out
}
def keywordsSettings: Seq[Setting[_]] =
def keywordsSettings: Seq[Setting[?]] =
inConfig(Compile)(
Seq(
scalaKeywords := getScalaKeywords,
@ -194,7 +194,7 @@ object Licensed {
def seePaths(base: File, noticeString: String): Seq[File] =
seeRegex.findAllIn(noticeString).matchData.map(d => licensePath(base, d.group(1))).toList
def settings: Seq[Setting[_]] = Seq(
def settings: Seq[Setting[?]] = Seq(
notice := (baseDirectory.value / "NOTICE"),
Compile / unmanagedResources ++= notice.value +: extractLicenses.value,
extractLicenses := extractLicenses0(