[Gradle] Remove workaround assertion after fixing KT-55751
This commit is contained in:
committed by
Space Team
parent
a2e5fa64dc
commit
b993064818
+1
-10
@@ -415,16 +415,7 @@ open class CommonizerIT : BaseGradleIT() {
|
|||||||
@Test
|
@Test
|
||||||
fun `test KT-49735 two kotlin targets with same konanTarget`() {
|
fun `test KT-49735 two kotlin targets with same konanTarget`() {
|
||||||
with(Project("commonize-kt-49735-twoKotlinTargets-oneKonanTarget")) {
|
with(Project("commonize-kt-49735-twoKotlinTargets-oneKonanTarget")) {
|
||||||
val currentGradleVersion = chooseWrapperVersionOrFinishTest()
|
build(":assemble") {
|
||||||
build(
|
|
||||||
":assemble",
|
|
||||||
options = defaultBuildOptions()
|
|
||||||
.suppressDeprecationWarningsSinceGradleVersion(
|
|
||||||
TestVersions.Gradle.G_7_4,
|
|
||||||
currentGradleVersion,
|
|
||||||
"Workaround for KT-55751"
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
assertTasksExecuted(":compileCommonMainKotlinMetadata")
|
assertTasksExecuted(":compileCommonMainKotlinMetadata")
|
||||||
assertSuccessful()
|
assertSuccessful()
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-6
@@ -328,12 +328,7 @@ open class HierarchicalMppIT : KGPBaseTest() {
|
|||||||
fun testMultiModulesHmppKt48370(gradleVersion: GradleVersion) {
|
fun testMultiModulesHmppKt48370(gradleVersion: GradleVersion) {
|
||||||
project(
|
project(
|
||||||
"hierarchical-mpp-multi-modules",
|
"hierarchical-mpp-multi-modules",
|
||||||
gradleVersion,
|
gradleVersion
|
||||||
buildOptions = defaultBuildOptions.suppressDeprecationWarningsSinceGradleVersion(
|
|
||||||
TestVersions.Gradle.G_7_4,
|
|
||||||
gradleVersion,
|
|
||||||
"Workaround for KT-55751"
|
|
||||||
)
|
|
||||||
) {
|
) {
|
||||||
build("assemble")
|
build("assemble")
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-10
@@ -357,16 +357,7 @@ class VariantAwareDependenciesMppIT : BaseGradleIT() {
|
|||||||
}
|
}
|
||||||
"""
|
"""
|
||||||
)
|
)
|
||||||
|
build(resolveConfigurationTaskName) {
|
||||||
val currentGradleVersion = chooseWrapperVersionOrFinishTest()
|
|
||||||
build(
|
|
||||||
resolveConfigurationTaskName,
|
|
||||||
options = defaultBuildOptions().suppressDeprecationWarningsSinceGradleVersion(
|
|
||||||
TestVersions.Gradle.G_7_4,
|
|
||||||
currentGradleVersion,
|
|
||||||
"Workaround for KT-55751"
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
assertSuccessful()
|
assertSuccessful()
|
||||||
val output = output.lines().single { marker in it }.substringAfter(marker).removeSurrounding("[", "]").split(",")
|
val output = output.lines().single { marker in it }.substringAfter(marker).removeSurrounding("[", "]").split(",")
|
||||||
assertTrue { output.any { "$nestedProjectName-1.0.jar" in it } }
|
assertTrue { output.any { "$nestedProjectName-1.0.jar" in it } }
|
||||||
|
|||||||
Reference in New Issue
Block a user