Merge remote-tracking branch 'origin/master' into fix/failing_6_8_compat_test

Author: aSemy

.github/workflows/build.yml

@@ -30,7 +30,7 @@ jobs:
 
   integrationTests:
     name: Integration Tests
-    needs: gradleValidation
+    needs: [ gradleValidation, unitTests ]
     uses: ./.github/workflows/reusable-integrationTests.yml
 
 #  integrationTestsEAP:

.github/workflows/release-nightly.yml

@@ -28,7 +28,7 @@ jobs:
   integrationTests:
     if: ${{ !inputs.skipTests }}
     name: Integration Tests
-    needs: gradleValidation
+    needs: [ gradleValidation, unitTests ]
     uses: ./.github/workflows/reusable-integrationTests.yml
 
   #  integrationTestsEAP:

src/main/kotlin/org/jetbrains/intellij/tasks/VerifyPluginConfigurationTask.kt

@@ -110,8 +110,8 @@ abstract class VerifyPluginConfigurationTask @Inject constructor(
         val kotlinApiVersion = kotlinApiVersion.orNull?.let(Version::parse)
         val kotlinLanguageVersion = kotlinLanguageVersion.orNull?.let(Version::parse)
         val platformKotlinLanguageVersion = platformBuildVersion.let(::getPlatformKotlinVersion)
-        val pluginVerifierDownloadDir = pluginVerifierDownloadDir.get()
-        val oldPluginVerifierDownloadDir = providers.systemProperty("user.home").map { "$it/.pluginVerifier/ides" }.get()
+        val pluginVerifierDownloadPath = pluginVerifierDownloadDir.get().let(Path::of).toAbsolutePath()
+        val oldPluginVerifierDownloadPath = providers.systemProperty("user.home").map { "$it/.pluginVerifier/ides" }.get().let(Path::of).toAbsolutePath()
 
         sequence {
             pluginXmlFiles.get().mapNotNull { parsePluginXml(it, context) }.forEach { plugin ->
@@ -148,10 +148,13 @@ abstract class VerifyPluginConfigurationTask @Inject constructor(
             if (kotlinPluginAvailable.get() && kotlinStdlibDefaultDependency.orNull == null) {
                 yield("The dependency on the Kotlin Standard Library (stdlib) is automatically added when using the Gradle Kotlin plugin and may conflict with the version provided with the IntelliJ Platform, see: https://jb.gg/intellij-platform-kotlin-stdlib")
             }
-            if (Path.of(oldPluginVerifierDownloadDir).run {
-                    toString() != pluginVerifierDownloadDir && exists() && listFiles().isNotEmpty()
-            }) {
-                yield("The Plugin Verifier download directory is set to $pluginVerifierDownloadDir, but downloaded IDEs were also found in $oldPluginVerifierDownloadDir, see: https://jb.gg/intellij-platform-plugin-verifier-old-download-dir")
+
+            if (
+                pluginVerifierDownloadPath == oldPluginVerifierDownloadPath
+                && oldPluginVerifierDownloadPath.exists()
+                && oldPluginVerifierDownloadPath.listFiles().isNotEmpty()
+            ) {
+                yield("The Plugin Verifier download directory is set to $pluginVerifierDownloadPath, but downloaded IDEs were also found in $oldPluginVerifierDownloadPath, see: https://jb.gg/intellij-platform-plugin-verifier-old-download-dir")
             }
         }.joinToString("\n") { "- $it" }.takeIf(String::isNotEmpty)?.let {
             warn(

src/main/kotlin/org/jetbrains/intellij/utils.kt

@@ -207,9 +207,10 @@ fun warn(logCategory: String? = null, message: String, e: Throwable? = null) = l
 fun info(logCategory: String? = null, message: String, e: Throwable? = null) = log(LogLevel.INFO, logCategory, message, e)
 fun debug(logCategory: String? = null, message: String, e: Throwable? = null) = log(LogLevel.DEBUG, logCategory, message, e)
 
+private val logger = Logging.getLogger(IntelliJPlugin::class.java)
+
 private fun log(level: LogLevel, logCategory: String?, message: String, e: Throwable?) {
     val category = "gradle-intellij-plugin ${logCategory.orEmpty()}".trim()
-    val logger = Logging.getLogger(IntelliJPlugin::class.java)
     if (e != null && level != LogLevel.ERROR && !logger.isDebugEnabled) {
         logger.log(level, "[$category] $message. Run with --debug option to get more log output.")
     } else {