diff --git a/build.sbt b/build.sbt index a375993bd..598b513e7 100644 --- a/build.sbt +++ b/build.sbt @@ -129,7 +129,7 @@ val sbt20Plus = "2.0.0-RC12", ) val mimaSettings = mimaSettingsSince(sbt20Plus) -def mimaSettingsSince(versions: Seq[String]): Seq[Def.Setting[?]] = Def settings ( +def mimaSettingsSince(versions: Seq[String]): Seq[Def.Setting[?]] = Def.settings( mimaPreviousArtifacts := { val crossVersion = if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled if (sbtPlugin.value) { diff --git a/project/HouseRulesPlugin.scala b/project/HouseRulesPlugin.scala index a8e12120f..386eab8c8 100644 --- a/project/HouseRulesPlugin.scala +++ b/project/HouseRulesPlugin.scala @@ -42,7 +42,7 @@ object HouseRulesPlugin extends AutoPlugin { (c / console / scalacOptions) --= Seq("-Ywarn-unused-import", "-Xlint") ) - private def scalaPartV = Def setting (CrossVersion partialVersion scalaVersion.value) + private def scalaPartV = Def.setting(CrossVersion.partialVersion(scalaVersion.value)) private implicit final class AnyWithIfScala[A](val __x: A) { def ifScala2x(p: Long => Boolean) = diff --git a/project/PublishBinPlugin.scala b/project/PublishBinPlugin.scala index a7d9f3c9b..c69fea7bd 100644 --- a/project/PublishBinPlugin.scala +++ b/project/PublishBinPlugin.scala @@ -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, diff --git a/project/Scripted.scala b/project/Scripted.scala index 752837422..71b343a12 100644 --- a/project/Scripted.scala +++ b/project/Scripted.scala @@ -31,7 +31,7 @@ object Scripted { // This is to workaround https://github.com/sbt/io/issues/110 if (!sys.props.contains("jna.nosys")) sys.props.put("jna.nosys", "true") - val RepoOverrideTest = config("repoOverrideTest") extend Compile + val RepoOverrideTest = config("repoOverrideTest").extend(Compile) val sbtWindowsExcludeFilter: FileFilter = if (scala.util.Properties.isWin) @@ -102,10 +102,10 @@ object Scripted { } yield files map (f => s"$group/$f") val testID = (for (group <- groupP; name <- nameP(group)) yield (group, name)) - val testIdAsGroup = matched(testID) map (test => Seq(test)) + val testIdAsGroup = matched(testID).map(test => Seq(test)) // (token(Space) ~> matched(testID)).* - (token(Space) ~> (PagedIds | testIdAsGroup)).* map (_.flatten) + (token(Space) ~> (PagedIds | testIdAsGroup)).*.map(_.flatten) } @nowarn diff --git a/project/Utils.scala b/project/Utils.scala index 270f16fd8..708f84456 100644 --- a/project/Utils.scala +++ b/project/Utils.scala @@ -36,7 +36,7 @@ object Utils { def projectComponent: Setting[?] = projectID := (componentID.value match { - case Some(id) => projectID.value extra ("e:component" -> id) + case Some(id) => projectID.value.extra("e:component" -> id) case None => projectID.value }) @@ -127,7 +127,7 @@ object Utils { excludePomArtifact(n.text) } - def excludePomArtifact(artifactId: String) = (artifactId startsWith "compiler-bridge") + def excludePomArtifact(artifactId: String) = artifactId.startsWith("compiler-bridge") val testExclusive = test / tags += (ExclusiveTest, 1)