azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Fix mpp+kapt tests on Windows

Browse Source 
Previously expected paths were defined with forward slash, however, on Windows the paths are transformed to use backslash.
This commit is contained in:
Alexander.Likhachev
2023-09-19 15:42:22 +02:00
committed by Space Team
parent 2801db0e59
commit 33df94d96e
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt
+3 -2
View File
@@ -966,10 +966,11 @@ open class Kapt3IT : Kapt3BaseIT() {
":dac:compileKotlinJvm" ":dac:compileKotlinJvm"
) )
val sourcesDir = subProject("dac").kotlinSourcesDir("commonMain")
// KT-61622: checking if kapt tasks are getting common sources in default configuration // KT-61622: checking if kapt tasks are getting common sources in default configuration
val commonSources = arrayOf( val commonSources = arrayOf(
"src/commonMain/kotlin/DocumentationService.kt", sourcesDir.resolve("DocumentationService.kt").toAbsolutePath().toString(),
"src/commonMain/kotlin/Item.kt", sourcesDir.resolve("Item.kt").toAbsolutePath().toString(),
) )
assertCompilerArguments(":dac:kaptGenerateStubsKotlinJvm", *commonSources) assertCompilerArguments(":dac:kaptGenerateStubsKotlinJvm", *commonSources)
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidExternalIT.kt
+4 -3
View File
@@ -217,7 +217,7 @@ open class Kapt3AndroidExternalIT : Kapt3BaseIT() {
fun testMppAndroidKapt( fun testMppAndroidKapt(
gradleVersion: GradleVersion, gradleVersion: GradleVersion,
agpVersion: String, agpVersion: String,
jdkVersion: JdkVersions.ProvidedJdk jdkVersion: JdkVersions.ProvidedJdk,
) { ) {
project( project(
"mpp-android-kapt".withPrefix, "mpp-android-kapt".withPrefix,
@@ -232,10 +232,11 @@ open class Kapt3AndroidExternalIT : Kapt3BaseIT() {
":shared:compileDebugKotlinAndroid", ":shared:compileDebugKotlinAndroid",
) )
val sourcesDir = subProject("shared").kotlinSourcesDir("commonMain")
assertCompilerArguments( assertCompilerArguments(
":shared:kaptGenerateStubsDebugKotlinAndroid", ":shared:kaptGenerateStubsDebugKotlinAndroid",
"src/commonMain/kotlin/hilt/error/sampleapp/Annotations.kt", sourcesDir.resolve("hilt/error/sampleapp/Annotations.kt").toAbsolutePath().toString(),
"src/commonMain/kotlin/hilt/error/sampleapp/CommonMainViewModel.kt", sourcesDir.resolve("hilt/error/sampleapp/CommonMainViewModel.kt").toAbsolutePath().toString(),
) )
} }
} }