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

[Gradle] Update UP-TO-DATE checks in MppCInteropDependencyTransformationIT

Browse Source 
CInteropDependencyTransformation task now is executed also for project
dependencies.

KT-58471 Verification Pending
This commit is contained in:
Anton Lakotka
2023-05-18 09:11:55 +02:00
committed by Space Team
parent e937f0739b
commit b6a3a60f36
1 changed files with 7 additions and 18 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/MppCInteropDependencyTransformationIT.kt
+7 -18
View File
@@ -257,8 +257,8 @@ abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() {
) )
project.build(":p3:transformNativeMainCInteropDependenciesMetadata", options = repositoryDependencyOptions) { project.build(":p3:transformNativeMainCInteropDependenciesMetadata", options = repositoryDependencyOptions) {
assertSuccessful() assertSuccessful()
/* Same binaries to transform; does not matter if coming from project dependency or direct one */ /* Same binaries to transform; but the outputs are different (transformed libraries file) */
assertTasksUpToDate(":p3:transformNativeMainCInteropDependenciesMetadata") assertTasksExecuted(":p3:transformNativeMainCInteropDependenciesMetadata")
} }
} }
@@ -293,15 +293,15 @@ abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() {
@Test @Test
fun `test UP-TO-DATE - when changing consumer targets - dependencyMode=repository`() { fun `test UP-TO-DATE - when changing consumer targets - dependencyMode=repository`() {
project.publishP1ToBuildRepository() project.publishP1ToBuildRepository()
`test UP-TO-DATE - when changing consumer targets`(repositoryDependencyOptions, DependencyMode.Repository) `test UP-TO-DATE - when changing consumer targets`(repositoryDependencyOptions)
} }
@Test @Test
fun `test UP-TO-DATE - when changing consumer targets - dependencyMode=project`() { fun `test UP-TO-DATE - when changing consumer targets - dependencyMode=project`() {
`test UP-TO-DATE - when changing consumer targets`(projectDependencyOptions, DependencyMode.Project) `test UP-TO-DATE - when changing consumer targets`(projectDependencyOptions)
} }
private fun `test UP-TO-DATE - when changing consumer targets`(options: BuildOptions, mode: DependencyMode) { private fun `test UP-TO-DATE - when changing consumer targets`(options: BuildOptions) {
project.build(":p2:transformCommonMainCInteropDependenciesMetadata", options = options) { project.build(":p2:transformCommonMainCInteropDependenciesMetadata", options = options) {
assertSuccessful() assertSuccessful()
} }
@@ -316,13 +316,7 @@ abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() {
project.build(":p2:transformCommonMainCInteropDependenciesMetadata", options = optionsWithAdditionalTargetEnabled) { project.build(":p2:transformCommonMainCInteropDependenciesMetadata", options = optionsWithAdditionalTargetEnabled) {
assertSuccessful() assertSuccessful()
assertTasksExecuted(":p2:transformCommonMainCInteropDependenciesMetadata")
when (mode) {
DependencyMode.Repository -> assertTasksExecuted(":p2:transformCommonMainCInteropDependenciesMetadata")
/* Had nothing to do before (project to project dependencies are not handled by this task), has still nothing to do) */
DependencyMode.Project -> assertTasksUpToDate(":p2:transformCommonMainCInteropDependenciesMetadata")
}
} }
project.build(":p2:transformCommonMainCInteropDependenciesMetadata", options = optionsWithAdditionalTargetEnabled) { project.build(":p2:transformCommonMainCInteropDependenciesMetadata", options = optionsWithAdditionalTargetEnabled) {
@@ -333,12 +327,7 @@ abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() {
project.build(":p2:transformCommonMainCInteropDependenciesMetadata", options = options) { project.build(":p2:transformCommonMainCInteropDependenciesMetadata", options = options) {
assertSuccessful() assertSuccessful()
assertTasksExecuted(":p2:transformCommonMainCInteropDependenciesMetadata")
when (mode) {
DependencyMode.Repository -> assertTasksExecuted(":p2:transformCommonMainCInteropDependenciesMetadata")
/* Had nothing to do before (project to project dependencies are not handled by this task), has still nothing to do) */
DependencyMode.Project -> assertTasksUpToDate(":p2:transformCommonMainCInteropDependenciesMetadata")
}
} }
project.build(":p2:transformCommonMainCInteropDependenciesMetadata", options = options) { project.build(":p2:transformCommonMainCInteropDependenciesMetadata", options = options) {