From 96a798d400be672973cfc3ff65574694c377ec0a Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 6 Sep 2023 18:25:08 +0200 Subject: [PATCH] Revert "Ignore compose experimental modules during artifacts check" This reverts commit a1250e838b593ce280d11a74c374a6a674c49c63. KTI-1360 --- .../jetbrains/kotlin/code/ArtifactsTest.kt | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/repo/artifacts-tests/src/test/kotlin/org/jetbrains/kotlin/code/ArtifactsTest.kt b/repo/artifacts-tests/src/test/kotlin/org/jetbrains/kotlin/code/ArtifactsTest.kt index fe9834cbdae..ceb27b208fe 100644 --- a/repo/artifacts-tests/src/test/kotlin/org/jetbrains/kotlin/code/ArtifactsTest.kt +++ b/repo/artifacts-tests/src/test/kotlin/org/jetbrains/kotlin/code/ArtifactsTest.kt @@ -22,16 +22,6 @@ class ArtifactsTest { private val localRepoPath = Paths.get(mavenLocal, "org/jetbrains/kotlin") private val expectedRepoPath = Paths.get("repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin") - /** - * Experimental projects that might be published locally but are not epxected to be published by default. - * They still might be added to TeamCity maven.zip final artifacts with an additional code. - */ - private val experimentalProjects = setOf( - "compiler-hosted", - "compiler-daemon", - "compiler", - ) - private val excludedProjects = setOf( "annotation-processor-example", "android-test-fixes", @@ -60,16 +50,12 @@ class ArtifactsTest { }) actualPoms.forEach { actual -> val expectedPomPath = actual.toExpectedPath() - val parentDirName = expectedPomPath.parent.fileName.toString() - - if (parentDirName !in experimentalProjects) { - if (parentDirName !in excludedProjects) { - val actualString = actual.toFile().readText().replace(kotlinVersion, "ArtifactsTest.version") - assertEqualsToFile(expectedPomPath, actualString) - visitedPoms.add(expectedPomPath) - } else { - if (isTeamCityBuild) fail("Excluded project in actual artifacts: $actual") - } + if ("${expectedPomPath.parent.fileName}" !in excludedProjects) { + val actualString = actual.toFile().readText().replace(kotlinVersion, "ArtifactsTest.version") + assertEqualsToFile(expectedPomPath, actualString) + visitedPoms.add(expectedPomPath) + } else { + if (isTeamCityBuild) fail("Excluded project in actual artifacts: $actual") } }