Skip to content

Commit 41248b0

Browse files
committed
temp
1 parent 70b20ae commit 41248b0

File tree

9 files changed

+20
-37
lines changed

9 files changed

+20
-37
lines changed

.github/workflows/collect-statistics.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ jobs:
101101
project: ${{ fromJson(needs.setup_matrix.outputs.projects) }}
102102
value: ${{ fromJson(needs.setup_matrix.outputs.matrix) }}
103103
runs-on: ubuntu-20.04
104+
s
104105
container: unittestbot/java-env:java11-zulu-jdk-fx-gradle7.4.2-kotlinc1.7.0
105106
steps:
106107
- name: Install git

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ version = semVer ?: "$dateBasedVersion-SNAPSHOT"
1515

1616
plugins {
1717
`java-library`
18-
kotlin("jvm") version "1.7.10"
18+
kotlin("jvm") version "1.8.10"
1919
`maven-publish`
2020
}
2121

@@ -55,8 +55,8 @@ allprojects {
5555
withType<Test> {
5656
// uncomment if you want to see loggers output in console
5757
// this is useful if you debug in docker
58-
testLogging.showStandardStreams = true
59-
testLogging.showStackTraces = true
58+
// testLogging.showStandardStreams = true
59+
// testLogging.showStackTraces = true
6060

6161
// set heap size for the test JVM(s)
6262
minHeapSize = "128m"

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pythonUltimatePluginVersion=223.7571.182
2222
# Version numbers: https://plugins.jetbrains.com/plugin/9568-go/versions
2323
goPluginVersion=223.7571.182
2424

25-
junit5Version=5.8.0-RC1
25+
junit5Version=5.8.2
2626
junit4Version=4.13.2
2727
junit4PlatformVersion=1.9.0
2828
mockitoVersion=3.5.13

utbot-cli/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ RUN apt-get update \
1111
&& rm -rf /var/lib/apt/lists/*
1212

1313
# Install Kotlin compiler
14-
15-
ENV KOTLIN_COMPILER_VERSION=1.7.0
14+
k
15+
ENV KOTLIN_COMPILER_VERSION=1.8.10
1616
ENV KOTLIN_HOME="/opt/kotlin/kotlinc"
1717
ENV PATH="${KOTLIN_HOME}/bin:${PATH}"
1818

utbot-intellij/build.gradle.kts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ val rdVersion: String? by rootProject
1919
val semVer: String? by rootProject
2020
val androidStudioPath: String? by rootProject
2121

22+
val junit5Version: String by rootProject
23+
val junit4PlatformVersion: String by rootProject
24+
2225
// https://plugins.jetbrains.com/docs/intellij/android-studio.html#configuring-the-plugin-pluginxml-file
2326
val ideTypeOrAndroidStudio = if (androidStudioPath == null) ideType else "IC"
2427

@@ -176,8 +179,8 @@ dependencies {
176179
// Video Recording
177180
implementation("com.automation-remarks:video-recorder-junit5:2.0")
178181

179-
testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
180-
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.7.2")
181-
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.2")
182-
testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.7.2")
182+
testImplementation("org.junit.jupiter:junit-jupiter-api:$junit5Version")
183+
testRuntimeOnly("org.junit.platform:junit-platform-launcher:$junit4PlatformVersion")
184+
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junit5Version")
185+
testRuntimeOnly("org.junit.vintage:junit-vintage-engine:$junit5Version")
183186
}

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

Lines changed: 0 additions & 24 deletions
This file was deleted.

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import com.intellij.refactoring.util.classMembers.MemberInfo
99
import com.intellij.testIntegration.TestIntegrationUtils
1010
import org.jetbrains.kotlin.asJava.elements.KtLightMember
1111
import org.jetbrains.kotlin.asJava.elements.KtLightMethod
12+
import org.jetbrains.kotlin.asJava.elements.isGetter
13+
import org.jetbrains.kotlin.asJava.elements.isSetter
1214
import org.jetbrains.kotlin.psi.KtClass
1315
import org.utbot.common.filterWhen
1416
import org.utbot.framework.UtSettings
@@ -23,7 +25,7 @@ private val PsiMember.isKotlinGetterOrSetter: Boolean
2325
get() {
2426
if (this !is KtLightMethod)
2527
return false
26-
return isGetter || isSetter
28+
return this.isGetter || this.isSetter
2729
}
2830

2931
private val PsiMember.isKotlinAndProtected: Boolean

utbot-sample/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ dependencies {
1010
implementation(project(":utbot-api"))
1111
implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
1212
implementation group: 'javax.validation', name: 'validation-api', version: '2.0.0.Final'
13-
implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
13+
implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
1414
}

utbot-ui-commons/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ val kotlinLoggingVersion: String by rootProject
22
val ideType: String by rootProject
33
val ideVersion: String by rootProject
44
val semVer: String? by rootProject
5+
val slf4jVersion: String by rootProject
56
val androidStudioPath: String? by rootProject
67

78
plugins {
@@ -51,5 +52,5 @@ dependencies {
5152
implementation(group = "org.jetbrains", name = "annotations", version = "16.0.2")
5253
implementation(project(":utbot-api"))
5354
implementation(project(":utbot-framework"))
54-
implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.25")
55+
implementation(group = "org.slf4j", name = "slf4j-api", version = slf4jVersion)
5556
}

0 commit comments

Comments
 (0)