Merge pull request #655 from satorg/fix-compile-time

removes the "compile-time" config in favor of "provided"
typelevel · Oct 31, 2023 · 6a44e1f · 6a44e1f
2 parents d2c50f7 + 8f16fcc
commit 6a44e1f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/kernel/src/main/scala/org/typelevel/sbt/TypelevelKernelPlugin.scala b/kernel/src/main/scala/org/typelevel/sbt/TypelevelKernelPlugin.scala
@@ -18,17 +18,19 @@ package org.typelevel.sbt
 
 import org.typelevel.sbt.kernel.GitHelper
 import org.typelevel.sbt.kernel.V
+import sbt.Keys._
 import sbt._
 import sbt.plugins.JvmPlugin
 
-import Keys._
+import scala.annotation.nowarn
 
 object TypelevelKernelPlugin extends AutoPlugin {
 
   override def requires = JvmPlugin
   override def trigger = allRequirements
 
   object autoImport {
+    @deprecated("use `Provided` instead", "0.6.1")
     lazy val CompileTime: Configuration = config("compile-time").hide
 
     lazy val tlIsScala3 = settingKey[Boolean]("True if building with Scala 3")
@@ -79,6 +81,7 @@ object TypelevelKernelPlugin extends AutoPlugin {
     }
   )
 
+  @nowarn("cat=deprecation")
   override def projectSettings = Seq(
     ivyConfigurations += CompileTime,
     Compile / unmanagedClasspath ++= update.value.select(configurationFilter(CompileTime.name))

diff --git a/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala b/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala
@@ -66,8 +66,7 @@ object TypelevelSettingsPlugin extends AutoPlugin {
 
       val scalacCompat =
         if (Set("2.12", "2.13", "3").contains(scalaBinaryVersion.value))
-          Seq(CompileTime, Test).map(
-            "org.typelevel" %% "scalac-compat-annotation" % "0.1.2" % _)
+          Seq("org.typelevel" %% "scalac-compat-annotation" % "0.1.2" % Provided)
         else
           Nil