From b784544f8db793bebb2a234781e78fee27328f8c Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Wed, 11 Oct 2023 22:38:48 +0200 Subject: [PATCH] [Gradle] Migrate functional tests from `Project.buildDir` usage It's going to be deprecated in Gradle 8.3 ^KTI-1473 In Progress --- .../kotlin/gradle/regressionTests/KT31459JvmMainClassesTest.kt | 2 +- .../unitTests/CInteropCommonizerArtifactTypeAttributeTest.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT31459JvmMainClassesTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT31459JvmMainClassesTest.kt index b807f9879a7..f8f2a19fe7e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT31459JvmMainClassesTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT31459JvmMainClassesTest.kt @@ -56,7 +56,7 @@ class KT31459JvmMainClassesTest { // make copy of original classes directory val originalClassesDirs: FileCollection = project.files(classesDirs.from.toTypedArray()) - val transformedClassesDir = project.buildDir.resolve("classes/atomicfu/${target.name}/${compilation.name}") + val transformedClassesDir = project.layout.buildDirectory.dir("classes/atomicfu/${target.name}/${compilation.name}") val transformTask = project.tasks.create("transformTask") { it.dependsOn(compilation.compileAllTaskName) it.inputs.files(originalClassesDirs) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CInteropCommonizerArtifactTypeAttributeTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CInteropCommonizerArtifactTypeAttributeTest.kt index df3f787b408..f4eaf08140d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CInteropCommonizerArtifactTypeAttributeTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CInteropCommonizerArtifactTypeAttributeTest.kt @@ -24,7 +24,7 @@ class CInteropCommonizerArtifactTypeAttributeTest { val project = buildProjectWithMPP() /* Create stub klibs collection directory */ - val klibCollectionDir = project.buildDir.resolve("testOutputDir") + val klibCollectionDir = project.layout.buildDirectory.dir("testOutputDir").get().asFile klibCollectionDir.mkdirs() val klibs = listOf(