From 7d052bde8f7944e9f949fd4688e37fb77e1d1d3d Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 24 Apr 2023 00:23:43 -0400 Subject: [PATCH] Deprecate IntegrationTest We plan to remove IntegrationTest configuration. See https://eed3si9n.com/sbt-drop-custom-config/ for details. --- .../scala/sbt/librarymanagement/ConfigurationExtra.scala | 6 +++++- .../sbt/librarymanagement/LibraryManagementSyntax.scala | 1 + project/build.properties | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core/src/main/scala/sbt/librarymanagement/ConfigurationExtra.scala b/core/src/main/scala/sbt/librarymanagement/ConfigurationExtra.scala index 7431e8950..ecdd2d875 100644 --- a/core/src/main/scala/sbt/librarymanagement/ConfigurationExtra.scala +++ b/core/src/main/scala/sbt/librarymanagement/ConfigurationExtra.scala @@ -3,7 +3,7 @@ */ package sbt.librarymanagement -import scala.annotation.tailrec +import scala.annotation.{ nowarn, tailrec } import scala.language.experimental.macros object Configurations { @@ -19,9 +19,11 @@ object Configurations { lazy val RuntimeInternal = optionalInternal(Runtime) lazy val TestInternal = fullInternal(Test) + @nowarn lazy val IntegrationTestInternal = fullInternal(IntegrationTest) lazy val CompileInternal = fullInternal(Compile) + @nowarn def internalMap(c: Configuration) = c match { case Compile => CompileInternal case Test => TestInternal @@ -39,6 +41,7 @@ object Configurations { lazy val Default = Configuration.of("Default", "default") lazy val Compile = Configuration.of("Compile", "compile") + @deprecated("Create a separate subproject for testing instead", "1.9.0") lazy val IntegrationTest = Configuration.of("IntegrationTest", "it") extend (Runtime) lazy val Provided = Configuration.of("Provided", "provided") lazy val Runtime = Configuration.of("Runtime", "runtime") extend (Compile) @@ -67,6 +70,7 @@ object Configurations { ) /** Returns true if the configuration should be under the influence of scalaVersion. */ + @nowarn private[sbt] def underScalaVersion(c: Configuration): Boolean = c match { case Default | Compile | IntegrationTest | Provided | Runtime | Test | Optional | diff --git a/core/src/main/scala/sbt/librarymanagement/LibraryManagementSyntax.scala b/core/src/main/scala/sbt/librarymanagement/LibraryManagementSyntax.scala index 8d177c835..1ab5629d7 100644 --- a/core/src/main/scala/sbt/librarymanagement/LibraryManagementSyntax.scala +++ b/core/src/main/scala/sbt/librarymanagement/LibraryManagementSyntax.scala @@ -28,6 +28,7 @@ trait LibraryManagementSyntax final val Compile = C.Compile final val Test = C.Test final val Runtime = C.Runtime + @deprecated("Create a separate subproject for testing instead", "1.9.0") final val IntegrationTest = C.IntegrationTest final val Default = C.Default final val Provided = C.Provided diff --git a/project/build.properties b/project/build.properties index 5b12c1dc6..46e43a97e 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.0 +sbt.version=1.8.2