From 562eae2bff4b031fc0e8f46462181bf1e572fdbc Mon Sep 17 00:00:00 2001 From: Filipe Regadas Date: Sat, 19 Oct 2019 09:38:54 +0100 Subject: [PATCH] Add explicit return type to plugin settings --- build.sbt | 2 ++ main/src/main/scala/sbt/ScriptedPlugin.scala | 4 ++-- main/src/main/scala/sbt/plugins/SbtPlugin.scala | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index db0c72eb4..24f0103cf 100644 --- a/build.sbt +++ b/build.sbt @@ -750,6 +750,8 @@ lazy val mainProj = (project in file("main")) exclude[IncompatibleSignatureProblem]("sbt.internal.server.LanguageServerReporter.*"), exclude[VirtualStaticMemberProblem]("sbt.internal.server.LanguageServerProtocol.*"), exclude[IncompatibleSignatureProblem]("sbt.internal.librarymanagement.IvyXml.*"), + exclude[IncompatibleSignatureProblem]("sbt.ScriptedPlugin.*Settings"), + exclude[IncompatibleSignatureProblem]("sbt.plugins.SbtPlugin.*Settings"), // Removed private internal classes exclude[MissingClassProblem]("sbt.internal.ReverseLookupClassLoaderHolder$BottomClassLoader"), exclude[MissingClassProblem]("sbt.internal.ReverseLookupClassLoaderHolder$ReverseLookupClassLoader$ResourceLoader"), diff --git a/main/src/main/scala/sbt/ScriptedPlugin.scala b/main/src/main/scala/sbt/ScriptedPlugin.scala index fe41e772b..70bf6090c 100644 --- a/main/src/main/scala/sbt/ScriptedPlugin.scala +++ b/main/src/main/scala/sbt/ScriptedPlugin.scala @@ -51,12 +51,12 @@ object ScriptedPlugin extends AutoPlugin { } import autoImport._ - override lazy val globalSettings = Seq( + override lazy val globalSettings: Seq[Setting[_]] = Seq( scriptedBufferLog := true, scriptedLaunchOpts := Seq(), ) - override lazy val projectSettings = Seq( + override lazy val projectSettings: Seq[Setting[_]] = Seq( ivyConfigurations ++= Seq(ScriptedConf, ScriptedLaunchConf), scriptedSbt := (sbtVersion in pluginCrossBuild).value, sbtLauncher := getJars(ScriptedLaunchConf).map(_.get.head).value, diff --git a/main/src/main/scala/sbt/plugins/SbtPlugin.scala b/main/src/main/scala/sbt/plugins/SbtPlugin.scala index 792eebc70..5873d2412 100644 --- a/main/src/main/scala/sbt/plugins/SbtPlugin.scala +++ b/main/src/main/scala/sbt/plugins/SbtPlugin.scala @@ -9,11 +9,12 @@ package sbt package plugins import Keys._ +import Def.Setting object SbtPlugin extends AutoPlugin { override def requires = ScriptedPlugin - override lazy val projectSettings = Seq( + override lazy val projectSettings: Seq[Setting[_]] = Seq( sbtPlugin := true ) }