Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

removes the "compile-time" config in favor of "provided" #655

Merged
merged 2 commits into from
Oct 31, 2023
Merged

removes the "compile-time" config in favor of "provided" #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d48ebb
rid of "compile-time" in favor of "provided"
satorg Oct 25, 2023
8f16fcc
restore "compile-time" keeping it deprecated
satorg Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion kernel/src/main/scala/org/typelevel/sbt/TypelevelKernelPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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))
Expand Down
3 changes: 1 addition & 2 deletions settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading