Shade test jars from compiler used in Gradle tests
This fixes `VerifyError` for all integration tests calling `KotlinTestUtils.findAndroidSdk()`. The exception was thrown because `:kotlin-gradle-plugin-integration-tests` was depending on both relocated intellij-core (from kotlin-compiler-embeddable) and non-relocated intellij-core (transitevely through tests jars from compiler). A call to `findAndroidSdk()` was triggering classloading for `KotlinTestUtils` which had bytecode references to `org.jetbrains.kotlin.idea.KotlinLanguage` loaded from the embeddable compiler and to `com.intellij.lang.Language` loaded from non-relocated intellij-core. `KotlinLanguage` from the embeddable compiler was a subclass of relocated `org.jetbrains.kotlin.com.intellij.lang.Language` thus it was not assignable to `com.intellij.lang.Language` causing `VerifyError`. The solution is to create relocated jar combining the necessary test jars from the compiler.
This commit is contained in:
@@ -129,6 +129,7 @@ include ":kotlin-build-common",
|
||||
":tools:kotlin-stdlib-gen",
|
||||
":kotlin-gradle-plugin-api",
|
||||
":kotlin-gradle-plugin",
|
||||
":kotlin-gradle-plugin-test-utils-embeddable",
|
||||
":kotlin-gradle-plugin-integration-tests",
|
||||
":kotlin-allopen",
|
||||
":kotlin-noarg",
|
||||
@@ -209,6 +210,7 @@ project(':tools:kotlin-stdlib-js-merger').projectDir = "$rootDir/libraries/tools
|
||||
project(':tools:kotlin-stdlib-gen').projectDir = "$rootDir/libraries/tools/kotlin-stdlib-gen" as File
|
||||
project(':kotlin-gradle-plugin-api').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugin-api" as File
|
||||
project(':kotlin-gradle-plugin').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugin" as File
|
||||
project(':kotlin-gradle-plugin-test-utils-embeddable').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable" as File
|
||||
project(':kotlin-gradle-plugin-integration-tests').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugin-integration-tests" as File
|
||||
project(':kotlin-allopen').projectDir = "$rootDir/libraries/tools/kotlin-allopen" as File
|
||||
project(':kotlin-noarg').projectDir = "$rootDir/libraries/tools/kotlin-noarg" as File
|
||||
|
||||
Reference in New Issue
Block a user