From d8e8c6afb3de999f38470f15bc8c96d5d6529a2a Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Mon, 14 Nov 2022 18:45:10 +0100 Subject: [PATCH] Update BCV library version in reference public api test and update dumps There were two problems in BCV fixed: - https://github.com/Kotlin/binary-compatibility-validator/issues/36 - https://github.com/Kotlin/binary-compatibility-validator/issues/58 Therefore some methods with default values and properties that mistakenly wasn't included in the dump, now have appeared in it. --- .../tools/binary-compatibility-validator/build.gradle | 9 +-------- .../kotlin-stdlib-runtime-merged.txt | 5 +++++ .../reference-public-api/kotlin-tooling-core.txt | 4 ++++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/libraries/tools/binary-compatibility-validator/build.gradle b/libraries/tools/binary-compatibility-validator/build.gradle index b369cdc3b56..4b95337f327 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.9.0") + api("org.jetbrains.kotlinx:binary-compatibility-validator:0.12.0") api("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.5.0") testApi project(':kotlin-test:kotlin-test-junit') @@ -20,13 +20,6 @@ dependencies { testArtifacts project(':kotlin-tooling-core') testArtifacts project(':kotlin-gradle-plugin-api') testArtifacts project(':kotlin-gradle-plugin-annotations') - - testCompileOnly("org.ow2.asm:asm-tree:9.0") { - because( - "Necessary to compile copied 'filterOutAnnotated' implementation. " + - "Can be removed after https://github.com/Kotlin/binary-compatibility-validator/pull/75" - ) - } } pill { diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt index 5e40129c9f7..49881f5049d 100644 --- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt +++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt @@ -526,6 +526,7 @@ public final class kotlin/UnsignedKt { } public final class kotlin/_Assertions { + public static final field ENABLED Z public static final field INSTANCE Lkotlin/_Assertions; } @@ -5948,6 +5949,7 @@ public final class kotlin/time/Duration : java/lang/Comparable { public static fun equals-impl (JLjava/lang/Object;)Z public static final fun equals-impl0 (JJ)Z public static final fun getAbsoluteValue-UwyO8pc (J)J + public static final fun getHoursComponent-impl (J)I public static final fun getInDays-impl (J)D public static final fun getInHours-impl (J)D public static final fun getInMicroseconds-impl (J)D @@ -5962,6 +5964,9 @@ public final class kotlin/time/Duration : java/lang/Comparable { public static final fun getInWholeMinutes-impl (J)J public static final fun getInWholeNanoseconds-impl (J)J public static final fun getInWholeSeconds-impl (J)J + public static final fun getMinutesComponent-impl (J)I + public static final fun getNanosecondsComponent-impl (J)I + public static final fun getSecondsComponent-impl (J)I public fun hashCode ()I public static fun hashCode-impl (J)I public static final fun isFinite-impl (J)Z diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-tooling-core.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-tooling-core.txt index 351c97d4692..d4775442022 100644 --- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-tooling-core.txt +++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-tooling-core.txt @@ -28,6 +28,9 @@ public final class org/jetbrains/kotlin/tooling/core/ClosureKt { public static final fun createResultSet (I)Ljava/util/Set; public static final fun createResultSet (Ljava/lang/Iterable;I)Ljava/util/Set; public static final fun createResultSet (Ljava/lang/Object;I)Ljava/util/Set; + public static synthetic fun createResultSet$default (IILjava/lang/Object;)Ljava/util/Set; + public static synthetic fun createResultSet$default (Ljava/lang/Iterable;IILjava/lang/Object;)Ljava/util/Set; + public static synthetic fun createResultSet$default (Ljava/lang/Object;IILjava/lang/Object;)Ljava/util/Set; } public abstract interface class org/jetbrains/kotlin/tooling/core/Extras : java/util/Collection, kotlin/jvm/internal/markers/KMappedMarker { @@ -52,6 +55,7 @@ public final class org/jetbrains/kotlin/tooling/core/Extras$Entry : java/io/Seri public final class org/jetbrains/kotlin/tooling/core/Extras$Key : java/io/Serializable { public static final field Companion Lorg/jetbrains/kotlin/tooling/core/Extras$Key$Companion; public fun (Lorg/jetbrains/kotlin/tooling/core/Extras$Type;Ljava/lang/String;)V + public synthetic fun (Lorg/jetbrains/kotlin/tooling/core/Extras$Type;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun equals (Ljava/lang/Object;)Z public final fun getName ()Ljava/lang/String; public final fun getStableString ()Ljava/lang/String;