From 515a401b23c5c660fc80df5ed735ee128cb3b885 Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Tue, 14 Feb 2023 11:59:52 +0100 Subject: [PATCH] [Gradle, Test] separate lib publication and app assemble to different builds To prevent build failures due to race conditions with publication and consumption --- .../kotlin/gradle/BuildCacheRelocationIT.kt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt index b269df767ae..94bfdcb2a98 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt @@ -209,8 +209,7 @@ class BuildCacheRelocationIT : KGPBaseTest() { fun testRelocationNative(gradleVersion: GradleVersion) { val (firstProject, secondProject) = prepareTestProjects( "native-build-cache", - gradleVersion, - defaultBuildOptions.copy(parallel = false) // disabled to be able to consume published library before app compilation + gradleVersion ) { val localRepoUri = it.projectPath.resolve("repo").toUri() it.subProject("build-cache-app").buildGradleKts.append( @@ -228,9 +227,17 @@ class BuildCacheRelocationIT : KGPBaseTest() { checkBuildCacheRelocation( firstProject, secondProject, - listOf(":build-cache-lib:publish", ":build-cache-app:assemble"), + listOf(":build-cache-lib:publish"), listOf( ":build-cache-lib:compileKotlinHost", + ) + ) + + checkBuildCacheRelocation( + firstProject, + secondProject, + listOf(":build-cache-app:assemble"), + listOf( ":build-cache-app:compileKotlinHost", ":build-cache-app:lib-module:compileKotlinHost", ":build-cache-app:linkDebugStaticHost",