Merge pull request #400 from JetBrains-Research/pderakhshanfar/bug-fi…

…x/Resolve-marketplace-issues Resolve marketplace issues V2
JetBrains-Research · Oct 22, 2024 · 1fa308e · 1fa308e
2 parents e1553b1 + 2b8b2d8
commit 1fa308e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -230,7 +230,7 @@ intellijPlatform {
             select {
                 types = listOf(IntelliJPlatformType.IntellijIdeaUltimate)
                 channels = listOf(ProductRelease.Channel.RELEASE)
-                sinceBuild = properties("pluginSinceBuild")
+                sinceBuild = properties("pluginUntilBuild")
                 untilBuild = properties("pluginUntilBuild")
             }
         }
@@ -304,15 +304,6 @@ tasks {
                 subList(indexOf(start) + 1, indexOf(end))
             }.joinToString("\n").run { markdownToHTML(this) },
         )
-
-        // Get the latest available change notes from the changelog file
-        changeNotes.set(
-            provider {
-                changelog.run {
-                    getOrNull(properties("pluginVersion")) ?: getLatest()
-                }.toHTML()
-            },
-        )
     }
 
     publishPlugin {

diff --git a/core/src/main/kotlin/org/jetbrains/research/testspark/core/test/java/JavaTestCompiler.kt b/core/src/main/kotlin/org/jetbrains/research/testspark/core/test/java/JavaTestCompiler.kt
@@ -59,7 +59,7 @@ class JavaTestCompiler(
         logger.info { "Exit code: '${executionResult.exitCode}'; Execution message: '${executionResult.executionMessage}'" }
 
         val classFilePath = path.replace(".java", ".class")
-        if (!File(classFilePath).exists()) {
+        if (executionResult.exitCode == 0 && !File(classFilePath).exists()) {
             throw ClassFileNotFoundException("Expected class file at $classFilePath after the compilation of file $path, but it does not exist.")
         }
         return executionResult

diff --git a/core/src/main/kotlin/org/jetbrains/research/testspark/core/test/kotlin/KotlinTestCompiler.kt b/core/src/main/kotlin/org/jetbrains/research/testspark/core/test/kotlin/KotlinTestCompiler.kt
@@ -75,7 +75,7 @@ class KotlinTestCompiler(
         logger.info { "Exit code: '${executionResult.exitCode}'; Execution message: '${executionResult.executionMessage}'" }
 
         val classFilePath = path.removeSuffix(".kt") + ".class"
-        if (!File(classFilePath).exists()) {
+        if (executionResult.exitCode == 0 && !File(classFilePath).exists()) {
             throw ClassFileNotFoundException("Expected class file at $classFilePath after the compilation of file $path, but it does not exist.")
         }
         return executionResult

diff --git a/gradle.properties b/gradle.properties
@@ -10,7 +10,7 @@ evosuiteVersion = 1.0.5
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
-pluginSinceBuild = 242
+pluginSinceBuild = 241
 pluginUntilBuild = 242.*
 
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
@@ -32,4 +32,4 @@ gradleVersion = 8.10.2
 # suppress inspection "UnusedProperty"
 kotlin.stdlib.default.dependency = false
 
-jvmToolchainVersion = 17
+jvmToolchainVersion = 17