logger

rli · rli · commit be54f8a66ffb · 2025-03-18T11:22:58.000-07:00
diff --git a/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts b/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts
@@ -103,7 +103,6 @@ dependencies {
     }
 }
 
-// https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1844
 tasks.prepareTestSandbox {
     disabledPlugins = listOf(
         "com.intellij.swagger",
@@ -117,6 +116,9 @@ tasks.jar {
 }
 
 tasks.withType<Test>().configureEach {
+    // conflict with Docker logging impl; so bypass service loader
+    systemProperty("slf4j.provider", "org.slf4j.jul.JULServiceProvider")
+
     systemProperty("log.dir", intellijPlatform.sandboxContainer.map { "$it-test/logs" }.get())
     systemProperty("testDataPath", project.rootDir.resolve("testdata").absolutePath)
     val jetbrainsCoreTestResources = project(":plugin-toolkit:jetbrains-core").projectDir.resolve("tst-resources")

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,6 @@ dependencies {`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
`106`		`-// https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1844`
`107`	`106`	`tasks.prepareTestSandbox {`
`108`	`107`	`disabledPlugins = listOf(`
`109`	`108`	`"com.intellij.swagger",`
`@@ -117,6 +116,9 @@ tasks.jar {`
`117`	`116`	`}`
`118`	`117`
`119`	`118`	`tasks.withType<Test>().configureEach {`
	`119`	`+ // conflict with Docker logging impl; so bypass service loader`
	`120`	`+ systemProperty("slf4j.provider", "org.slf4j.jul.JULServiceProvider")`
	`121`	`+`
`120`	`122`	`systemProperty("log.dir", intellijPlatform.sandboxContainer.map { "$it-test/logs" }.get())`
`121`	`123`	`systemProperty("testDataPath", project.rootDir.resolve("testdata").absolutePath)`
`122`	`124`	`val jetbrainsCoreTestResources = project(":plugin-toolkit:jetbrains-core").projectDir.resolve("tst-resources")`