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

remove deprecated keys #289

Merged
merged 1 commit into from
Mar 22, 2022
Merged

remove deprecated keys #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ object Dependencies {
val all = List(
"org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.0.202109080827-r",
"ch.epfl.scala" % "scalafix-interfaces" % scalafixVersion,
// coursier-small provides a binary stable API around Coursier making sure that
// sbt-scalafix doesn't conflict with the user's installed version of sbt-coursier.
// Details: https://github.com/olafurpg/coursier-small
"com.geirsson" %% "coursier-small" % "1.3.3",
"io.get-coursier" % "interface" % "1.0.6"
)
}
30 changes: 0 additions & 30 deletions src/main/scala/scalafix/sbt/ScalafixPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package scalafix.sbt
import java.io.PrintStream
import java.nio.file.{Path, Paths}

import com.geirsson.{coursiersmall => cs}
import coursierapi.Repository
import sbt.KeyRanks.Invisible
import sbt.Keys._
Expand Down Expand Up @@ -53,19 +52,6 @@ object ScalafixPlugin extends AutoPlugin {
"Make scalafix invocations incremental. On by default."
)

import scala.language.implicitConversions
@deprecated(
"Usage of coursiersmall.Repository is deprecated, use coursierapi.Repository instead",
"0.9.17"
)
implicit def coursiersmall2coursierapi(
csRepository: cs.Repository
): Repository =
csRepository match {
case m: cs.Repository.Maven => coursierapi.MavenRepository.of(m.root)
case i: cs.Repository.Ivy => coursierapi.IvyRepository.of(i.root)
case cs.Repository.Ivy2Local => coursierapi.Repository.ivy2Local()
}
val scalafixResolvers: SettingKey[Seq[Repository]] =
settingKey[Seq[Repository]](
"Optional list of Maven/Ivy repositories to use for fetching custom rules. " +
Expand Down Expand Up @@ -122,22 +108,6 @@ object ScalafixPlugin extends AutoPlugin {
scalafix / streams := (scalafixDummyTask / streams).value
)
)
@deprecated("This setting is no longer used", "0.6.0")
val scalafixSourceroot: SettingKey[File] =
settingKey[File]("Unused")
@deprecated("Use scalacOptions += -Yrangepos instead", "0.6.0")
def scalafixScalacOptions: Def.Initialize[Seq[String]] =
Def.setting(Nil)
@deprecated("Use addCompilerPlugin(semanticdb-scalac) instead", "0.6.0")
def scalafixLibraryDependencies: Def.Initialize[List[ModuleID]] =
Def.setting(Nil)

@deprecated(
"Use addCompilerPlugin(scalafixSemanticdb) and scalacOptions += \"-Yrangepos\" instead",
"0.6.0"
)
def scalafixSettings: Seq[Def.Setting[_]] =
Nil
}

import autoImport._
Expand Down
2 changes: 0 additions & 2 deletions src/sbt-test/sbt-scalafix/basic/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import com.geirsson.coursiersmall.Repository // deprecated, but checks source compatibility

inThisBuild(
List(
scalaVersion := "2.12.14",
Expand Down