Skip to content

Commit 94c0b4b

Browse files
RBusarowRBusarow
authored
Merge pull request #871 from square/rick/binaryCompatibility_11.1
update the kotlinx `binary-compatibility-validator` plugin to `0.11.1`
2 parents ff53530 + 59ea86b commit 94c0b4b

File tree

13 files changed

+5
-746
lines changed

13 files changed

+5
-746
lines changed

‎dependencies/classpath.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,11 @@ org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.10
155155
org.jetbrains.kotlin:kotlin-util-io:1.6.10
156156
org.jetbrains.kotlin:kotlin-util-klib-metadata:1.6.0
157157
org.jetbrains.kotlin:kotlin-util-klib:1.6.10
158-
org.jetbrains.kotlinx:binary-compatibility-validator:0.6.0
158+
org.jetbrains.kotlinx:binary-compatibility-validator:0.11.1
159159
org.jetbrains.kotlinx:kotlinx-benchmark-plugin:0.4.2
160160
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.1
161161
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1
162-
org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.2.0
162+
org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.5.0
163163
org.jetbrains:annotations:13.0
164164
org.jetbrains:markdown-jvm:0.2.4
165165
org.jetbrains:markdown:0.2.4
@@ -170,9 +170,9 @@ org.jvnet.staxex:stax-ex:1.8.1
170170
org.openjdk.jmh:jmh-core:1.21
171171
org.ow2.asm:asm-analysis:9.1
172172
org.ow2.asm:asm-commons:9.1
173-
org.ow2.asm:asm-tree:9.1
173+
org.ow2.asm:asm-tree:9.2
174174
org.ow2.asm:asm-util:9.1
175-
org.ow2.asm:asm:9.1
175+
org.ow2.asm:asm:9.2
176176
org.slf4j:slf4j-api:1.7.30
177177
org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2
178178
xerces:xercesImpl:2.12.0

‎gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jmh = "1.34"
4949
kotest = "5.1.0"
5050
kotlin = "1.6.10"
5151

52-
kotlinx-binary-compatibility = "0.6.0"
52+
kotlinx-binary-compatibility = "0.11.1"
5353
kotlinx-coroutines = "1.6.4"
5454
kotlinx-serialization-json = "1.3.2"
5555
kotlinx-benchmark = "0.4.2"

‎trace-encoder/api/trace-encoder.api

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,3 @@
1-
public final class com/squareup/tracing/ChromeTraceEvent {
2-
public static final field Companion Lcom/squareup/tracing/ChromeTraceEvent$Companion;
3-
public static final field INSTANT_SCOPE_GLOBAL C
4-
public static final field INSTANT_SCOPE_PROCESS C
5-
public static final field INSTANT_SCOPE_THREAD C
6-
public fun <init> (Ljava/lang/String;Ljava/lang/String;Lcom/squareup/tracing/ChromeTraceEvent$Phase;JIILjava/lang/Object;Ljava/lang/Character;Ljava/util/Map;)V
7-
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Lcom/squareup/tracing/ChromeTraceEvent$Phase;JIILjava/lang/Object;Ljava/lang/Character;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
8-
public final fun component1 ()Ljava/lang/String;
9-
public final fun component2 ()Ljava/lang/String;
10-
public final fun component3 ()Lcom/squareup/tracing/ChromeTraceEvent$Phase;
11-
public final fun component4 ()J
12-
public final fun component5 ()I
13-
public final fun component6 ()I
14-
public final fun component7 ()Ljava/lang/Object;
15-
public final fun component8 ()Ljava/lang/Character;
16-
public final fun component9 ()Ljava/util/Map;
17-
public final fun copy (Ljava/lang/String;Ljava/lang/String;Lcom/squareup/tracing/ChromeTraceEvent$Phase;JIILjava/lang/Object;Ljava/lang/Character;Ljava/util/Map;)Lcom/squareup/tracing/ChromeTraceEvent;
18-
public static synthetic fun copy$default (Lcom/squareup/tracing/ChromeTraceEvent;Ljava/lang/String;Ljava/lang/String;Lcom/squareup/tracing/ChromeTraceEvent$Phase;JIILjava/lang/Object;Ljava/lang/Character;Ljava/util/Map;ILjava/lang/Object;)Lcom/squareup/tracing/ChromeTraceEvent;
19-
public fun equals (Ljava/lang/Object;)Z
20-
public final fun getArgs ()Ljava/util/Map;
21-
public final fun getCategory ()Ljava/lang/String;
22-
public final fun getId ()Ljava/lang/Object;
23-
public final fun getName ()Ljava/lang/String;
24-
public final fun getPhase ()Lcom/squareup/tracing/ChromeTraceEvent$Phase;
25-
public final fun getProcessId ()I
26-
public final fun getScope ()Ljava/lang/Character;
27-
public final fun getThreadId ()I
28-
public final fun getTimestampMicros ()J
29-
public fun hashCode ()I
30-
public fun toString ()Ljava/lang/String;
31-
public final fun writeTo (Lokio/BufferedSink;)V
32-
}
33-
34-
public final class com/squareup/tracing/ChromeTraceEvent$Companion {
35-
}
36-
37-
public final class com/squareup/tracing/ChromeTraceEvent$Phase : java/lang/Enum {
38-
public static final field ASYNC_BEGIN Lcom/squareup/tracing/ChromeTraceEvent$Phase;
39-
public static final field ASYNC_END Lcom/squareup/tracing/ChromeTraceEvent$Phase;
40-
public static final field ASYNC_INSTANT Lcom/squareup/tracing/ChromeTraceEvent$Phase;
41-
public static final field COMPLETE Lcom/squareup/tracing/ChromeTraceEvent$Phase;
42-
public static final field COUNTER Lcom/squareup/tracing/ChromeTraceEvent$Phase;
43-
public static final field DURATION_BEGIN Lcom/squareup/tracing/ChromeTraceEvent$Phase;
44-
public static final field DURATION_END Lcom/squareup/tracing/ChromeTraceEvent$Phase;
45-
public static final field INSTANT Lcom/squareup/tracing/ChromeTraceEvent$Phase;
46-
public static final field METADATA Lcom/squareup/tracing/ChromeTraceEvent$Phase;
47-
public static final field OBJECT_CREATED Lcom/squareup/tracing/ChromeTraceEvent$Phase;
48-
public static final field OBJECT_DESTROYED Lcom/squareup/tracing/ChromeTraceEvent$Phase;
49-
public static final field OBJECT_SNAPSHOT Lcom/squareup/tracing/ChromeTraceEvent$Phase;
50-
public final fun getCode$wf1_trace_encoder ()C
51-
public static fun valueOf (Ljava/lang/String;)Lcom/squareup/tracing/ChromeTraceEvent$Phase;
52-
public static fun values ()[Lcom/squareup/tracing/ChromeTraceEvent$Phase;
53-
}
54-
55-
public final class com/squareup/tracing/ChromeTraceEventJsonAdapter : com/squareup/moshi/JsonAdapter {
56-
public fun <init> (Lcom/squareup/moshi/Moshi;)V
57-
public fun fromJson (Lcom/squareup/moshi/JsonReader;)Lcom/squareup/tracing/ChromeTraceEvent;
58-
public synthetic fun fromJson (Lcom/squareup/moshi/JsonReader;)Ljava/lang/Object;
59-
public fun toJson (Lcom/squareup/moshi/JsonWriter;Lcom/squareup/tracing/ChromeTraceEvent;)V
60-
public synthetic fun toJson (Lcom/squareup/moshi/JsonWriter;Ljava/lang/Object;)V
61-
public fun toString ()Ljava/lang/String;
62-
}
63-
64-
public final class com/squareup/tracing/ChromeTraceEventKt {
65-
public static final fun createProcessNameEvent (Ljava/lang/String;IJ)Lcom/squareup/tracing/ChromeTraceEvent;
66-
public static final fun createThreadNameEvent (Ljava/lang/String;IIJ)Lcom/squareup/tracing/ChromeTraceEvent;
67-
}
68-
691
public abstract interface class com/squareup/tracing/TimeMark {
702
public abstract fun getElapsedNow ()J
713
}
@@ -76,8 +8,6 @@ public final class com/squareup/tracing/TraceEncoder : java/io/Closeable {
768
public fun close ()V
779
public final fun createLogger (Ljava/lang/String;Ljava/lang/String;)Lcom/squareup/tracing/TraceLogger;
7810
public static synthetic fun createLogger$default (Lcom/squareup/tracing/TraceEncoder;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/squareup/tracing/TraceLogger;
79-
public final fun log$wf1_trace_encoder (IILcom/squareup/tracing/TraceEvent;)V
80-
public final fun log$wf1_trace_encoder (IILjava/util/List;)V
8111
}
8212

8313
public abstract class com/squareup/tracing/TraceEvent {
@@ -235,10 +165,6 @@ public final class com/squareup/tracing/TraceEvent$ObjectSnapshot : com/squareup
235165
public fun toString ()Ljava/lang/String;
236166
}
237167

238-
public final class com/squareup/tracing/TraceEventKt {
239-
public static final fun toChromeTraceEvent (Lcom/squareup/tracing/TraceEvent;IIJ)Lcom/squareup/tracing/ChromeTraceEvent;
240-
}
241-
242168
public abstract interface class com/squareup/tracing/TraceLogger {
243169
public abstract fun log (Lcom/squareup/tracing/TraceEvent;)V
244170
public abstract fun log (Ljava/util/List;)V

‎workflow-core/api/workflow-core.api

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,9 @@ public final class com/squareup/workflow1/Snapshots {
9999
public static final fun parse (Lokio/ByteString;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
100100
public static final fun readBooleanFromInt (Lokio/BufferedSource;)Z
101101
public static final fun readByteStringWithLength (Lokio/BufferedSource;)Lokio/ByteString;
102-
public static final synthetic fun readEnumByOrdinal (Lokio/BufferedSource;)Ljava/lang/Enum;
103102
public static final fun readFloat (Lokio/BufferedSource;)F
104103
public static final fun readList (Lokio/BufferedSource;Lkotlin/jvm/functions/Function1;)Ljava/util/List;
105104
public static final fun readNullable (Lokio/BufferedSource;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
106-
public static final synthetic fun readOptionalEnumByOrdinal (Lokio/BufferedSource;)Ljava/lang/Enum;
107105
public static final fun readOptionalUtf8WithLength (Lokio/BufferedSource;)Ljava/lang/String;
108106
public static final fun readUtf8WithLength (Lokio/BufferedSource;)Ljava/lang/String;
109107
public static final fun writeBooleanAsInt (Lokio/BufferedSink;Z)Lokio/BufferedSink;
@@ -127,7 +125,6 @@ public abstract class com/squareup/workflow1/StatefulWorkflow : com/squareup/wor
127125
}
128126

129127
public final class com/squareup/workflow1/StatefulWorkflow$RenderContext : com/squareup/workflow1/BaseRenderContext {
130-
public fun <init> (Lcom/squareup/workflow1/StatefulWorkflow;Lcom/squareup/workflow1/BaseRenderContext;)V
131128
public fun eventHandler (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function10;)Lkotlin/jvm/functions/Function9;
132129
public fun eventHandler (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function11;)Lkotlin/jvm/functions/Function10;
133130
public fun eventHandler (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)Lkotlin/jvm/functions/Function0;
@@ -151,7 +148,6 @@ public abstract class com/squareup/workflow1/StatelessWorkflow : com/squareup/wo
151148
}
152149

153150
public final class com/squareup/workflow1/StatelessWorkflow$RenderContext : com/squareup/workflow1/BaseRenderContext {
154-
public fun <init> (Lcom/squareup/workflow1/StatelessWorkflow;Lcom/squareup/workflow1/BaseRenderContext;)V
155151
public fun eventHandler (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function10;)Lkotlin/jvm/functions/Function9;
156152
public fun eventHandler (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function11;)Lkotlin/jvm/functions/Function10;
157153
public fun eventHandler (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)Lkotlin/jvm/functions/Function0;
@@ -175,21 +171,15 @@ public final class com/squareup/workflow1/TypedWorker : com/squareup/workflow1/W
175171
public fun toString ()Ljava/lang/String;
176172
}
177173

178-
public final class com/squareup/workflow1/Void {
179-
}
180-
181174
public abstract interface class com/squareup/workflow1/Worker {
182175
public static final field Companion Lcom/squareup/workflow1/Worker$Companion;
183176
public abstract fun doesSameWorkAs (Lcom/squareup/workflow1/Worker;)Z
184177
public abstract fun run ()Lkotlinx/coroutines/flow/Flow;
185178
}
186179

187180
public final class com/squareup/workflow1/Worker$Companion {
188-
public final synthetic fun create (Lkotlin/jvm/functions/Function2;)Lcom/squareup/workflow1/Worker;
189181
public final fun createSideEffect (Lkotlin/jvm/functions/Function1;)Lcom/squareup/workflow1/Worker;
190182
public final fun finished ()Lcom/squareup/workflow1/Worker;
191-
public final synthetic fun from (Lkotlin/jvm/functions/Function1;)Lcom/squareup/workflow1/Worker;
192-
public final synthetic fun fromNullable (Lkotlin/jvm/functions/Function1;)Lcom/squareup/workflow1/Worker;
193183
public final fun timer (JLjava/lang/String;)Lcom/squareup/workflow1/Worker;
194184
public static synthetic fun timer$default (Lcom/squareup/workflow1/Worker$Companion;JLjava/lang/String;ILjava/lang/Object;)Lcom/squareup/workflow1/Worker;
195185
}
@@ -198,21 +188,6 @@ public final class com/squareup/workflow1/Worker$DefaultImpls {
198188
public static fun doesSameWorkAs (Lcom/squareup/workflow1/Worker;Lcom/squareup/workflow1/Worker;)Z
199189
}
200190

201-
public final class com/squareup/workflow1/WorkerWorkflow : com/squareup/workflow1/StatefulWorkflow, com/squareup/workflow1/ImpostorWorkflow {
202-
public fun <init> (Lkotlin/reflect/KType;Ljava/lang/String;)V
203-
public fun describeRealIdentifier ()Ljava/lang/String;
204-
public fun getRealIdentifier ()Lcom/squareup/workflow1/WorkflowIdentifier;
205-
public final fun getWorkerType ()Lkotlin/reflect/KType;
206-
public fun initialState (Lcom/squareup/workflow1/Worker;Lcom/squareup/workflow1/Snapshot;)Ljava/lang/Integer;
207-
public synthetic fun initialState (Ljava/lang/Object;Lcom/squareup/workflow1/Snapshot;)Ljava/lang/Object;
208-
public fun onPropsChanged (Lcom/squareup/workflow1/Worker;Lcom/squareup/workflow1/Worker;I)Ljava/lang/Integer;
209-
public synthetic fun onPropsChanged (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
210-
public fun render (Lcom/squareup/workflow1/Worker;ILcom/squareup/workflow1/StatefulWorkflow$RenderContext;)V
211-
public synthetic fun render (Ljava/lang/Object;Ljava/lang/Object;Lcom/squareup/workflow1/StatefulWorkflow$RenderContext;)Ljava/lang/Object;
212-
public fun snapshotState (I)Lcom/squareup/workflow1/Snapshot;
213-
public synthetic fun snapshotState (Ljava/lang/Object;)Lcom/squareup/workflow1/Snapshot;
214-
}
215-
216191
public abstract interface class com/squareup/workflow1/Workflow {
217192
public static final field Companion Lcom/squareup/workflow1/Workflow$Companion;
218193
public abstract fun asStatefulWorkflow ()Lcom/squareup/workflow1/StatefulWorkflow;
@@ -233,7 +208,6 @@ public final class com/squareup/workflow1/WorkflowAction$Companion {
233208

234209
public final class com/squareup/workflow1/WorkflowAction$Updater {
235210
public fun <init> (Lcom/squareup/workflow1/WorkflowAction;Ljava/lang/Object;Ljava/lang/Object;)V
236-
public final fun getMaybeOutput$wf1_workflow_core ()Lcom/squareup/workflow1/WorkflowOutput;
237211
public final fun getProps ()Ljava/lang/Object;
238212
public final fun getState ()Ljava/lang/Object;
239213
public final fun setOutput (Ljava/lang/Object;)V
@@ -242,8 +216,6 @@ public final class com/squareup/workflow1/WorkflowAction$Updater {
242216

243217
public final class com/squareup/workflow1/WorkflowIdentifier {
244218
public static final field Companion Lcom/squareup/workflow1/WorkflowIdentifier$Companion;
245-
public fun <init> (Lcom/squareup/workflow1/WorkflowIdentifierType;Lcom/squareup/workflow1/WorkflowIdentifier;Lkotlin/jvm/functions/Function0;)V
246-
public synthetic fun <init> (Lcom/squareup/workflow1/WorkflowIdentifierType;Lcom/squareup/workflow1/WorkflowIdentifier;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
247219
public fun equals (Ljava/lang/Object;)Z
248220
public final fun getRealIdentifierType ()Lcom/squareup/workflow1/WorkflowIdentifierType;
249221
public fun hashCode ()I
@@ -311,8 +283,6 @@ public final class com/squareup/workflow1/Workflows {
311283
public static synthetic fun action$default (Lcom/squareup/workflow1/StatelessWorkflow;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/squareup/workflow1/WorkflowAction;
312284
public static synthetic fun action$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/squareup/workflow1/WorkflowAction;
313285
public static final fun applyTo (Lcom/squareup/workflow1/WorkflowAction;Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
314-
public static final synthetic fun asWorker (Lkotlinx/coroutines/flow/Flow;)Lcom/squareup/workflow1/Worker;
315-
public static final fun collectToSink (Lkotlinx/coroutines/flow/Flow;Lcom/squareup/workflow1/Sink;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
316286
public static final fun contraMap (Lcom/squareup/workflow1/Sink;Lkotlin/jvm/functions/Function1;)Lcom/squareup/workflow1/Sink;
317287
public static final fun getIdentifier (Lcom/squareup/workflow1/Workflow;)Lcom/squareup/workflow1/WorkflowIdentifier;
318288
public static final fun mapRendering (Lcom/squareup/workflow1/Workflow;Lkotlin/jvm/functions/Function1;)Lcom/squareup/workflow1/Workflow;
@@ -323,14 +293,8 @@ public final class com/squareup/workflow1/Workflows {
323293
public static synthetic fun renderChild$default (Lcom/squareup/workflow1/BaseRenderContext;Lcom/squareup/workflow1/Workflow;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/Object;
324294
public static synthetic fun renderChild$default (Lcom/squareup/workflow1/BaseRenderContext;Lcom/squareup/workflow1/Workflow;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/lang/Object;
325295
public static final fun rendering (Lcom/squareup/workflow1/Workflow$Companion;Ljava/lang/Object;)Lcom/squareup/workflow1/Workflow;
326-
public static final fun runWorker (Lcom/squareup/workflow1/Worker;Ljava/lang/String;Lcom/squareup/workflow1/Sink;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
327-
public static final synthetic fun runningWorker (Lcom/squareup/workflow1/BaseRenderContext;Lcom/squareup/workflow1/Worker;Ljava/lang/String;)V
328-
public static final synthetic fun runningWorker (Lcom/squareup/workflow1/BaseRenderContext;Lcom/squareup/workflow1/Worker;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
329296
public static final fun runningWorker (Lcom/squareup/workflow1/BaseRenderContext;Lcom/squareup/workflow1/Worker;Lkotlin/reflect/KType;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
330-
public static synthetic fun runningWorker$default (Lcom/squareup/workflow1/BaseRenderContext;Lcom/squareup/workflow1/Worker;Ljava/lang/String;ILjava/lang/Object;)V
331-
public static synthetic fun runningWorker$default (Lcom/squareup/workflow1/BaseRenderContext;Lcom/squareup/workflow1/Worker;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
332297
public static synthetic fun runningWorker$default (Lcom/squareup/workflow1/BaseRenderContext;Lcom/squareup/workflow1/Worker;Lkotlin/reflect/KType;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
333-
public static final fun sendAndAwaitApplication (Lcom/squareup/workflow1/Sink;Lcom/squareup/workflow1/WorkflowAction;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
334298
public static final fun stateful (Lcom/squareup/workflow1/Workflow$Companion;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Lcom/squareup/workflow1/StatefulWorkflow;
335299
public static final fun stateful (Lcom/squareup/workflow1/Workflow$Companion;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)Lcom/squareup/workflow1/StatefulWorkflow;
336300
public static final fun stateful (Lcom/squareup/workflow1/Workflow$Companion;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;)Lcom/squareup/workflow1/StatefulWorkflow;

0 commit comments

Comments
 (0)