diff --git a/sbt-app/src/sbt-test/actions/completions/build.sbt b/sbt-app/src/sbt-test/actions/completions/build.sbt
index 072ab22e7..76be7c404 100644
--- a/sbt-app/src/sbt-test/actions/completions/build.sbt
+++ b/sbt-app/src/sbt-test/actions/completions/build.sbt
@@ -15,7 +15,7 @@ def completionsParser(state: State) =
   {
     val notQuoted = (NotQuoted ~ any.*) map { case (nq, s) => (nq +: s).mkString }
     val quotedOrUnquotedSingleArgument = Space ~> (StringVerbatim | StringEscapable | notQuoted)
-    applyEffect(token(quotedOrUnquotedSingleArgument ?? "" examples ("", " ")))(runCompletions(state))
+    applyEffect(token((quotedOrUnquotedSingleArgument ?? "").examples("", " ")))(runCompletions(state))
   }
 def runCompletions(state: State)(input: String): State = {
   val xs = Parser.completions(state.combinedParser, input, 9).get map {
diff --git a/sbt-app/src/sbt-test/actions/configuration-delegation/build.sbt b/sbt-app/src/sbt-test/actions/configuration-delegation/build.sbt
index b93d6ca15..cdba97d87 100644
--- a/sbt-app/src/sbt-test/actions/configuration-delegation/build.sbt
+++ b/sbt-app/src/sbt-test/actions/configuration-delegation/build.sbt
@@ -5,7 +5,7 @@ lazy val bar = taskKey[Unit]("Runs the bar task")
 def makeFoo(config: Configuration): Setting[?] = 
   config / foo := IO.write(file(s"${config.name}-foo"), "foo")
 
-lazy val PerformanceTest = (config("pt") extend Test)
+lazy val PerformanceTest = config("pt").extend(Test)
 
 lazy val root = (project in file("."))
   .configs(PerformanceTest)
diff --git a/sbt-app/src/sbt-test/actions/depends-on/build.sbt b/sbt-app/src/sbt-test/actions/depends-on/build.sbt
index b9039dda9..1b5744e9b 100644
--- a/sbt-app/src/sbt-test/actions/depends-on/build.sbt
+++ b/sbt-app/src/sbt-test/actions/depends-on/build.sbt
@@ -2,7 +2,7 @@
 
 import sbt.TupleSyntax.*
 lazy val root = (project in file(".")).settings(
-  a := (baseDirectory mapN (b => if ((b / "succeed").exists) () else sys.error("fail"))).value,
+  a := baseDirectory.mapN(b => if ((b / "succeed").exists) () else sys.error("fail")).value,
   // deprecated?
   // b := (a.task(at => nop dependsOn(at))).value,
   c := (a mapN { _ => () }).value,
diff --git a/sbt-app/src/sbt-test/actions/external-doc/build.sbt b/sbt-app/src/sbt-test/actions/external-doc/build.sbt
index 2b4bfd8f5..ac76a0a4d 100644
--- a/sbt-app/src/sbt-test/actions/external-doc/build.sbt
+++ b/sbt-app/src/sbt-test/actions/external-doc/build.sbt
@@ -17,7 +17,7 @@ val aResolver = Def.setting {
 
 val bResolver = Def.setting {
   val dir = (ThisBuild / baseDirectory).value / "b-repo"
-  Resolver.file("b-resolver", dir)(Resolver.defaultIvyPatterns)
+  Resolver.file("b-resolver", dir)(using Resolver.defaultIvyPatterns)
 }
 
 val apiBaseSetting = apiURL := Some(apiBase(name.value))
diff --git a/sbt-app/src/sbt-test/actions/state/build.sbt b/sbt-app/src/sbt-test/actions/state/build.sbt
index 7433c3c01..3cdf14189 100644
--- a/sbt-app/src/sbt-test/actions/state/build.sbt
+++ b/sbt-app/src/sbt-test/actions/state/build.sbt
@@ -14,11 +14,11 @@ val check = inputKey[Unit]("")
 val sample = AttributeKey[Int]("demo-key")
 val dummyKey = taskKey[Unit]("")
 
-def updateDemoInit = state map { s => (s get sample getOrElse 9) + 1 }
+def updateDemoInit = state map { s => s.get(sample).getOrElse(9) + 1 }
 
 lazy val root = (project in file(".")).
   settings(
-    updateDemo := (updateDemoInit updateState demoState).value,
+    updateDemo := updateDemoInit.updateState(demoState).value,
     check := checkInit.evaluated,
     inMemorySetting,
     persistedSetting,
@@ -27,19 +27,19 @@ lazy val root = (project in file(".")).
     dummyKey := (),
   )
 
-def demoState(s: State, i: Int): State = s put (sample, i + 1)
+def demoState(s: State, i: Int): State = s.put(sample, i + 1)
 
 def checkInit: Initialize[InputTask[Unit]] = Def inputTask {
   val key = (token(Space ~> IntBasic) ~ token(Space ~> IntBasic).?).parsed
   val (curExpected, prevExpected) = key
   val value = updateDemo.value
-  val prev = state.value get sample
+  val prev = state.value.get(sample)
   assert(value == curExpected, s"Expected current value to be $curExpected, got $value")
   assert(prev == prevExpected, s"Expected previous value to be $prevExpected, got $prev")
 }
 
-def  inMemorySetting = keep    :=  (getPrevious(keep)    map { case None =>  3; case Some(x) => x + 1}  keepAs(keep)).value
-def persistedSetting = persist := (loadPrevious(persist) map { case None => 17; case Some(x) => x + 1} storeAs(persist)).value
+def  inMemorySetting = keep    :=  getPrevious(keep)   .map { case None =>  3; case Some(x) => x + 1}.keepAs(keep).value
+def persistedSetting = persist := loadPrevious(persist).map { case None => 17; case Some(x) => x + 1}.storeAs(persist).value
 
 def  inMemoryCheck = checkKeep    := (inputCheck( (ctx, s) => Space ~> str( getFromContext(   keep, ctx, s)) )).evaluated
 def persistedCheck = checkPersist := (inputCheck( (ctx, s) => Space ~> str(loadFromContext(persist, ctx, s)) )).evaluated
diff --git a/sbt-app/src/sbt-test/dependency-management/artifact/build.sbt b/sbt-app/src/sbt-test/dependency-management/artifact/build.sbt
index 24c87e9e4..1a440e52f 100644
--- a/sbt-app/src/sbt-test/dependency-management/artifact/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/artifact/build.sbt
@@ -63,7 +63,7 @@ def org = "test"
 def mainArtifact = Artifact(artifactID, tpe, ext, classifier)
 
 // define the IDs to use for publishing and retrieving
-def publishedID = org % artifactID % vers artifacts(mainArtifact)
+def publishedID = (org % artifactID % vers).artifacts(mainArtifact)
 def retrieveID = org % "test-retrieve" % "2.0"
 
 // check that the test class is on the compile classpath, either because it was compiled or because it was properly retrieved
@@ -80,5 +80,5 @@ def checkTask(classpath: TaskKey[Classpath]) =
 // use the user local resolver to fetch the SNAPSHOT version of the compiler-bridge
 def userLocalFileResolver(appConfig: AppConfiguration): Resolver = {
   val ivyHome = appConfig.provider.scalaProvider.launcher.ivyHome
-  Resolver.file("User Local", ivyHome / "local")(Resolver.defaultIvyPatterns)
+  Resolver.file("User Local", ivyHome / "local")(using Resolver.defaultIvyPatterns)
 }
diff --git a/sbt-app/src/sbt-test/dependency-management/cache-classifiers/multi.sbt b/sbt-app/src/sbt-test/dependency-management/cache-classifiers/multi.sbt
index 9dc58ff79..9db6cce45 100644
--- a/sbt-app/src/sbt-test/dependency-management/cache-classifiers/multi.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/cache-classifiers/multi.sbt
@@ -33,5 +33,5 @@ val a = project
 // use the user local resolver to fetch the SNAPSHOT version of the compiler-bridge
 def userLocalFileResolver(appConfig: AppConfiguration): Resolver = {
   val ivyHome = appConfig.provider.scalaProvider.launcher.ivyHome
-  Resolver.file("User Local", ivyHome / "local")(Resolver.defaultIvyPatterns)
+  Resolver.file("User Local", ivyHome / "local")(using Resolver.defaultIvyPatterns)
 }
diff --git a/sbt-app/src/sbt-test/dependency-management/classifier-report/build.sbt b/sbt-app/src/sbt-test/dependency-management/classifier-report/build.sbt
index 56b15ea03..3e03fc9de 100644
--- a/sbt-app/src/sbt-test/dependency-management/classifier-report/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/classifier-report/build.sbt
@@ -2,7 +2,7 @@ lazy val check = taskKey[Unit]("check classifier in update report")
 
 lazy val root = (project in file(".")).settings(
   scalaVersion := "2.13.16",
-  libraryDependencies += "io.netty" % "netty-transport-native-epoll" % "4.1.118.Final" classifier "linux-x86_64",
+  libraryDependencies += ("io.netty" % "netty-transport-native-epoll" % "4.1.118.Final").classifier("linux-x86_64"),
   check := {
     val report = update.value
     val modules = report.configurations.flatMap(_.modules)
diff --git a/sbt-app/src/sbt-test/dependency-management/classifier/build.sbt b/sbt-app/src/sbt-test/dependency-management/classifier/build.sbt
index e784cdba8..1e0363c2b 100644
--- a/sbt-app/src/sbt-test/dependency-management/classifier/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/classifier/build.sbt
@@ -1,4 +1,4 @@
 ivyPaths := IvyPaths(baseDirectory.value.toString, Some(((ThisBuild / baseDirectory).value / "ivy" / "cache").toString))
 ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache"
 
-libraryDependencies += "org.testng" % "testng" % "5.7" classifier "jdk15"
+libraryDependencies += ("org.testng" % "testng" % "5.7").classifier("jdk15")
diff --git a/sbt-app/src/sbt-test/dependency-management/classifier2/build.sbt b/sbt-app/src/sbt-test/dependency-management/classifier2/build.sbt
index 133599913..35dd4f7fe 100644
--- a/sbt-app/src/sbt-test/dependency-management/classifier2/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/classifier2/build.sbt
@@ -1,2 +1,2 @@
 ThisBuild / scalaVersion := "2.11.12"
-libraryDependencies += "org.jclouds.api" % "nova" % "1.5.9" classifier "tests"
+libraryDependencies += ("org.jclouds.api" % "nova" % "1.5.9").classifier("tests")
diff --git a/sbt-app/src/sbt-test/dependency-management/cross-ivy-maven/build.sbt b/sbt-app/src/sbt-test/dependency-management/cross-ivy-maven/build.sbt
index 0e0d5e0f9..1e01d9e9d 100644
--- a/sbt-app/src/sbt-test/dependency-management/cross-ivy-maven/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/cross-ivy-maven/build.sbt
@@ -10,8 +10,8 @@ libraryDependencies += "bad" % "mvn" % "1.0"
 TaskKey[Unit]("check") := {
   val cp = (Compile / fullClasspath).value
   def isTestJar(n: String): Boolean =
-    (n contains "scalacheck") ||
-    (n contains "specs2")
+    n.contains("scalacheck") ||
+    n.contains("specs2")
   val testLibs = cp map (_.data.name) filter isTestJar
   assert(testLibs.isEmpty, s"Compile Classpath has test libs:\n * ${testLibs.mkString("\n * ")}")
 }
\ No newline at end of file
diff --git a/sbt-app/src/sbt-test/dependency-management/default-artifact/build.sbt b/sbt-app/src/sbt-test/dependency-management/default-artifact/build.sbt
index 6afa36b3a..2b04e4075 100644
--- a/sbt-app/src/sbt-test/dependency-management/default-artifact/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/default-artifact/build.sbt
@@ -1,4 +1,4 @@
-resolvers += Resolver.file("buggy", file("repo"))(
+resolvers += Resolver.file("buggy", file("repo"))(using
   Patterns(
     ivyPatterns = Vector("[organization]/[module]/[revision]/ivy.xml"),
     artifactPatterns = Vector("[organization]/[module]/[revision]/[artifact].[ext]"),
@@ -8,5 +8,5 @@ resolvers += Resolver.file("buggy", file("repo"))(
   )
 )
 
-libraryDependencies += "a" % "b" % "1.0.0" % "compile->runtime" artifacts(Artifact("b1", "jar", "jar"))
-libraryDependencies += "a" % "b" % "1.0.0" % "test->runtime" artifacts(Artifact("b1", "jar", "jar"))
+libraryDependencies += ("a" % "b" % "1.0.0" % "compile->runtime").artifacts(Artifact("b1", "jar", "jar"))
+libraryDependencies += ("a" % "b" % "1.0.0" % "test->runtime").artifacts(Artifact("b1", "jar", "jar"))
diff --git a/sbt-app/src/sbt-test/dependency-management/evicted-semver-spec/build.sbt b/sbt-app/src/sbt-test/dependency-management/evicted-semver-spec/build.sbt
index 882434a86..3994ef57e 100644
--- a/sbt-app/src/sbt-test/dependency-management/evicted-semver-spec/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/evicted-semver-spec/build.sbt
@@ -61,5 +61,5 @@ val use2 = project
 // use the user local resolver to fetch the SNAPSHOT version of the compiler-bridge
 def userLocalFileResolver(appConfig: AppConfiguration): Resolver = {
   val ivyHome = appConfig.provider.scalaProvider.launcher.ivyHome
-  Resolver.file("User Local", ivyHome / "local")(Resolver.defaultIvyPatterns)
+  Resolver.file("User Local", ivyHome / "local")(using Resolver.defaultIvyPatterns)
 }
diff --git a/sbt-app/src/sbt-test/dependency-management/exclude-bundle/changes/build.sbt b/sbt-app/src/sbt-test/dependency-management/exclude-bundle/changes/build.sbt
index d6348fa72..7503f55ff 100644
--- a/sbt-app/src/sbt-test/dependency-management/exclude-bundle/changes/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/exclude-bundle/changes/build.sbt
@@ -1,3 +1,3 @@
-libraryDependencies += "org.vaadin" % "dontpush-addon-ozonelayer" % "0.4.6" exclude("org.atmosphere", "atmosphere-compat-jetty")
+libraryDependencies += ("org.vaadin" % "dontpush-addon-ozonelayer" % "0.4.6").exclude("org.atmosphere", "atmosphere-compat-jetty")
 
 resolvers += "asdf" at "https://maven.vaadin.com/vaadin-addons"
diff --git a/sbt-app/src/sbt-test/dependency-management/exclude-scala/build.sbt b/sbt-app/src/sbt-test/dependency-management/exclude-scala/build.sbt
index 64b58339c..13de01935 100644
--- a/sbt-app/src/sbt-test/dependency-management/exclude-scala/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/exclude-scala/build.sbt
@@ -15,7 +15,7 @@ def check(className: String): Def.Initialize[Task[Unit]] =
   import sbt.TupleSyntax.*
   (Compile / fullClasspath, fileConverter.toTaskable) mapN { (cp, c) =>
     given FileConverter = c
-    val existing = cp.files.filter(_.toFile.getName contains "scala-library")
+    val existing = cp.files.filter(_.toFile.getName.contains("scala-library"))
     println("Full classpath: " + cp.mkString("\n\t", "\n\t", ""))
     println("scala-library.jar: " + existing.mkString("\n\t", "\n\t", ""))
     val loader = ClasspathUtilities.toLoader(existing.map(_.toFile()))
diff --git a/sbt-app/src/sbt-test/dependency-management/force/build.sbt b/sbt-app/src/sbt-test/dependency-management/force/build.sbt
index 7af3315f7..600aa3989 100644
--- a/sbt-app/src/sbt-test/dependency-management/force/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/force/build.sbt
@@ -19,7 +19,7 @@ def libraryDeps(base: File) = {
 def check(ver: String) =
   (Compile / dependencyClasspath) map { jars =>
     val log4j = jars map (_.data) collect {
-      case f if f.name contains "log4j-" => f.name
+      case f if f.name.contains("log4j-") => f.name
     }
     if (log4j.size != 1 || !log4j.head.contains(ver))
       sys.error("Did not download the correct jar.")
diff --git a/sbt-app/src/sbt-test/dependency-management/ivyless-publish-http/build.sbt b/sbt-app/src/sbt-test/dependency-management/ivyless-publish-http/build.sbt
index 4567ec7c5..d5b056e6d 100644
--- a/sbt-app/src/sbt-test/dependency-management/ivyless-publish-http/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/ivyless-publish-http/build.sbt
@@ -13,7 +13,7 @@ val publishPort = 3030
 // Publish to HTTP server (localhost) - ivyless publish uses PUT
 // Resolver.url expects java.net.URL; in build.sbt "url" is sbt.URI, so use java.net.URL explicitly
 publishTo := Some(
-  Resolver.url("test-repo", new java.net.URI(s"http://localhost:$publishPort/").toURL)(Resolver.ivyStylePatterns)
+  Resolver.url("test-repo", new java.net.URI(s"http://localhost:$publishPort/").toURL)(using Resolver.ivyStylePatterns)
     .withAllowInsecureProtocol(true)
 )
 
diff --git a/sbt-app/src/sbt-test/dependency-management/ivyless-publish/build.sbt b/sbt-app/src/sbt-test/dependency-management/ivyless-publish/build.sbt
index 483b47282..23d6e97bf 100644
--- a/sbt-app/src/sbt-test/dependency-management/ivyless-publish/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/ivyless-publish/build.sbt
@@ -9,7 +9,7 @@ scalaVersion := "3.8.3"
 val publishRepoBase = settingKey[File]("Base directory for publish repo")
 publishRepoBase := baseDirectory.value / "repo"
 
-publishTo := Some(Resolver.file("test-repo", publishRepoBase.value)(Resolver.ivyStylePatterns))
+publishTo := Some(Resolver.file("test-repo", publishRepoBase.value)(using Resolver.ivyStylePatterns))
 
 useIvy := false
 
diff --git a/sbt-app/src/sbt-test/dependency-management/latest-local-plugin/changes/def.sbt b/sbt-app/src/sbt-test/dependency-management/latest-local-plugin/changes/def.sbt
index 2815ceedc..c2f294855 100644
--- a/sbt-app/src/sbt-test/dependency-management/latest-local-plugin/changes/def.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/latest-local-plugin/changes/def.sbt
@@ -12,7 +12,7 @@ version := ( if(stable.value) "1.0" else "1.1-SNAPSHOT" )
 
 publishTo := {
 	val base = baseDirectory.value / ( if(stable.value) "stable" else "snapshot" )
-	Some( Resolver.file("local-" + base, base)(Resolver.ivyStylePatterns) )
+	Some( Resolver.file("local-" + base, base)(using Resolver.ivyStylePatterns) )
 }
 
 publishMavenStyle := false
diff --git a/sbt-app/src/sbt-test/dependency-management/latest-local-plugin/changes/use-plugins.sbt b/sbt-app/src/sbt-test/dependency-management/latest-local-plugin/changes/use-plugins.sbt
index 777b3f0ae..c5183b68e 100644
--- a/sbt-app/src/sbt-test/dependency-management/latest-local-plugin/changes/use-plugins.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/latest-local-plugin/changes/use-plugins.sbt
@@ -1,6 +1,6 @@
 addSbtPlugin("org.example" % "def" % "latest.integration")
 
 resolvers ++= {
-	def r(tpe: String) = Resolver.file(s"local-$tpe", baseDirectory.value / ".." / tpe)(Resolver.ivyStylePatterns)
+	def r(tpe: String) = Resolver.file(s"local-$tpe", baseDirectory.value / ".." / tpe)(using Resolver.ivyStylePatterns)
 	r("snapshot") :: r("stable") :: Nil
 }
diff --git a/sbt-app/src/sbt-test/dependency-management/make-pom/build.sbt b/sbt-app/src/sbt-test/dependency-management/make-pom/build.sbt
index ff88b76d0..6df5b827a 100644
--- a/sbt-app/src/sbt-test/dependency-management/make-pom/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/make-pom/build.sbt
@@ -1,6 +1,6 @@
 import scala.xml._
 
-lazy val root = (project in file(".")) settings (
+lazy val root = (project in file(".")).settings(
   readPom := Def.uncached {
     val vf = makePom.value
     val converter = fileConverter.value
@@ -71,7 +71,7 @@ lazy val checkPom = Def.task {
     val writtenRepositories = repositories.map(read).distinct
     val mavenStyleRepositories = (ivyRepositories.collect {
       case x: MavenRepository
-          if (x.name != "public") && (x.name != "jcenter") && !(x.root startsWith "file:") =>
+          if (x.name != "public") && (x.name != "jcenter") && !(x.root.startsWith("file:")) =>
         normalize(x)
     }).distinct
 
diff --git a/sbt-app/src/sbt-test/dependency-management/module-name/build.sbt b/sbt-app/src/sbt-test/dependency-management/module-name/build.sbt
index a369e73ab..434253757 100644
--- a/sbt-app/src/sbt-test/dependency-management/module-name/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/module-name/build.sbt
@@ -10,7 +10,7 @@ TaskKey[Unit]("checkName") := Def.uncached {
   val path = converter.toPath(vf).toAbsolutePath.toString
   val module = moduleName.value
   val n = name.value
-  assert(path contains module, s"Path $path did not contain module name $module")
+  assert(path.contains(module), s"Path $path did not contain module name $module")
   assert(!path.contains(n), s"Path $path contained $n")
   ()
 }
diff --git a/sbt-app/src/sbt-test/dependency-management/multiple-classifiers/build.sbt b/sbt-app/src/sbt-test/dependency-management/multiple-classifiers/build.sbt
index 9d9b2b8d3..4f80db351 100644
--- a/sbt-app/src/sbt-test/dependency-management/multiple-classifiers/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/multiple-classifiers/build.sbt
@@ -1,5 +1,5 @@
 libraryDependencies ++= Seq("natives-windows", "natives-linux", "natives-osx") map ( c =>
-  "org.lwjgl.lwjgl" % "lwjgl-platform" % "2.8.2" classifier c
+  ("org.lwjgl.lwjgl" % "lwjgl-platform" % "2.8.2").classifier(c)
 )
 
 autoScalaLibrary := false
diff --git a/sbt-app/src/sbt-test/dependency-management/mvn-local/build.sbt b/sbt-app/src/sbt-test/dependency-management/mvn-local/build.sbt
index c8387f69e..f680d41e6 100644
--- a/sbt-app/src/sbt-test/dependency-management/mvn-local/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/mvn-local/build.sbt
@@ -7,7 +7,7 @@ def commonSettings: Seq[Def.Setting[?]] =
     scalaVersion := "2.10.4",
     ThisBuild / organization := "org.example",
     ThisBuild / version := "1.0-SNAPSHOT",
-    resolvers += Resolver.file("old-local", file(sys.props("user.home") + "/.ivy2/local"))(Resolver.ivyStylePatterns)
+    resolvers += Resolver.file("old-local", file(sys.props("user.home") + "/.ivy2/local"))(using Resolver.ivyStylePatterns)
   )
 
 lazy val main = project.
diff --git a/sbt-app/src/sbt-test/dependency-management/override2/build.sbt b/sbt-app/src/sbt-test/dependency-management/override2/build.sbt
index d4f465bf8..1ddd10979 100644
--- a/sbt-app/src/sbt-test/dependency-management/override2/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/override2/build.sbt
@@ -7,7 +7,7 @@ lazy val root = (project in file("."))
     dependencyOverrides += "org.webjars.npm" % "is-number" % "5.0.0",
     check := {
       val cp = (Compile / externalDependencyClasspath).value.map {_.data.name}.sorted
-      if (!(cp contains "is-number-5.0.0.jar")) {
+      if (!cp.contains("is-number-5.0.0.jar")) {
         sys.error("is-number-5.0.0 not found when it should be included: " + cp.toString)
       }
     }
diff --git a/sbt-app/src/sbt-test/dependency-management/pom-advanced/build.sbt b/sbt-app/src/sbt-test/dependency-management/pom-advanced/build.sbt
index 15ed8b529..47c78a1bc 100644
--- a/sbt-app/src/sbt-test/dependency-management/pom-advanced/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/pom-advanced/build.sbt
@@ -29,7 +29,7 @@ def pomIncludeRepository(base: File, prev: MavenRepository => Boolean): MavenRep
 }
 
 def addSlash(s: String): String = s match {
-  case s if s endsWith "/" => s
+  case s if s.endsWith("/") => s
   case _ => s + "/"
 }
 
diff --git a/sbt-app/src/sbt-test/dependency-management/pom-artifact-type/build.sbt b/sbt-app/src/sbt-test/dependency-management/pom-artifact-type/build.sbt
index 07570f4c5..bb67c2691 100644
--- a/sbt-app/src/sbt-test/dependency-management/pom-artifact-type/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/pom-artifact-type/build.sbt
@@ -4,7 +4,7 @@ lazy val root = (project in file("."))
   .settings(
     scalaVersion := "2.13.16",
     autoScalaLibrary := false,
-    libraryDependencies += "org.eclipse.jetty" % "jetty-webapp" % "11.0.15" artifacts (Artifact("jetty-webapp", "war", "war")),
+    libraryDependencies += ("org.eclipse.jetty" % "jetty-webapp" % "11.0.15").artifacts(Artifact("jetty-webapp", "war", "war")),
     libraryDependencies += "com.typesafe" % "config" % "1.4.3",
     // classified artifact with non-default type: both <type> and <classifier> must appear
     libraryDependencies += ("com.example" % "classified-war" % "1.0")
diff --git a/sbt-app/src/sbt-test/dependency-management/pom-packaging/build.sbt b/sbt-app/src/sbt-test/dependency-management/pom-packaging/build.sbt
index 18d2b74d3..16629deea 100644
--- a/sbt-app/src/sbt-test/dependency-management/pom-packaging/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/pom-packaging/build.sbt
@@ -1,8 +1,8 @@
 val root = project in file(".")
 val subJar = project in file("subJar")
-def warArtifact = (Compile / packageBin / artifact) ~= (_ withType "war" withExtension "war")
-val subWar = project in file("subWar") settings warArtifact
-val subParent = project in file("subParent") settings ((Compile / publishArtifact) := false)
+def warArtifact = (Compile / packageBin / artifact) ~= (_.withType("war").withExtension("war"))
+val subWar = project.in(file("subWar")).settings(warArtifact)
+val subParent = project.in(file("subParent")).settings((Compile / publishArtifact) := false)
 
 val checkPom = taskKey[Unit]("")
 (ThisBuild / checkPom) := {
diff --git a/sbt-app/src/sbt-test/dependency-management/pom-scope/build.sbt b/sbt-app/src/sbt-test/dependency-management/pom-scope/build.sbt
index 310258a92..ba74971a4 100644
--- a/sbt-app/src/sbt-test/dependency-management/pom-scope/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/pom-scope/build.sbt
@@ -15,8 +15,8 @@ lazy val root = (project in file(".")).
       "d" % "d" % "1.0" % "test",
       "e" % "e" % "1.0" % Custom,
       "f" % "f" % "1.0" % "custom,optional,runtime",
-      "g" % "g" % "1.0" % "custom,runtime" classifier "foo",
-      "h" % "h" % "1.0" % "custom,optional,runtime" classifier "foo"
+     ("g" % "g" % "1.0" % "custom,runtime").classifier("foo"),
+     ("h" % "h" % "1.0" % "custom,optional,runtime").classifier("foo")
     )
   )
 
diff --git a/sbt-app/src/sbt-test/dependency-management/provided/build.sbt b/sbt-app/src/sbt-test/dependency-management/provided/build.sbt
index e8d926fab..aaa6d6f2f 100644
--- a/sbt-app/src/sbt-test/dependency-management/provided/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/provided/build.sbt
@@ -27,7 +27,7 @@ lazy val root = (project in file(".")).
   )
 
 def checkServletAPI(paths: Seq[File], shouldBeIncluded: Boolean, label: String) = {
-  val servletAPI = paths.find(_.getName contains "servlet-api")
+  val servletAPI = paths.find(_.getName.contains("servlet-api"))
   if (shouldBeIncluded) {
     if (servletAPI.isEmpty) sys.error(s"Servlet API should have been included in $label.")
   } else
diff --git a/sbt-app/src/sbt-test/dependency-management/publish-local/build.sbt b/sbt-app/src/sbt-test/dependency-management/publish-local/build.sbt
index 8076f5a1b..f8bb03bf8 100644
--- a/sbt-app/src/sbt-test/dependency-management/publish-local/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/publish-local/build.sbt
@@ -7,7 +7,7 @@ lazy val root = (project in file(".")).
       organization := "A",
       version := "1.0",
       ivyPaths := baseDirectory( dir => IvyPaths(dir, Some(dir / "ivy" / "cache")) ).value,
-      externalResolvers := (baseDirectory map { base => Resolver.file("local", base / "ivy" / "local" asFile)(Resolver.ivyStylePatterns) :: Nil }).value
+      externalResolvers := (baseDirectory map { base => Resolver.file("local", base / "ivy" / "local" asFile)(using Resolver.ivyStylePatterns) :: Nil }).value
     )),
     mavenStyle,
     interProject,
diff --git a/sbt-app/src/sbt-test/dependency-management/publish-local/changes/RetrieveTest.sbt b/sbt-app/src/sbt-test/dependency-management/publish-local/changes/RetrieveTest.sbt
index c7ee8cd16..57bf83398 100644
--- a/sbt-app/src/sbt-test/dependency-management/publish-local/changes/RetrieveTest.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/publish-local/changes/RetrieveTest.sbt
@@ -5,7 +5,7 @@ lazy val root = (project in file(".")).
       organization := "A",
       version := "1.0",
       ivyPaths := baseDirectory( dir => IvyPaths(dir, Some(dir / "ivy" / "cache")) ).value,
-      externalResolvers := (baseDirectory map { base => Resolver.file("local", base / "ivy" / "local" asFile)(Resolver.ivyStylePatterns) :: Nil }).value
+      externalResolvers := (baseDirectory map { base => Resolver.file("local", base / "ivy" / "local" asFile)(using Resolver.ivyStylePatterns) :: Nil }).value
     )),
     mavenStyle,
     name := "Retrieve Test",
diff --git a/sbt-app/src/sbt-test/dependency-management/scala-version-check-exempt/build.sbt b/sbt-app/src/sbt-test/dependency-management/scala-version-check-exempt/build.sbt
index 26eff543b..7df384a10 100644
--- a/sbt-app/src/sbt-test/dependency-management/scala-version-check-exempt/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/scala-version-check-exempt/build.sbt
@@ -17,11 +17,11 @@ libraryDependencies += "org.scala-lang" % "scala-actors" % "2.11.12"
 lazy val check = taskKey[Unit]("Runs the check")
 
 check := {
-  val lastLog = BuiltinCommands lastLogFile state.value
+  val lastLog = BuiltinCommands.lastLogFile(state.value)
   val last = IO read lastLog.get
-  def containsWarn1 = last contains "Binary version (1.1.0) for dependency org.scala-lang#scala-actors-migration_2.11;1.1.0"
-  def containsWarn2 = last contains "Binary version (0.9.1) for dependency org.scala-lang#scala-pickling_2.11;0.9.1"
-  def containsWarn3 = last contains "differs from Scala binary version in project (2.11)."
+  def containsWarn1 = last.contains("Binary version (1.1.0) for dependency org.scala-lang#scala-actors-migration_2.11;1.1.0")
+  def containsWarn2 = last.contains("Binary version (0.9.1) for dependency org.scala-lang#scala-pickling_2.11;0.9.1")
+  def containsWarn3 = last.contains("differs from Scala binary version in project (2.11).")
   if (containsWarn1 && containsWarn3) sys error "scala-actors-migration isn't exempted from the Scala binary version check"
   if (containsWarn2 && containsWarn3) sys error "scala-pickling isn't exempted from the Scala binary version check"
 }
diff --git a/sbt-app/src/sbt-test/dependency-management/snapshot-local/build.sbt b/sbt-app/src/sbt-test/dependency-management/snapshot-local/build.sbt
index ddd17b6e8..b4915c13f 100644
--- a/sbt-app/src/sbt-test/dependency-management/snapshot-local/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/snapshot-local/build.sbt
@@ -7,7 +7,7 @@ def localCache =
 
 lazy val sharedResolver: Resolver = {
   val r = Resolver.defaultShared
-  r withConfiguration (r.configuration withIsLocal false)
+  r.withConfiguration(r.configuration.withIsLocal(false))
   //MavenRepository("example-shared-repo", "file:///tmp/shared-maven-repo-bad-example")
   //Resolver.file("example-shared-repo", repoDir)(Resolver.defaultPatterns)
 }
diff --git a/sbt-app/src/sbt-test/dependency-management/snapshot-resolution/build.sbt b/sbt-app/src/sbt-test/dependency-management/snapshot-resolution/build.sbt
index a1f361782..b4f43244f 100644
--- a/sbt-app/src/sbt-test/dependency-management/snapshot-resolution/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/snapshot-resolution/build.sbt
@@ -9,7 +9,7 @@ def localCache =
 
 lazy val sharedResolver: Resolver = {
   val r = Resolver.defaultShared
-  r withConfiguration (r.configuration withIsLocal false)
+  r.withConfiguration(r.configuration.withIsLocal(false))
   //MavenRepository("example-shared-repo", "file:///tmp/shared-maven-repo-bad-example")
   //Resolver.file("example-shared-repo", repoDir)(Resolver.defaultPatterns)
 }
diff --git a/sbt-app/src/sbt-test/dependency-management/sources-transitive-classifiers/build.sbt b/sbt-app/src/sbt-test/dependency-management/sources-transitive-classifiers/build.sbt
index 8bf912e4b..83adeb124 100644
--- a/sbt-app/src/sbt-test/dependency-management/sources-transitive-classifiers/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/sources-transitive-classifiers/build.sbt
@@ -5,8 +5,8 @@ lazy val root = (project in file("."))
     autoScalaLibrary := false,
     managedScalaInstance := false,
     transitiveClassifiers := Seq("sources"),
-    TaskKey[Unit]("checkSources") := (updateClassifiers map checkSources).value,
-    TaskKey[Unit]("checkBinaries") := (update map checkBinaries).value,
+    TaskKey[Unit]("checkSources") := updateClassifiers.map(checkSources).value,
+    TaskKey[Unit]("checkBinaries") := update.map(checkBinaries).value,
   )
 
 def getSources(report: UpdateReport)  = report.matching(artifactFilter(`classifier` = "sources") )
diff --git a/sbt-app/src/sbt-test/dependency-management/sources/build.sbt b/sbt-app/src/sbt-test/dependency-management/sources/build.sbt
index 64f5ba3f3..19e2d19af 100644
--- a/sbt-app/src/sbt-test/dependency-management/sources/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/sources/build.sbt
@@ -3,8 +3,8 @@ ThisBuild / scalaVersion := "2.12.12"
 lazy val root = (project in file("."))
   .settings(
     libraryDependencies += "com.typesafe.akka" %% "akka-actor" % "2.5.22",
-    TaskKey[Unit]("checkSources") := (updateClassifiers map checkSources).value,
-    TaskKey[Unit]("checkBinaries") := (update map checkBinaries).value
+    TaskKey[Unit]("checkSources") := updateClassifiers.map(checkSources).value,
+    TaskKey[Unit]("checkBinaries") := update.map(checkBinaries).value
   )
 
 def getSources(report: UpdateReport)  = report.matching(artifactFilter(`classifier` = "sources") )
diff --git a/sbt-app/src/sbt-test/dependency-management/test-artifact/changes/use/pom.sbt b/sbt-app/src/sbt-test/dependency-management/test-artifact/changes/use/pom.sbt
index 562c488f9..118a44dde 100644
--- a/sbt-app/src/sbt-test/dependency-management/test-artifact/changes/use/pom.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/test-artifact/changes/use/pom.sbt
@@ -1,3 +1,3 @@
-libraryDependencies += "org.example" % "def" % "2.0" classifier("tests")
+libraryDependencies += ("org.example" % "def" % "2.0").classifier("tests")
 
 externalResolvers := Seq("example" at (baseDirectory.value / "ivy-repo").toURI.toString)
diff --git a/sbt-app/src/sbt-test/dependency-management/transitive-excludes/build.sbt b/sbt-app/src/sbt-test/dependency-management/transitive-excludes/build.sbt
index 766a4efe9..63b5ccb24 100644
--- a/sbt-app/src/sbt-test/dependency-management/transitive-excludes/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/transitive-excludes/build.sbt
@@ -9,9 +9,9 @@ libraryDependencies += "exclude.test" % "app" % "1.0.0"
 val checkDependencies = taskKey[Unit]("Checks that dependencies are correct.")
 
 checkDependencies := {
-  val hasBadJar = (Compile / fullClasspath).value.exists { jar => jar.data.name contains "bottom-1.0.0.jar"}
+  val hasBadJar = (Compile / fullClasspath).value.exists { jar => jar.data.name.contains("bottom-1.0.0.jar")}
   val errorJarString = (Compile / fullClasspath).value.map(_.data.name).mkString(" * ", "\n * ", "")
-  val hasBadMiddleJar = (Compile / fullClasspath).value.exists { jar => jar.data.name contains "middle-1.0.0.jar"}
+  val hasBadMiddleJar = (Compile / fullClasspath).value.exists { jar => jar.data.name.contains("middle-1.0.0.jar")}
   assert(!hasBadMiddleJar, s"Failed to exclude excluded dependency on classpath!\nFound:\n$errorJarString")
   assert(!hasBadJar, s"Failed to exclude transitive excluded dependency on classpath!\nFound:\n$errorJarString")
   val modules =
diff --git a/sbt-app/src/sbt-test/dependency-management/url-no-head/build.sbt b/sbt-app/src/sbt-test/dependency-management/url-no-head/build.sbt
index 9fdc2681d..a31213fdc 100644
--- a/sbt-app/src/sbt-test/dependency-management/url-no-head/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/url-no-head/build.sbt
@@ -1,3 +1,3 @@
 ThisBuild / scalaVersion := "2.11.12"
 
-libraryDependencies += "ccl.northwestern.edu" % "netlogo" % "5.3.1" % "provided" from s"https://github.com/NetLogo/NetLogo/releases/download/5.3.1/NetLogo.jar"
+libraryDependencies += ("ccl.northwestern.edu" % "netlogo" % "5.3.1" % "provided").from(s"https://github.com/NetLogo/NetLogo/releases/download/5.3.1/NetLogo.jar")
diff --git a/sbt-app/src/sbt-test/dependency-management/url/build.sbt b/sbt-app/src/sbt-test/dependency-management/url/build.sbt
index 7f497aa55..915d925aa 100644
--- a/sbt-app/src/sbt-test/dependency-management/url/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/url/build.sbt
@@ -8,7 +8,7 @@ def localCache =
 lazy val root = (project in file(".")).
   settings(
     localCache,
-    libraryDependencies += "org.jsoup" % "jsoup" % "1.9.1" % Test from "https://jsoup.org/packages/jsoup-1.9.1.jar",
+    libraryDependencies += ("org.jsoup" % "jsoup" % "1.9.1" % Test).from("https://jsoup.org/packages/jsoup-1.9.1.jar"),
     ivyLoggingLevel := UpdateLogging.Full,
     TaskKey[Unit]("checkInTest") := checkClasspath(Test).value,
     TaskKey[Unit]("checkInCompile") := checkClasspath(Compile).value
diff --git a/sbt-app/src/sbt-test/ivy-deps-management/update-classifiers-snapshot-srcs/build.sbt b/sbt-app/src/sbt-test/ivy-deps-management/update-classifiers-snapshot-srcs/build.sbt
index 20b16f73c..35723da8c 100644
--- a/sbt-app/src/sbt-test/ivy-deps-management/update-classifiers-snapshot-srcs/build.sbt
+++ b/sbt-app/src/sbt-test/ivy-deps-management/update-classifiers-snapshot-srcs/build.sbt
@@ -14,7 +14,7 @@ val commonSettings = Seq[Def.Setting[?]](
 lazy val bippy = project settings (
   commonSettings,
   resolvers += Resolver
-    .file("ivy-local", file(sys.props("user.home")) / ".ivy2" / "local")(Resolver.ivyStylePatterns),
+    .file("ivy-local", file(sys.props("user.home")) / ".ivy2" / "local")(using Resolver.ivyStylePatterns),
   publishTo := Some(Resolver.file("local-repo", localRepo.value))
 )
 
@@ -40,6 +40,6 @@ InputKey[Unit]("check") := {
   val s = IO readStream jar.getInputStream(jar.getJarEntry("Bippy.scala"))
 
   val expected = s"def release = $n"
-  assert(s contains expected, s"""Bippy should contain $expected, contents:\n$s""")
+  assert(s.contains(expected), s"""Bippy should contain $expected, contents:\n$s""")
   ()
 }
diff --git a/sbt-app/src/sbt-test/ivy-deps-management/update-classifiers-snapshot-srcs/project/plugins.sbt b/sbt-app/src/sbt-test/ivy-deps-management/update-classifiers-snapshot-srcs/project/plugins.sbt
index 661896f9b..d46e06a88 100644
--- a/sbt-app/src/sbt-test/ivy-deps-management/update-classifiers-snapshot-srcs/project/plugins.sbt
+++ b/sbt-app/src/sbt-test/ivy-deps-management/update-classifiers-snapshot-srcs/project/plugins.sbt
@@ -1 +1 @@
-resolvers += Resolver.file("ivy-local", file(sys.props("user.home")) / ".ivy2" / "local")(Resolver.ivyStylePatterns)
+resolvers += Resolver.file("ivy-local", file(sys.props("user.home")) / ".ivy2" / "local")(using Resolver.ivyStylePatterns)
diff --git a/sbt-app/src/sbt-test/ivy/exclude-dependencies/build.sbt b/sbt-app/src/sbt-test/ivy/exclude-dependencies/build.sbt
index 6654c4859..e0c75bbdf 100644
--- a/sbt-app/src/sbt-test/ivy/exclude-dependencies/build.sbt
+++ b/sbt-app/src/sbt-test/ivy/exclude-dependencies/build.sbt
@@ -31,10 +31,10 @@ lazy val root = (project in file(".")).
       val acp = (a / Compile / externalDependencyClasspath).value.sortBy {_.data.name}
       val bcp = (b / Compile / externalDependencyClasspath).value.sortBy {_.data.name}
 
-      if (acp exists { _.data.name contains "slf4j-api-1.7.5.jar" }) {
+      if (acp exists { _.data.name.contains("slf4j-api-1.7.5.jar") }) {
         sys.error("slf4j-api-1.7.5.jar found when it should NOT be included: " + acp.toString)
       }
-      if (bcp exists { _.data.name contains "dispatch-core_2.11-0.11.1.jar" }) {
+      if (bcp exists { _.data.name.contains("dispatch-core_2.11-0.11.1.jar") }) {
         sys.error("dispatch-core_2.11-0.11.1.jar found when it should NOT be included: " + bcp.toString)
       }
 
diff --git a/sbt-app/src/sbt-test/lm-coursier/api-url/build.sbt b/sbt-app/src/sbt-test/lm-coursier/api-url/build.sbt
index fd71f923a..dbb371794 100644
--- a/sbt-app/src/sbt-test/lm-coursier/api-url/build.sbt
+++ b/sbt-app/src/sbt-test/lm-coursier/api-url/build.sbt
@@ -10,7 +10,7 @@ lazy val b = project
 
 lazy val bResolver = Def.setting {
   val dir = (ThisBuild / baseDirectory).value / "b-repo"
-  Resolver.file("b-resolver", dir)(Resolver.defaultIvyPatterns)
+  Resolver.file("b-resolver", dir)(using Resolver.defaultIvyPatterns)
 }
 
 lazy val check = taskKey[Unit]("")
diff --git a/sbt-app/src/sbt-test/lm-coursier/classifiers/build.sbt b/sbt-app/src/sbt-test/lm-coursier/classifiers/build.sbt
index 5948041f3..c15546960 100644
--- a/sbt-app/src/sbt-test/lm-coursier/classifiers/build.sbt
+++ b/sbt-app/src/sbt-test/lm-coursier/classifiers/build.sbt
@@ -1,2 +1,2 @@
 scalaVersion := "2.12.8"
-libraryDependencies += "org.jclouds.api" % "nova" % "1.5.9" classifier "tests"
+libraryDependencies += ("org.jclouds.api" % "nova" % "1.5.9").classifier("tests")
diff --git a/sbt-app/src/sbt-test/lm-coursier/from-no-head/build.sbt b/sbt-app/src/sbt-test/lm-coursier/from-no-head/build.sbt
index c3235d86a..e21f705c1 100644
--- a/sbt-app/src/sbt-test/lm-coursier/from-no-head/build.sbt
+++ b/sbt-app/src/sbt-test/lm-coursier/from-no-head/build.sbt
@@ -1,3 +1,3 @@
 scalaVersion := "2.12.21"
 
-libraryDependencies += "ccl.northwestern.edu" % "netlogo" % "5.3.1" % "provided" from s"https://github.com/NetLogo/NetLogo/releases/download/5.3.1/NetLogo.jar"
+libraryDependencies += ("ccl.northwestern.edu" % "netlogo" % "5.3.1" % "provided").from(s"https://github.com/NetLogo/NetLogo/releases/download/5.3.1/NetLogo.jar")
diff --git a/sbt-app/src/sbt-test/lm-coursier/whitespace-resolver/build.sbt b/sbt-app/src/sbt-test/lm-coursier/whitespace-resolver/build.sbt
index 97a9c838d..985672530 100644
--- a/sbt-app/src/sbt-test/lm-coursier/whitespace-resolver/build.sbt
+++ b/sbt-app/src/sbt-test/lm-coursier/whitespace-resolver/build.sbt
@@ -1,3 +1,3 @@
 scalaVersion := "2.12.8"
 
-resolvers += Resolver.file("space-repo", file(raw"/tmp/space the final frontier/repo"))(Resolver.ivyStylePatterns)
+resolvers += Resolver.file("space-repo", file(raw"/tmp/space the final frontier/repo"))(using Resolver.ivyStylePatterns)
diff --git a/sbt-app/src/sbt-test/package/manifest/build.sbt b/sbt-app/src/sbt-test/package/manifest/build.sbt
index b0ad580d1..d05052ae3 100644
--- a/sbt-app/src/sbt-test/package/manifest/build.sbt
+++ b/sbt-app/src/sbt-test/package/manifest/build.sbt
@@ -10,7 +10,7 @@ mainClass := Some("jartest.Main")
 Compile / packageBin / packageOptions := {
   def manifestExtra = {
     val mf = new Manifest
-    mf.getMainAttributes.put(Attributes.Name.CLASS_PATH, makeString(scalaInstance.value.libraryJars))
+    mf.getMainAttributes.put(Attributes.Name.CLASS_PATH, makeString(scalaInstance.value.libraryJars.toSeq))
     mf
   }
   (Compile / packageBin / packageOptions).value :+ Package.JarManifest(manifestExtra)
diff --git a/sbt-app/src/sbt-test/package/resources/build.sbt b/sbt-app/src/sbt-test/package/resources/build.sbt
index e6e9709e7..26ce9d15f 100644
--- a/sbt-app/src/sbt-test/package/resources/build.sbt
+++ b/sbt-app/src/sbt-test/package/resources/build.sbt
@@ -9,7 +9,7 @@ packageOptions := {
   def manifestExtra = {
     import java.util.jar._
     val mf = new Manifest
-    mf.getMainAttributes.put(Attributes.Name.CLASS_PATH, makeString(scalaInstance.value.libraryJars))
+    mf.getMainAttributes.put(Attributes.Name.CLASS_PATH, makeString(scalaInstance.value.libraryJars.toSeq))
     mf
   }
   Package.JarManifest(manifestExtra) +: packageOptions.value
diff --git a/sbt-app/src/sbt-test/project/auto-plugins-default-requires-jvmplugin/build.sbt b/sbt-app/src/sbt-test/project/auto-plugins-default-requires-jvmplugin/build.sbt
index 6d3062486..92d5f26f9 100644
--- a/sbt-app/src/sbt-test/project/auto-plugins-default-requires-jvmplugin/build.sbt
+++ b/sbt-app/src/sbt-test/project/auto-plugins-default-requires-jvmplugin/build.sbt
@@ -1,4 +1,4 @@
-val test123 = project in file(".") enablePlugins TestP settings(
+val test123 = project.in(file(".")).enablePlugins(TestP).settings(
   Compile / resourceGenerators += Def.task {
     streams.value.log.info("resource generated in settings")
     Seq.empty[File]
@@ -6,9 +6,9 @@ val test123 = project in file(".") enablePlugins TestP settings(
 )
 
 TaskKey[Unit]("check") := {
-  val last = IO read (BuiltinCommands lastLogFile state.value).get
+  val last = IO.read(BuiltinCommands.lastLogFile(state.value).get)
   def assertContains(expectedString: String) =
-    if (!(last contains expectedString)) sys error s"Expected string $expectedString to be present"
+    if (!last.contains(expectedString)) sys error s"Expected string $expectedString to be present"
   assertContains("resource generated in settings")
   assertContains("resource generated in plugin")
 }
diff --git a/sbt-app/src/sbt-test/project/default-settings/build.sbt b/sbt-app/src/sbt-test/project/default-settings/build.sbt
index 8ffb5bcd4..e4577269b 100644
--- a/sbt-app/src/sbt-test/project/default-settings/build.sbt
+++ b/sbt-app/src/sbt-test/project/default-settings/build.sbt
@@ -2,7 +2,7 @@ val root = (project in file("."))
 
 TaskKey[Unit]("checkScalaVersion", "test") := Def.uncached {
   val sv = scalaVersion.value
-  assert(sv startsWith "3.", s"Found $sv!")
+  assert(sv.startsWith("3."), s"Found $sv!")
 }
 
 TaskKey[Unit]("checkArtifacts", "test") := Def.uncached {
diff --git a/sbt-app/src/sbt-test/project/load-hooks/build.sbt b/sbt-app/src/sbt-test/project/load-hooks/build.sbt
index 9e12fedd5..0e722e77a 100644
--- a/sbt-app/src/sbt-test/project/load-hooks/build.sbt
+++ b/sbt-app/src/sbt-test/project/load-hooks/build.sbt
@@ -2,7 +2,7 @@
   val loadCount = AttributeKey[Int]("load-count")
   val unloadCount = AttributeKey[Int]("unload-count")
   def f(key: AttributeKey[Int]) = (s: State) => {
-    val previous = s get key getOrElse 0
+    val previous = s.get(key)getOrElse(0)
     s.put(key, previous + 1)
   }
   Seq(
@@ -14,7 +14,7 @@
 InputKey[Unit]("checkCount") := {
   val s = state.value
   val args = Def.spaceDelimited().parsed
-  def get(label: String) = s get AttributeKey[Int](label) getOrElse 0
+  def get(label: String) = s.get(AttributeKey[Int](label)).getOrElse(0)
   val loadCount = get("load-count")
   val unloadCount = get("unload-count")
   val expectedLoad = args(0).toInt
diff --git a/sbt-app/src/sbt-test/project/session-update-from-cmd/project/Common.scala b/sbt-app/src/sbt-test/project/session-update-from-cmd/project/Common.scala
index 57772a073..9bdce307c 100644
--- a/sbt-app/src/sbt-test/project/session-update-from-cmd/project/Common.scala
+++ b/sbt-app/src/sbt-test/project/session-update-from-cmd/project/Common.scala
@@ -21,7 +21,7 @@ object Common {
 
 
   val UpdateK3 = Command.command("UpdateK3"): (st: State) =>
-    val ex = Project extract st
+    val ex = Project.extract(st)
     import ex._
     val session2 = BuiltinCommands.setThis(ex, Seq(k3 := {}), """k3 := {
                                                                     |//
diff --git a/sbt-app/src/sbt-test/project/transitive-plugins/build.sbt b/sbt-app/src/sbt-test/project/transitive-plugins/build.sbt
index 0dd0cad82..384c95d75 100644
--- a/sbt-app/src/sbt-test/project/transitive-plugins/build.sbt
+++ b/sbt-app/src/sbt-test/project/transitive-plugins/build.sbt
@@ -15,7 +15,7 @@ lazy val commonSettings = Seq(
     val ivyHome = Classpaths.bootIvyHome(appConfiguration.value) getOrElse sys.error(
       "Launcher did not provide the Ivy home directory."
     )
-    Resolver.file("real-local", ivyHome / "local")(Resolver.ivyStylePatterns)
+    Resolver.file("real-local", ivyHome / "local")(using Resolver.ivyStylePatterns)
   },
   resolvers += Resolver.mavenLocal,
   resolvers += ("test-repo" at ((ThisBuild / baseDirectory).value / "repo/").asURL.toString)
diff --git a/sbt-app/src/sbt-test/project/update-classifiers/build.sbt b/sbt-app/src/sbt-test/project/update-classifiers/build.sbt
index 675f26517..741f8601d 100644
--- a/sbt-app/src/sbt-test/project/update-classifiers/build.sbt
+++ b/sbt-app/src/sbt-test/project/update-classifiers/build.sbt
@@ -1,2 +1,2 @@
-lazy val a = project in file(".") dependsOn(b)
+lazy val a = project.in(file(".")).dependsOn(b)
 lazy val b = project
diff --git a/sbt-app/src/sbt-test/source-dependencies/binary/build.sbt b/sbt-app/src/sbt-test/source-dependencies/binary/build.sbt
index 3350d0a98..964e70e21 100644
--- a/sbt-app/src/sbt-test/source-dependencies/binary/build.sbt
+++ b/sbt-app/src/sbt-test/source-dependencies/binary/build.sbt
@@ -4,5 +4,5 @@ lazy val dep = project
 
 lazy val use = project.
   settings(
-    (Compile / unmanagedJars) += ((dep / Compile / packageBin) map Attributed.blank).value
+    (Compile / unmanagedJars) += (dep / Compile / packageBin).map(Attributed.blank).value
   )