summaryrefslogtreecommitdiff
path: root/build.sbt
diff options
context:
space:
mode:
authorPerformant Data LLC <performantdata@users.noreply.github.com>2016-04-25 16:33:04 -0700
committerPerformant Data LLC <performantdata@users.noreply.github.com>2016-05-24 10:42:04 -0700
commit60f28f9e6a330e91a0f1204917301d401a6fce72 (patch)
tree8b47f18cc2703c61cd483fa6c84d6241452c03ed /build.sbt
parent207e32df30fd733e4dd1cb28fb8cb5c3153c21a6 (diff)
downloadscala-60f28f9e6a330e91a0f1204917301d401a6fce72.tar.gz
scala-60f28f9e6a330e91a0f1204917301d401a6fce72.tar.bz2
scala-60f28f9e6a330e91a0f1204917301d401a6fce72.zip
SI-9522 release key reference when deleting from OpenHashMap
This sets the key field in the hash table entry to its default value when an entry is deleted, so as not to unexpectedly retain an object reference, leading to a memory leak. Also includes incidental changes to the slot location algorithm that reduce the number of deleted entries.
Diffstat (limited to 'build.sbt')
-rw-r--r--build.sbt3
1 files changed, 2 insertions, 1 deletions
diff --git a/build.sbt b/build.sbt
index d592b86aff..2eb629f923 100644
--- a/build.sbt
+++ b/build.sbt
@@ -66,6 +66,7 @@ val scalaXmlDep = withoutScalaLang("org.scala-lang.modules" %% "scala-xml" % ver
val partestDep = withoutScalaLang("org.scala-lang.modules" %% "scala-partest" % versionNumber("partest"))
val junitDep = "junit" % "junit" % "4.11"
val junitIntefaceDep = "com.novocode" % "junit-interface" % "0.11" % "test"
+val jolDep = "org.openjdk.jol" % "jol-core" % "0.5"
val asmDep = "org.scala-lang.modules" % "scala-asm" % versionProps("scala-asm.version")
val jlineDep = "jline" % "jline" % versionProps("jline.version")
val antDep = "org.apache.ant" % "ant" % "1.9.4"
@@ -544,7 +545,7 @@ lazy val junit = project.in(file("test") / "junit")
.settings(disablePublishing: _*)
.settings(
fork in Test := true,
- libraryDependencies ++= Seq(junitDep, junitIntefaceDep),
+ libraryDependencies ++= Seq(junitDep, junitIntefaceDep, jolDep),
testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"),
unmanagedSourceDirectories in Test := List(baseDirectory.value)
)