luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix/5110

This commit is contained in:
Filipe Regadas 2019-10-19 15:27:34 +01:00 committed by GitHub
parent d49ced04da 8d9c28c587
commit 66da2f5926
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -750,6 +750,8 @@ lazy val mainProj = (project in file("main"))
exclude[IncompatibleSignatureProblem]("sbt.internal.server.LanguageServerReporter.*"), exclude[IncompatibleSignatureProblem]("sbt.internal.server.LanguageServerReporter.*"),
exclude[VirtualStaticMemberProblem]("sbt.internal.server.LanguageServerProtocol.*"), exclude[VirtualStaticMemberProblem]("sbt.internal.server.LanguageServerProtocol.*"),
exclude[IncompatibleSignatureProblem]("sbt.internal.librarymanagement.IvyXml.*"), exclude[IncompatibleSignatureProblem]("sbt.internal.librarymanagement.IvyXml.*"),
exclude[IncompatibleSignatureProblem]("sbt.ScriptedPlugin.*Settings"),
exclude[IncompatibleSignatureProblem]("sbt.plugins.SbtPlugin.*Settings"),
// Removed private internal classes // Removed private internal classes
exclude[MissingClassProblem]("sbt.internal.ReverseLookupClassLoaderHolder$BottomClassLoader"), exclude[MissingClassProblem]("sbt.internal.ReverseLookupClassLoaderHolder$BottomClassLoader"),
exclude[MissingClassProblem]("sbt.internal.ReverseLookupClassLoaderHolder$ReverseLookupClassLoader$ResourceLoader"), exclude[MissingClassProblem]("sbt.internal.ReverseLookupClassLoaderHolder$ReverseLookupClassLoader$ResourceLoader"),

4
main/src/main/scala/sbt/ScriptedPlugin.scala
View File

@ -51,12 +51,12 @@ object ScriptedPlugin extends AutoPlugin {
} }
import autoImport._ import autoImport._
override lazy val globalSettings = Seq( override lazy val globalSettings: Seq[Setting[_]] = Seq(
scriptedBufferLog := true, scriptedBufferLog := true,
scriptedLaunchOpts := Seq(), scriptedLaunchOpts := Seq(),
) )
override lazy val projectSettings = Seq( override lazy val projectSettings: Seq[Setting[_]] = Seq(
ivyConfigurations ++= Seq(ScriptedConf, ScriptedLaunchConf), ivyConfigurations ++= Seq(ScriptedConf, ScriptedLaunchConf),
scriptedSbt := (sbtVersion in pluginCrossBuild).value, scriptedSbt := (sbtVersion in pluginCrossBuild).value,
sbtLauncher := getJars(ScriptedLaunchConf).map(_.get.head).value, sbtLauncher := getJars(ScriptedLaunchConf).map(_.get.head).value,

3
main/src/main/scala/sbt/plugins/SbtPlugin.scala
View File

@ -9,11 +9,12 @@ package sbt
package plugins package plugins
import Keys._ import Keys._
import Def.Setting
object SbtPlugin extends AutoPlugin { object SbtPlugin extends AutoPlugin {
override def requires = ScriptedPlugin override def requires = ScriptedPlugin
override lazy val projectSettings = Seq( override lazy val projectSettings: Seq[Setting[_]] = Seq(
sbtPlugin := true sbtPlugin := true
) )
} }