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

[1.x] avoid deprecated mutable.OpenHashMap #1475

Merged
merged 3 commits into from
Oct 19, 2024
Merged

[1.x] avoid deprecated mutable.OpenHashMap #1475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9689180
Remove deprecated OpenHashMap
Friendseeker Oct 19, 2024
92b1cbf
Add MIMA exclusion rule
Friendseeker Oct 19, 2024
7aa4a1f
Add all major zinc versions to mimaPreviousArtifacts
Friendseeker Oct 19, 2024
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
6 changes: 6 additions & 0 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ def mimaSettings: Seq[Setting[?]] = Seq(
"1.5.0",
"1.6.0",
"1.7.0",
"1.8.0",
"1.9.0",
"1.10.0",
)
val versions =
if (scalaVersion.value.startsWith("2.12.")) pre140 ++ post140
Expand Down Expand Up @@ -641,6 +644,9 @@ lazy val zincClasspath = (projectMatrix in internalPath / "zinc-classpath")
exclude[IncompatibleResultTypeProblem](
"sbt.internal.inc.classpath.NativeCopyConfig.*"
),
exclude[IncompatibleResultTypeProblem](
"sbt.internal.inc.ReflectUtilities.fields"
),
exclude[IncompatibleSignatureProblem](
"sbt.internal.inc.classpath.NativeCopyConfig.*"
),
Expand Down
7 changes: 4 additions & 3 deletions internal/zinc-classpath/src/main/scala/sbt/internal/inc/ReflectUtilities.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ package sbt
package internal
package inc

import java.lang.reflect.Field
import scala.collection._

object ReflectUtilities {
Expand All @@ -33,10 +34,10 @@ object ReflectUtilities {

def ancestry(clazz: Class[?]): List[Class[?]] =
if (clazz == classOf[AnyRef] || !classOf[AnyRef].isAssignableFrom(clazz)) List(clazz)
else clazz :: ancestry(clazz.getSuperclass);
else clazz :: ancestry(clazz.getSuperclass)

def fields(clazz: Class[?]) =
mutable.OpenHashMap(ancestry(clazz).flatMap(_.getDeclaredFields).map(f => (f.getName, f)): _*)
def fields(clazz: Class[?]): mutable.Map[String, Field] =
mutable.AnyRefMap(ancestry(clazz).flatMap(_.getDeclaredFields).map(f => (f.getName, f)): _*)

/**
* Collects all `val`s of type `T` defined on value `self`.
Expand Down