diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt index a5495d7c3b7..8503f325dd5 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt @@ -966,10 +966,11 @@ open class Kapt3IT : Kapt3BaseIT() { ":dac:compileKotlinJvm" ) + val sourcesDir = subProject("dac").kotlinSourcesDir("commonMain") // KT-61622: checking if kapt tasks are getting common sources in default configuration val commonSources = arrayOf( - "src/commonMain/kotlin/DocumentationService.kt", - "src/commonMain/kotlin/Item.kt", + sourcesDir.resolve("DocumentationService.kt").toAbsolutePath().toString(), + sourcesDir.resolve("Item.kt").toAbsolutePath().toString(), ) assertCompilerArguments(":dac:kaptGenerateStubsKotlinJvm", *commonSources) } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidExternalIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidExternalIT.kt index b7af6a6df9c..7bfdbc653d1 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidExternalIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidExternalIT.kt @@ -217,7 +217,7 @@ open class Kapt3AndroidExternalIT : Kapt3BaseIT() { fun testMppAndroidKapt( gradleVersion: GradleVersion, agpVersion: String, - jdkVersion: JdkVersions.ProvidedJdk + jdkVersion: JdkVersions.ProvidedJdk, ) { project( "mpp-android-kapt".withPrefix, @@ -232,10 +232,11 @@ open class Kapt3AndroidExternalIT : Kapt3BaseIT() { ":shared:compileDebugKotlinAndroid", ) + val sourcesDir = subProject("shared").kotlinSourcesDir("commonMain") assertCompilerArguments( ":shared:kaptGenerateStubsDebugKotlinAndroid", - "src/commonMain/kotlin/hilt/error/sampleapp/Annotations.kt", - "src/commonMain/kotlin/hilt/error/sampleapp/CommonMainViewModel.kt", + sourcesDir.resolve("hilt/error/sampleapp/Annotations.kt").toAbsolutePath().toString(), + sourcesDir.resolve("hilt/error/sampleapp/CommonMainViewModel.kt").toAbsolutePath().toString(), ) } }