diff --git a/tools/intellij.ide.starter/build.gradle b/tools/intellij.ide.starter/build.gradle index c3c829899019..3c2ec9fef798 100644 --- a/tools/intellij.ide.starter/build.gradle +++ b/tools/intellij.ide.starter/build.gradle @@ -2,7 +2,8 @@ apply plugin: 'java' apply plugin: 'kotlin' buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.7.0' + ext.jackson_version = '2.13.3' repositories { maven { url = "https://cache-redirector.jetbrains.com/maven-central" } @@ -33,21 +34,22 @@ repositories { } dependencies { - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.5.2" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.2" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation "org.jetbrains.kotlin:kotlin-reflect:1.6.10" - implementation "com.fasterxml.jackson.core:jackson-core:2.13.1" - implementation "com.fasterxml.jackson.core:jackson-databind:2.13.1" - implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version" + implementation "com.fasterxml.jackson.module:jackson-module-kotlin:$jackson_version" implementation "org.apache.httpcomponents:httpmime:4.5.13" - implementation "org.jetbrains.intellij.deps:gradle-api:7.1.1-sp2" - implementation "org.kodein.di:kodein-di-jvm:7.9.0" + implementation "org.jetbrains.intellij.deps:gradle-api:7.4" + implementation "org.kodein.di:kodein-di-jvm:7.13.0" implementation "org.rauschig:jarchivelib:1.2.0" - implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.1" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.3" implementation "commons-logging:commons-logging:1.2" implementation "com.jetbrains.qodana:qodana-sarif:0.1.99" implementation 'com.jetbrains.intellij.performanceTesting:performance-testing-commands:LATEST-TRUNK-SNAPSHOT' + testImplementation 'com.jetbrains.intellij.performanceTesting:performance-testing-maven-commands:LATEST-TRUNK-SNAPSHOT' testImplementation 'com.jetbrains.intellij.performanceTesting:performance-testing-gradle-commands:LATEST-TRUNK-SNAPSHOT' testImplementation 'com.jetbrains.intellij.dynamicPlugins:dynamic-plugins-performance-testing-commands:LATEST-TRUNK-SNAPSHOT' @@ -60,7 +62,7 @@ dependencies { testImplementation 'org.junit.vintage:junit-vintage-engine:5.8.1' testImplementation 'org.junit.platform:junit-platform-launcher:1.8.2' - testImplementation 'io.kotest:kotest-assertions-core-jvm:5.3.0' + testImplementation 'io.kotest:kotest-assertions-core-jvm:5.3.2' testImplementation 'org.mockito:mockito-core:3.12.4' testImplementation 'org.mockito:mockito-junit-jupiter:3.12.4' } diff --git a/tools/intellij.ide.starter/src/com/intellij/ide/starter/utils/Git.kt b/tools/intellij.ide.starter/src/com/intellij/ide/starter/utils/Git.kt index 7171450905f9..de0978122c64 100644 --- a/tools/intellij.ide.starter/src/com/intellij/ide/starter/utils/Git.kt +++ b/tools/intellij.ide.starter/src/com/intellij/ide/starter/utils/Git.kt @@ -49,8 +49,9 @@ object Git { ) } catch (e: Exception) { - logError("There is a problem in detecting git repo root. Trying to acquire working dir path") - return Paths.get("").toAbsolutePath() + val workDir = Paths.get("").toAbsolutePath() + logError("There is a problem in detecting git repo root. Trying to acquire working dir path: '$workDir'") + return workDir } // Takes first line from output like this: