UnitTestBot
diff --git a/‎.github/workflows/build-and-run-tests-from-branch.yml‎
Lines changed: 5 additions & 5 deletions b/‎.github/workflows/build-and-run-tests-from-branch.yml‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎.github/workflows/public-rider-plugin.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/public-rider-plugin.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/publish-cli-from-branch.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/publish-cli-from-branch.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/publish-cli-image-from-branch.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/publish-cli-image-from-branch.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/publish-plugin-from-branch.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/publish-plugin-from-branch.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/run-chosen-tests-from-branch.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/run-chosen-tests-from-branch.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.run/Run IDEA.run.xml‎
Lines changed: 1 addition & 1 deletion b/‎.run/Run IDEA.run.xml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎gradle.properties‎
Lines changed: 16 additions & 5 deletions b/‎gradle.properties‎
Lines changed: 16 additions & 5 deletions
diff --git a/‎utbot-analytics/build.gradle‎
Lines changed: 24 additions & 14 deletions b/‎utbot-analytics/build.gradle‎
Lines changed: 24 additions & 14 deletions
diff --git a/‎utbot-core/src/main/kotlin/org/utbot/common/ThreadUtil.kt‎
Lines changed: 8 additions & 3 deletions b/‎utbot-core/src/main/kotlin/org/utbot/common/ThreadUtil.kt‎
Lines changed: 8 additions & 3 deletions
@@ -135,7 +135,7 @@ jobs:
 
       - name: Run tests
         run: |
-          gradle -PprojectType=Ultimate --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g :utbot-framework-test:test ${{ matrix.project.TESTS_TO_RUN }}
+          gradle --no-daemon --build-cache --no-parallel -PprojectType=Ultimate -PgithubActor=${{ github.actor }} -PgithubToken=${{ secrets.PACKAGES_RO_TOKEN }} -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g :utbot-framework-test:test ${{ matrix.project.TESTS_TO_RUN }}
 
       - name: Upload logs
         if: ${{ always() }}
@@ -203,7 +203,7 @@ jobs:
       - name: Run tests
         run: |
           cd utbot-spring-test
-          gradle -PprojectType=Community --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g :utbot-spring-test:test
+          gradle --no-daemon --build-cache --no-parallel -PprojectType=Community -PgithubActor=${{ github.actor }} -PgithubToken=${{ secrets.PACKAGES_RO_TOKEN }} -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g :utbot-spring-test:test
 
       - name: Upload logs
         if: ${{ always() }}
@@ -279,13 +279,13 @@ jobs:
         id: first-project
         run: |
           cd ${{ matrix.projects.first }}
-          gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g
+          gradle build --no-daemon --build-cache --no-parallel -PgithubActor=${{ github.actor }} -PgithubToken=${{ secrets.PACKAGES_RO_TOKEN }} -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g
 
       - name: Build project ${{ matrix.projects.second }}
         if: ${{ steps.first-project.outcome != 'cancelled' && steps.first-project.outcome != 'skipped' }}
         run: |
           cd ${{ matrix.projects.second }}
-          gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g
+          gradle build --no-daemon --build-cache --no-parallel -PgithubActor=${{ github.actor }} -PgithubToken=${{ secrets.PACKAGES_RO_TOKEN }} -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g
 
       - name: Upload test report if tests have failed
         if: ${{ failure() }}
@@ -354,7 +354,7 @@ jobs:
       - name: Run tests
         run: |
           cd ${{ matrix.project }}
-          gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g
+          gradle build --no-daemon --build-cache --no-parallel -PgithubActor=${{ github.actor }} -PgithubToken=${{ secrets.PACKAGES_RO_TOKEN }} -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g
 
       - name: Upload test report if tests have failed
         if: ${{ failure() }}
 
@@ -71,7 +71,7 @@ jobs:
 
     - name: Build UTBot Rider plugin
       run: |
-        gradle clean :utbot-rider:buildPlugin --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g -PsemVer=${{ env.VERSION }} -PincludeRiderInBuild=true
+        gradle clean :utbot-rider:buildPlugin  --no-daemon --build-cache --no-parallel -PgithubActor=${{ github.actor }} -PgithubToken=${{ secrets.PACKAGES_RO_TOKEN }} -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g -PsemVer=${{ env.VERSION }} -PincludeRiderInBuild=true
         cd utbot-rider/build/distributions
         unzip utbot-rider-${{ env.VERSION }}.zip
         rm utbot-rider-${{ env.VERSION }}.zip
 
@@ -89,7 +89,7 @@ jobs:
     - name: Build UTBot CLI
       run: |
         cd "${{ matrix.configuration.dir }}"
-        gradle clean build --no-daemon --build-cache --no-parallel ${{ matrix.configuration.extra_options }} -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g -PsemVer=${{ env.VERSION }}
+        gradle clean build --no-daemon --build-cache --no-parallel ${{ matrix.configuration.extra_options }} -PgithubActor=${{ github.actor }} -PgithubToken=${{ secrets.PACKAGES_RO_TOKEN }} -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g -PsemVer=${{ env.VERSION }}
 
     - name: Archive UTBot CLI
       if: ${{ inputs.upload-artifact == 'true' }}
 
@@ -42,7 +42,7 @@ jobs:
       - name: Build UTBot CLI
         run: |
           cd ${{ matrix.configuration.directory }}
-          gradle build --no-daemon --build-cache --no-parallel ${{ matrix.configuration.extra_options }} -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g -x test -PsemVer=${{ env.VERSION }}
+          gradle build --no-daemon --build-cache --no-parallel ${{ matrix.configuration.extra_options }} -PgithubActor=${{ github.actor }} -PgithubToken=${{ secrets.PACKAGES_RO_TOKEN }} -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g -x test -PsemVer=${{ env.VERSION }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -80,7 +80,7 @@ jobs:
 
       - name: Build UTBot IntelliJ IDEA plugin
         run: |
-          gradle clean buildPlugin --no-daemon --build-cache --no-parallel ${{ matrix.configuration.extra_options }} -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g -PsemVer=${{ env.VERSION }}
+          gradle clean buildPlugin --no-daemon --build-cache --no-parallel -PgithubActor=${{ github.actor }} -PgithubToken=${{ secrets.PACKAGES_RO_TOKEN }} ${{ matrix.configuration.extra_options }} -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g -PsemVer=${{ env.VERSION }}
           cd utbot-intellij-main/build/distributions
           unzip utbot-intellij-main-${{ env.VERSION }}.zip
           rm utbot-intellij-main-${{ env.VERSION }}.zip
 
@@ -49,7 +49,7 @@ jobs:
           
       - name: Run chosen tests
         run: |
-          gradle :${{ github.event.inputs.project-name }}:test -PprojectType=Ultimate --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g --tests ${{ github.event.inputs.tests-bunch-name }}
+          gradle :${{ github.event.inputs.project-name }}:test -PprojectType=Ultimate --no-daemon --build-cache --no-parallel -PgithubActor=${{ github.actor }} -PgithubToken=${{ secrets.PACKAGES_RO_TOKEN }} -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g --tests ${{ github.event.inputs.tests-bunch-name }}
           
       - name: Upload ${{ github.event.inputs.project-name }} tests report if tests have failed
         if: ${{ failure() }}
 
@@ -2,7 +2,7 @@
   <configuration default="false" name="Run IDEA" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$/utbot-intellij" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/utbot-intellij-main" />
       <option name="externalSystemIdString" value="GRADLE" />
       <option name="scriptParameters" value="" />
       <option name="taskDescriptions">
 
@@ -41,22 +41,23 @@ junit4PlatformVersion=1.9.0
 # NOTE: Mockito versions 5+ are not compatible with Java 8: https://www.davidvlijmincx.com/posts/upgrade-to-mockito-5
 mockitoVersion=4.11.0
 mockitoInlineVersion=4.11.0
-ksmtVersion=0.4.3
+ksmtVersion=0.5.13
 sootVersion=4.4.0-FORK-2
 kotlinVersion=1.8.0
 log4j2Version=2.13.3
-coroutinesVersion=1.6.3
-collectionsVersion=0.3.4
+coroutinesVersion=1.6.4
+collectionsVersion=0.3.5
 # after updating plugin version you should manually bump corresponding versions in plugin
 # as they cannot be set from properties
 # utbot-intellij/build.gradle.kts
 # utbot-rd/build.gradle
 # utbot-rider/build.gradle.kts
 intellijPluginVersion=1.13.1
-# every time you bump rd version:
+# TODO every time you bump rd version:
 # 1. regenerate all models
 # 2. check if rider plugin works
-rdVersion=2023.1.2
+# 3. search for previous RD version (as string) in entire project and update it manually in places where it has to be hardcoded
+rdVersion=2023.2.0
 # to enable - add -PincludeRiderInBuild=true in build CLI
 includeRiderInBuild=false
 jacocoVersion=0.8.8
@@ -96,12 +97,22 @@ commonsLoggingVersion=1.2
 commonsIOVersion=2.11.0
 javaxVersion=2.2
 jakartaVersion=3.1.0
+jacoDbVersion=1.4.3
+# TODO could be left outdated here to avoid exceeding GitHub packages drive space,
+# TODO run `gradle publishToMavenLocal -Pversion={usvmVersion}` locally in usvm project and update {usvmVersion} locally
+usvmVersion=comp-231201-17
 
 # use latest Java 8 compaitable Spring and Spring Boot versions
 springVersion=5.3.28
 springBootVersion=2.7.13
 springSecurityVersion=5.8.5
 
+# Put your GitHub username here to use utbot-junit-contest with usvm
+githubActor=<actor>
+# Use your GitHub token generated here -- https://github.com/settings/tokens/new?description=USVM&scopes=read:packages
+# Keep `read:packages` checkbox selected
+githubToken=<token>
+
 # configuration for build server
 #
 # the following options are passed to gradle command explicitly (see appropriate workflow):
 
@@ -45,17 +45,27 @@ processResources {
     }
 }
 
-jar {
-    dependsOn classes
-    manifest {
-        attributes 'Main-Class': 'org.utbot.QualityAnalysisKt'
-    }
-
-    dependsOn configurations.runtimeClasspath
-    from {
-        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
-    }
-
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    zip64 = true
-}
+// TODO if you need utbot-analytics fat jar, use shadow jar to create a SEPARATE task for a fat jar.
+//  Do not use main jar for a fat jar, because it breaks Gradle conflict resolution, here's how:
+//    1. utbot-analytics depends on library A version 1.0 (and adds it to own main jar)
+//    2. utbot-junit-contest depends on utbot-analytics and library A version 1.1
+//    3. Both library A version 1.0 and version 1.1 end up on the classpath and it's a matter of chance which one is earlier
+//  If utbot-analytics were to only declare its dependency on library A version 1.0 and not force it by adding it to a
+//  main jar, then Gradle would be able to recognize the conflict of library A version 1.0 and version 1.1 and resolve
+//  it according to a conflict resolution strategy, which by default picks the latest version, which works in most cases.
+//  But if you put library A version 1.0 into some fat jar, Gradle will no longer be able to exclude it from the fat jar
+//  in favor of a newer version when it needs to resolve dependency conflicts.
+//jar {
+//    dependsOn classes
+//    manifest {
+//        attributes 'Main-Class': 'org.utbot.QualityAnalysisKt'
+//    }
+//
+//    dependsOn configurations.runtimeClasspath
+//    from {
+//        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
+//    }
+//
+//    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+//    zip64 = true
+//}
@@ -61,7 +61,12 @@ class ThreadBasedExecutor {
      *
      * [stopWatch] is used to respect specific situations (such as class loading and transforming) while invoking.
      */
-    fun invokeWithTimeout(timeoutMillis: Long, stopWatch: StopWatch? = null, action:() -> Any?) : Result<Any?>? {
+    fun invokeWithTimeout(
+        timeoutMillis: Long,
+        stopWatch: StopWatch? = null,
+        threadDeathThrowPeriodMillis: Long = 10_000,
+        action:() -> Any?
+    ) : Result<Any?>? {
         ensureThreadIsAlive()
 
         requestQueue.offer {
@@ -95,10 +100,10 @@ class ThreadBasedExecutor {
                         t.stop()
                     }
                     // If somebody catches `ThreadDeath`, for now we
-                    // just wait for at most 10s and throw another one.
+                    // just wait for [threadDeathThrowPeriod] and throw another one.
                     //
                     // A better approach may be to kill instrumented process.
-                    t.join(10_000)
+                    t.join(threadDeathThrowPeriodMillis)
                 }
             } catch (_: Throwable) {}
         }