Bumping kotlin version and clearing gradle (#1948)

* 1. bumped kotlin to 1.8.10
2. changed statistics monitoring docker images to support 17 jdk
3. minor refactorings and clarifications

* [utbot-rider]
1. supported 231 rider
2. remove support for previous rider version

* minor CI fixes

* kotlin plugion is 1.8.0

Author: Domonion

.github/workflows/collect-statistics.yml

@@ -101,7 +101,7 @@ jobs:
         project: ${{ fromJson(needs.setup_matrix.outputs.projects) }}
         value: ${{ fromJson(needs.setup_matrix.outputs.matrix) }}
     runs-on: ubuntu-20.04
-    container: unittestbot/java-env:java11-zulu-jdk-fx-gradle7.4.2-kotlinc1.7.0
+    container: unittestbot/java-env:java17-zulu-jdk-fx-gradle7.6.1-kotlinc1.8.0
     steps:
       - name: Install git
         run: |

build.gradle.kts

@@ -15,7 +15,7 @@ version = semVer ?: "$dateBasedVersion-SNAPSHOT"
 
 plugins {
     `java-library`
-    kotlin("jvm") version "1.7.10"
+    kotlin("jvm") version "1.8.0"
     `maven-publish`
 }
 
@@ -55,8 +55,8 @@ allprojects {
         withType<Test> {
             // uncomment if you want to see loggers output in console
             // this is useful if you debug in docker
-             testLogging.showStandardStreams = true
-             testLogging.showStackTraces = true
+            // testLogging.showStandardStreams = true
+            // testLogging.showStackTraces = true
 
             // set heap size for the test JVM(s)
             minHeapSize = "128m"

gradle.properties

@@ -22,7 +22,7 @@ pythonUltimatePluginVersion=223.7571.182
 # Version numbers: https://plugins.jetbrains.com/plugin/9568-go/versions
 goPluginVersion=223.7571.182
 
-junit5Version=5.8.0-RC1
+junit5Version=5.8.2
 junit4Version=4.13.2
 junit4PlatformVersion=1.9.0
 mockitoVersion=3.5.13

utbot-cli/Dockerfile

@@ -12,7 +12,7 @@ RUN apt-get update \
 
 # Install Kotlin compiler
 
-ENV KOTLIN_COMPILER_VERSION=1.7.0
+ENV KOTLIN_COMPILER_VERSION=1.8.0
 ENV KOTLIN_HOME="/opt/kotlin/kotlinc"
 ENV PATH="${KOTLIN_HOME}/bin:${PATH}"
 

utbot-intellij/build.gradle.kts

@@ -19,6 +19,9 @@ val rdVersion: String? by rootProject
 val semVer: String? by rootProject
 val androidStudioPath: String? by rootProject
 
+val junit5Version: String by rootProject
+val junit4PlatformVersion: String by rootProject
+
 // https://plugins.jetbrains.com/docs/intellij/android-studio.html#configuring-the-plugin-pluginxml-file
 val ideTypeOrAndroidStudio = if (androidStudioPath == null) ideType else "IC"
 
@@ -176,8 +179,8 @@ dependencies {
     // Video Recording
     implementation("com.automation-remarks:video-recorder-junit5:2.0")
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.7.2")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.2")
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.7.2")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:$junit5Version")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher:$junit4PlatformVersion")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junit5Version")
+    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:$junit5Version")
 }

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/util/KtLightMethodUtil.kt

@@ -9,6 +9,8 @@ import com.intellij.refactoring.util.classMembers.MemberInfo
 import com.intellij.testIntegration.TestIntegrationUtils
 import org.jetbrains.kotlin.asJava.elements.KtLightMember
 import org.jetbrains.kotlin.asJava.elements.KtLightMethod
+import org.jetbrains.kotlin.asJava.elements.isGetter
+import org.jetbrains.kotlin.asJava.elements.isSetter
 import org.jetbrains.kotlin.psi.KtClass
 import org.utbot.common.filterWhen
 import org.utbot.framework.UtSettings
@@ -23,7 +25,7 @@ private val PsiMember.isKotlinGetterOrSetter: Boolean
     get() {
         if (this !is KtLightMethod)
             return false
-        return isGetter || isSetter
+        return this.isGetter || this.isSetter
     }
 
 private val PsiMember.isKotlinAndProtected: Boolean

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/util/PsiClassHelper.kt

@@ -9,7 +9,7 @@ plugins {
 
 intellij {
     type.set("RD")
-    version.set("2022.2")
+    version.set("2023.1-SNAPSHOT")
 }
 
 dependencies {
@@ -38,8 +38,7 @@ tasks {
     }
 
     patchPluginXml {
-        sinceBuild.set("222")
-        untilBuild.set("223.*")
+        sinceBuild.set("231")
         version.set(semVer)
     }
 

utbot-rider/build.gradle.kts

@@ -6,9 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="JetBrains.Rider.SDK" Version="2022.2.4" PrivateAssets="all" />
+        <PackageReference Include="JetBrains.Rider.SDK" Version="2023.1.0-eap08" PrivateAssets="all" />
         <PackageReference Include="Microsoft.NETCore.Platforms" Version="5.0.0" PrivateAssets="all" />
         <PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.0" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" PrivateAssets="all" />
+        <PackageReference Include="System.Reflection" Version="4.3.0" PrivateAssets="all" />
     </ItemGroup>
 
     <ItemGroup>

utbot-rider/src/dotnet/UtBot/UtBot/UtBot.csproj

@@ -10,5 +10,5 @@ dependencies {
     implementation(project(":utbot-api"))
     implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
     implementation group: 'javax.validation', name: 'validation-api', version: '2.0.0.Final'
-    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
 }

utbot-sample/build.gradle

@@ -2,6 +2,7 @@ val kotlinLoggingVersion: String by rootProject
 val ideType: String by rootProject
 val ideVersion: String by rootProject
 val semVer: String? by rootProject
+val slf4jVersion: String by rootProject
 val androidStudioPath: String? by rootProject
 
 plugins {
@@ -51,5 +52,5 @@ dependencies {
     implementation(group = "org.jetbrains", name = "annotations", version = "16.0.2")
     implementation(project(":utbot-api"))
     implementation(project(":utbot-framework"))
-    implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.25")
+    implementation(group = "org.slf4j", name = "slf4j-api", version = slf4jVersion)
 }