Put concrete executor jar in resources for contest estimator

UnitTestBot · Jul 5, 2022 · 67cc7d9 · 67cc7d9
1 parent 63e2252
commit 67cc7d9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/utbot-junit-contest/build.gradle b/utbot-junit-contest/build.gradle
@@ -2,6 +2,10 @@ apply from: "${rootProject.projectDir}/gradle/include/jvm-project.gradle"
 
 apply plugin: 'jacoco'
 
+configurations {
+    fetchInstrumentationJar
+}
+
 compileJava {
     options.compilerArgs << '-XDignore.symbol.file'
 }
@@ -50,8 +54,6 @@ dependencies {
     api project(":utbot-framework")
     api project(":utbot-analytics")
 
-    api project(":utbot-instrumentation")
-
     implementation "com.github.UnitTestBot:soot:${soot_commit_hash}"
     implementation group: 'org.apache.commons', name: 'commons-exec', version: '1.2'
     implementation group: 'commons-io', name: 'commons-io', version: commons_io_version
@@ -64,6 +66,13 @@ dependencies {
     testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.2.0'
     testImplementation group: 'org.mockito', name: 'mockito-inline', version: '4.2.0'
     testImplementation 'junit:junit:4.13.2'
+    fetchInstrumentationJar project(path: ':utbot-instrumentation', configuration:'instrumentationArchive')
+}
+
+processResources {
+    from(configurations.fetchInstrumentationJar) {
+        into "lib"
+    }
 }
 
 jar { dependsOn classes

diff --git a/utbot-junit-contest/src/main/kotlin/org/utbot/contest/ContestEstimator.kt b/utbot-junit-contest/src/main/kotlin/org/utbot/contest/ContestEstimator.kt
@@ -38,7 +38,6 @@ import org.utbot.framework.JdkPathService
 import org.utbot.predictors.StateRewardPredictorFactoryImpl
 import org.utbot.framework.PathSelectorType
 import org.utbot.framework.UtSettings
-import org.utbot.predictors.NNStateRewardPredictorBase
 
 private val logger = KotlinLogging.logger {}