Merge pull request #414 from eed3si9n/wip/integrationtest

Deprecate IntegrationTest
sbt · Apr 25, 2023 · b404431 · b404431
2 parents 48dc7b2 + 7d052bd
commit b404431
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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
@@ -1 +1 @@
-sbt.version=1.7.0
+sbt.version=1.8.2