From f98c4fff3bb555f65855a13c009a09cda7686a31 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 30 Apr 2023 00:56:11 -0400 Subject: [PATCH] Update modules --- .../src/main/scala/sbt/plugins/DependencyTreePlugin.scala | 3 +++ .../src/test/scala/sbt/BuildSettingsInstances.scala | 1 + main/src/main/scala/sbt/Defaults.scala | 1 + main/src/main/scala/sbt/plugins/JUnitXmlReportPlugin.scala | 2 ++ project/Dependencies.scala | 6 +++--- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dependency-tree/src/main/scala/sbt/plugins/DependencyTreePlugin.scala b/dependency-tree/src/main/scala/sbt/plugins/DependencyTreePlugin.scala index 1fbaabd70..a6debd947 100644 --- a/dependency-tree/src/main/scala/sbt/plugins/DependencyTreePlugin.scala +++ b/dependency-tree/src/main/scala/sbt/plugins/DependencyTreePlugin.scala @@ -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 diff --git a/main-settings/src/test/scala/sbt/BuildSettingsInstances.scala b/main-settings/src/test/scala/sbt/BuildSettingsInstances.scala index 313459dbb..9ce456b64 100644 --- a/main-settings/src/test/scala/sbt/BuildSettingsInstances.scala +++ b/main-settings/src/test/scala/sbt/BuildSettingsInstances.scala @@ -53,6 +53,7 @@ object BuildSettingsInstances { ) } + @nowarn implicit def arbConfigKey: Arbitrary[ConfigKey] = Arbitrary { Gen.frequency( 2 -> const[ConfigKey](Compile), diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 123208342..7af7c122d 100644 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -2602,6 +2602,7 @@ object Defaults extends BuildCommon { lazy val testSettings: Seq[Setting[_]] = configSettings ++ testTasks + @nowarn lazy val itSettings: Seq[Setting[_]] = inConfig(IntegrationTest) { testSettings } diff --git a/main/src/main/scala/sbt/plugins/JUnitXmlReportPlugin.scala b/main/src/main/scala/sbt/plugins/JUnitXmlReportPlugin.scala index 2e194cc3f..95da705df 100644 --- a/main/src/main/scala/sbt/plugins/JUnitXmlReportPlugin.scala +++ b/main/src/main/scala/sbt/plugins/JUnitXmlReportPlugin.scala @@ -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) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 59694686b..e2d766f83 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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