Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ object Versions {
const val clikt = "5.0.0"
const val detekt = "1.23.7"
const val ini4j = "0.5.4"
const val jacodb = "da338ffc83"
const val jacodb = "d7dd9d343b"
const val juliet = "1.3.2"
const val junit = "5.9.3"
const val kotlin = "2.1.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ suspend fun JcDatabase.classpathWithApproximations(
val approximationsPath = setOf(File(usvmApiJarPath), File(usvmApproximationsJarPath))

val cpWithApproximations = dirOrJars + approximationsPath
val featuresWithApproximations = features + listOf(Approximations)
val approximations = this.features.filterIsInstance<Approximations>().singleOrNull()
?: error("approximations feature not found in database features")
val featuresWithApproximations = features + listOf(approximations)
val cp = classpath(cpWithApproximations, featuresWithApproximations.distinct())

val approximationsLocations = cp.locations.filter { it.jarOrFolder in approximationsPath }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class JacoDBContainer(
builder()

if (samplesWithApproximationsKey == key) {
installFeatures(Approximations)
installFeatures(Approximations(emptyList()))
}

loadByteCode(classpath)
Expand Down