From 15a441141f4d3df43fae46a9863082fdc8601a75 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Mon, 20 Jan 2020 21:29:50 +0300 Subject: [PATCH] Update public API dump after KT-11567 codegen changes came into effect The only questionable case left is a private companion in a public interface, which is generated as a public synthetic field --- .../reference-public-api/kotlin-stdlib-runtime-merged.txt | 1 - .../src/test/kotlin/cases/companions/companions.txt | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) 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 3c30d0583b4..73fa556415c 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 @@ -2744,7 +2744,6 @@ public abstract interface annotation class kotlin/coroutines/RestrictsSuspension } public final class kotlin/coroutines/SafeContinuation : kotlin/coroutines/Continuation, kotlin/coroutines/jvm/internal/CoroutineStackFrame { - public static final field Companion Lkotlin/coroutines/SafeContinuation$Companion; public fun (Lkotlin/coroutines/Continuation;)V public fun getCallerFrame ()Lkotlin/coroutines/jvm/internal/CoroutineStackFrame; public fun getContext ()Lkotlin/coroutines/CoroutineContext; diff --git a/libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/companions/companions.txt b/libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/companions/companions.txt index 691907ba0d4..a58446d2a6f 100644 --- a/libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/companions/companions.txt +++ b/libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/companions/companions.txt @@ -19,7 +19,7 @@ public final class cases/companions/PublicClasses { } public abstract class cases/companions/PublicClasses$AbstractProtectedCompanion { - public static final field Companion Lcases/companions/PublicClasses$AbstractProtectedCompanion$Companion; + protected static final field Companion Lcases/companions/PublicClasses$AbstractProtectedCompanion$Companion; public fun ()V } @@ -32,12 +32,10 @@ public final class cases/companions/PublicClasses$InternalCompanion { } public final class cases/companions/PublicClasses$PrivateCompanion { - public static final field Companion Lcases/companions/PublicClasses$PrivateCompanion$Companion; public fun ()V } public final class cases/companions/PublicClasses$ProtectedCompanion { - public static final field Companion Lcases/companions/PublicClasses$ProtectedCompanion$Companion; public fun ()V } @@ -54,7 +52,7 @@ public final class cases/companions/PublicInterfaces { } public abstract interface class cases/companions/PublicInterfaces$PrivateCompanion { - public static final field Companion Lcases/companions/PublicInterfaces$PrivateCompanion$Companion; + public static final synthetic field Companion Lcases/companions/PublicInterfaces$PrivateCompanion$Companion; } public abstract interface class cases/companions/PublicInterfaces$PublicCompanion {