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

Merge pull request #7226 from eed3si9n/wip/bump

This commit is contained in:
eugene yokota 2023-04-30 11:09:40 -04:00 committed by GitHub
parent 2035d9fb30 f98c4fff3b
commit 48cacd312e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dependency-tree/src/main/scala/sbt/plugins/DependencyTreePlugin.scala
View File

@ -8,11 +8,14 @@
package sbt
package plugins
import scala.annotation.nowarn
object DependencyTreePlugin extends AutoPlugin {
object autoImport extends DependencyTreeKeys
override def trigger = AllRequirements
override def requires = MiniDependencyTreePlugin
@nowarn
val configurations = Vector(Compile, Test, IntegrationTest, Runtime, Provided, Optional)
// MiniDependencyTreePlugin provides baseBasicReportingSettings for Compile and Test

1
main-settings/src/test/scala/sbt/BuildSettingsInstances.scala
View File

@ -53,6 +53,7 @@ object BuildSettingsInstances {
)
}
@nowarn
implicit def arbConfigKey: Arbitrary[ConfigKey] = Arbitrary {
Gen.frequency(
2 -> const[ConfigKey](Compile),

1
main/src/main/scala/sbt/Defaults.scala
View File

@ -2602,6 +2602,7 @@ object Defaults extends BuildCommon {
lazy val testSettings: Seq[Setting[_]] = configSettings ++ testTasks
@nowarn
lazy val itSettings: Seq[Setting[_]] = inConfig(IntegrationTest) {
testSettings
}

2
main/src/main/scala/sbt/plugins/JUnitXmlReportPlugin.scala
View File

@ -18,6 +18,7 @@ import sbt.Project.inConfig
import sbt.internal._
import sbt.io.syntax._
import sbt.librarymanagement.Configurations.{ IntegrationTest, Test }
import scala.annotation.nowarn
/**
* An experimental plugin that adds the ability for junit-xml to be generated.
@ -50,6 +51,7 @@ object JUnitXmlReportPlugin extends AutoPlugin {
import autoImport._
@nowarn
override lazy val projectSettings: Seq[Setting[_]] =
inConfig(Test)(testReportSettings) ++
inConfig(IntegrationTest)(testReportSettings)

6
project/Dependencies.scala
View File

@ -12,10 +12,10 @@ object Dependencies {
sys.env.get("BUILD_VERSION") orElse sys.props.get("sbt.build.version")
// sbt modules
private val ioVersion = nightlyVersion.getOrElse("1.8.0")
private val ioVersion = nightlyVersion.getOrElse("1.9.0-M1")
private val lmVersion =
sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.9.0-M1")
val zincVersion = nightlyVersion.getOrElse("1.8.0")
sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.9.0-M2")
val zincVersion = nightlyVersion.getOrElse("1.9.0-M2")
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion