From fd0645548d3e0898aa3a9200d8a780ac56aea2f2 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Mon, 2 May 2022 10:03:51 +0200 Subject: [PATCH] Update binary-compatibility-validator to v0.9.0 KT-52045 --- gradle/verification-metadata.xml | 12 ++++++++++ .../build.gradle | 2 +- .../RuntimePublicAPITest.kt | 24 ------------------- 3 files changed, 13 insertions(+), 25 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index bda54facacb..f66529347d5 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -7208,6 +7208,12 @@ + + + + + + @@ -7529,6 +7535,12 @@ + + + + + + diff --git a/libraries/tools/binary-compatibility-validator/build.gradle b/libraries/tools/binary-compatibility-validator/build.gradle index 0b524fc8a74..5ac31046ab9 100644 --- a/libraries/tools/binary-compatibility-validator/build.gradle +++ b/libraries/tools/binary-compatibility-validator/build.gradle @@ -6,7 +6,7 @@ configurations { } dependencies { - api("org.jetbrains.kotlinx:binary-compatibility-validator:0.7.1") + api("org.jetbrains.kotlinx:binary-compatibility-validator:0.9.0") api("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.4.1") testApi project(':kotlin-test:kotlin-test-junit') diff --git a/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt b/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt index 45f5280e5be..b4f44d938f2 100644 --- a/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt +++ b/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt @@ -81,27 +81,3 @@ class RuntimePublicAPITest { } } - -/* -Copied from `binary-compatibility-validator -Can be removed after: -https://github.com/Kotlin/binary-compatibility-validator/pull/75 -*/ -private fun List.filterOutAnnotated(targetAnnotations: Set): List { - if (targetAnnotations.isEmpty()) return this - return filter { - it.annotations.all { ann -> !targetAnnotations.any { ann.refersToName(it) } } - }.map { - ClassBinarySignature( - it.name, - it.superName, - it.outerName, - it.supertypes, - it.memberSignatures.filter { it.annotations.all { ann -> !targetAnnotations.any { ann.refersToName(it) } } }, - it.access, - it.isEffectivelyPublic, - it.isNotUsedWhenEmpty, - it.annotations - ) - } -}