Skip to content

Commit 5916994

Browse files
lauzadislauzadis
committed
Fix merge issue. and apiDump
1 parent ad7f648 commit 5916994

File tree

2 files changed

+34
-39
lines changed

2 files changed

+34
-39
lines changed

‎runtime/build.gradle.kts

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -143,25 +143,3 @@ dependencies {
143143
}
144144
}
145145
}
146-
147-
val excludeFromDocumentation = listOf(
148-
":runtime:testing",
149-
":runtime:smithy-test",
150-
)
151-
152-
dependencies {
153-
subprojects.filterNot { excludeFromDocumentation.contains(it.path) }.forEach {
154-
it.plugins.apply("dokka-convention") // Apply the Dokka conventions plugin to the submodule
155-
dokka(project(it.path)) // Aggregate the submodule's generated documentation
156-
}
157-
158-
subprojects {
159-
if (excludeFromDocumentation.contains(this@subprojects.path)) {
160-
return@subprojects
161-
}
162-
163-
dokka {
164-
modulePath = this@subprojects.name
165-
}
166-
}
167-
}

‎runtime/runtime-core/api/runtime-core.api

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ public final class aws/smithy/kotlin/runtime/ErrorMetadata$Companion {
3333
public abstract interface annotation class aws/smithy/kotlin/runtime/ExperimentalApi : java/lang/annotation/Annotation {
3434
}
3535

36+
public abstract interface annotation class aws/smithy/kotlin/runtime/IgnoreNative : java/lang/annotation/Annotation {
37+
}
38+
3639
public abstract interface annotation class aws/smithy/kotlin/runtime/InternalApi : java/lang/annotation/Annotation {
3740
}
3841

@@ -339,6 +342,10 @@ public final class aws/smithy/kotlin/runtime/compression/Gzip : aws/smithy/kotli
339342
public fun getId ()Ljava/lang/String;
340343
}
341344

345+
public final class aws/smithy/kotlin/runtime/compression/GzipTestUtilsJvmKt {
346+
public static final fun decompressGzipBytes ([B)[B
347+
}
348+
342349
public final class aws/smithy/kotlin/runtime/config/EnvironmentSetting {
343350
public static final field Companion Laws/smithy/kotlin/runtime/config/EnvironmentSetting$Companion;
344351
public fun <init> (Lkotlin/jvm/functions/Function1;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
@@ -375,6 +382,7 @@ public final class aws/smithy/kotlin/runtime/config/EnvironmentSettingKt {
375382
public final class aws/smithy/kotlin/runtime/content/BigDecimal : java/lang/Number, java/lang/Comparable {
376383
public fun <init> (Laws/smithy/kotlin/runtime/content/BigInteger;I)V
377384
public fun <init> (Ljava/lang/String;)V
385+
public synthetic fun <init> (Ljava/math/BigDecimal;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
378386
public final fun byteValue ()B
379387
public fun compareTo (Laws/smithy/kotlin/runtime/content/BigDecimal;)I
380388
public synthetic fun compareTo (Ljava/lang/Object;)I
@@ -383,9 +391,11 @@ public final class aws/smithy/kotlin/runtime/content/BigDecimal : java/lang/Numb
383391
public final fun floatValue ()F
384392
public final fun getExponent ()I
385393
public final fun getMantissa ()Laws/smithy/kotlin/runtime/content/BigInteger;
386-
public final fun getValue ()Ljava/lang/String;
394+
public fun hashCode ()I
387395
public final fun intValue ()I
388396
public final fun longValue ()J
397+
public final fun minus (Laws/smithy/kotlin/runtime/content/BigDecimal;)Laws/smithy/kotlin/runtime/content/BigDecimal;
398+
public final fun plus (Laws/smithy/kotlin/runtime/content/BigDecimal;)Laws/smithy/kotlin/runtime/content/BigDecimal;
389399
public final fun shortValue ()S
390400
public fun toByte ()B
391401
public fun toDouble ()D
@@ -394,6 +404,7 @@ public final class aws/smithy/kotlin/runtime/content/BigDecimal : java/lang/Numb
394404
public fun toLong ()J
395405
public final fun toPlainString ()Ljava/lang/String;
396406
public fun toShort ()S
407+
public fun toString ()Ljava/lang/String;
397408
}
398409

399410
public final class aws/smithy/kotlin/runtime/content/BigInteger : java/lang/Number, java/lang/Comparable {
@@ -405,7 +416,6 @@ public final class aws/smithy/kotlin/runtime/content/BigInteger : java/lang/Numb
405416
public final fun doubleValue ()D
406417
public fun equals (Ljava/lang/Object;)Z
407418
public final fun floatValue ()F
408-
public final fun getValue ()Ljava/lang/String;
409419
public fun hashCode ()I
410420
public final fun intValue ()I
411421
public final fun longValue ()J
@@ -420,6 +430,8 @@ public final class aws/smithy/kotlin/runtime/content/BigInteger : java/lang/Numb
420430
public fun toLong ()J
421431
public fun toShort ()S
422432
public fun toString ()Ljava/lang/String;
433+
public final fun toString (I)Ljava/lang/String;
434+
public static synthetic fun toString$default (Laws/smithy/kotlin/runtime/content/BigInteger;IILjava/lang/Object;)Ljava/lang/String;
423435
}
424436

425437
public abstract class aws/smithy/kotlin/runtime/content/ByteStream {
@@ -469,6 +481,8 @@ public final class aws/smithy/kotlin/runtime/content/ByteStreamJVMKt {
469481
}
470482

471483
public final class aws/smithy/kotlin/runtime/content/ByteStreamKt {
484+
public static final fun asByteStream (Ljava/lang/String;)Laws/smithy/kotlin/runtime/content/ByteStream;
485+
public static final fun asByteStream ([B)Laws/smithy/kotlin/runtime/content/ByteStream;
472486
public static final fun cancel (Laws/smithy/kotlin/runtime/content/ByteStream;)V
473487
public static final fun decodeToString (Laws/smithy/kotlin/runtime/content/ByteStream;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
474488
public static final fun toByteArray (Laws/smithy/kotlin/runtime/content/ByteStream;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -799,6 +813,12 @@ public final class aws/smithy/kotlin/runtime/io/ClosedWriteChannelException : ja
799813
public synthetic fun <init> (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
800814
}
801815

816+
public class aws/smithy/kotlin/runtime/io/EOFException : java/io/EOFException {
817+
public fun <init> ()V
818+
public fun <init> (Ljava/lang/String;)V
819+
public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
820+
}
821+
802822
public final class aws/smithy/kotlin/runtime/io/GzipByteReadChannel : aws/smithy/kotlin/runtime/io/SdkByteReadChannel {
803823
public fun <init> (Laws/smithy/kotlin/runtime/io/SdkByteReadChannel;)V
804824
public fun cancel (Ljava/lang/Throwable;)Z
@@ -844,6 +864,10 @@ public final class aws/smithy/kotlin/runtime/io/HashingSource : aws/smithy/kotli
844864
}
845865

846866
public final class aws/smithy/kotlin/runtime/io/JavaIOKt {
867+
public static final fun inputStream (Laws/smithy/kotlin/runtime/io/SdkBuffer;)Ljava/io/InputStream;
868+
public static final fun isOpen (Laws/smithy/kotlin/runtime/io/SdkBuffer;)Z
869+
public static final fun outputStream (Laws/smithy/kotlin/runtime/io/SdkBuffer;)Ljava/io/OutputStream;
870+
public static final fun read (Laws/smithy/kotlin/runtime/io/SdkBuffer;Ljava/nio/ByteBuffer;)I
847871
public static final fun sink (Ljava/io/File;)Laws/smithy/kotlin/runtime/io/SdkSink;
848872
public static final fun sink (Ljava/io/OutputStream;)Laws/smithy/kotlin/runtime/io/SdkSink;
849873
public static final fun sink (Ljava/nio/file/Path;)Laws/smithy/kotlin/runtime/io/SdkSink;
@@ -854,6 +878,7 @@ public final class aws/smithy/kotlin/runtime/io/JavaIOKt {
854878
public static final fun source (Ljava/nio/file/Path;Lkotlin/ranges/LongRange;)Laws/smithy/kotlin/runtime/io/SdkSource;
855879
public static synthetic fun source$default (Ljava/io/File;JJILjava/lang/Object;)Laws/smithy/kotlin/runtime/io/SdkSource;
856880
public static synthetic fun source$default (Ljava/nio/file/Path;JJILjava/lang/Object;)Laws/smithy/kotlin/runtime/io/SdkSource;
881+
public static final fun write (Laws/smithy/kotlin/runtime/io/SdkBuffer;Ljava/nio/ByteBuffer;)I
857882
}
858883

859884
public final class aws/smithy/kotlin/runtime/io/SdkBuffer : aws/smithy/kotlin/runtime/io/SdkBufferedSink, aws/smithy/kotlin/runtime/io/SdkBufferedSource {
@@ -866,12 +891,8 @@ public final class aws/smithy/kotlin/runtime/io/SdkBuffer : aws/smithy/kotlin/ru
866891
public fun getBuffer ()Laws/smithy/kotlin/runtime/io/SdkBuffer;
867892
public final fun getSize ()J
868893
public fun hashCode ()I
869-
public fun inputStream ()Ljava/io/InputStream;
870-
public fun isOpen ()Z
871-
public fun outputStream ()Ljava/io/OutputStream;
872894
public fun peek ()Laws/smithy/kotlin/runtime/io/SdkBufferedSource;
873895
public fun read (Laws/smithy/kotlin/runtime/io/SdkBuffer;J)J
874-
public fun read (Ljava/nio/ByteBuffer;)I
875896
public fun read ([BII)I
876897
public fun readAll (Laws/smithy/kotlin/runtime/io/SdkSink;)J
877898
public fun readByte ()B
@@ -891,7 +912,6 @@ public final class aws/smithy/kotlin/runtime/io/SdkBuffer : aws/smithy/kotlin/ru
891912
public fun toString ()Ljava/lang/String;
892913
public fun write (Laws/smithy/kotlin/runtime/io/SdkBuffer;J)V
893914
public fun write (Laws/smithy/kotlin/runtime/io/SdkSource;J)V
894-
public fun write (Ljava/nio/ByteBuffer;)I
895915
public fun write ([BII)V
896916
public fun writeAll (Laws/smithy/kotlin/runtime/io/SdkSource;)J
897917
public fun writeByte (B)V
@@ -904,11 +924,9 @@ public final class aws/smithy/kotlin/runtime/io/SdkBuffer : aws/smithy/kotlin/ru
904924
public fun writeUtf8 (Ljava/lang/String;II)V
905925
}
906926

907-
public abstract interface class aws/smithy/kotlin/runtime/io/SdkBufferedSink : aws/smithy/kotlin/runtime/io/SdkSink, java/nio/channels/WritableByteChannel {
927+
public abstract interface class aws/smithy/kotlin/runtime/io/SdkBufferedSink : aws/smithy/kotlin/runtime/io/SdkSink {
908928
public abstract fun emit ()V
909-
public abstract fun flush ()V
910929
public abstract fun getBuffer ()Laws/smithy/kotlin/runtime/io/SdkBuffer;
911-
public abstract fun outputStream ()Ljava/io/OutputStream;
912930
public abstract fun write (Laws/smithy/kotlin/runtime/io/SdkSource;J)V
913931
public abstract fun write ([BII)V
914932
public static synthetic fun write$default (Laws/smithy/kotlin/runtime/io/SdkBufferedSink;[BIIILjava/lang/Object;)V
@@ -929,10 +947,9 @@ public final class aws/smithy/kotlin/runtime/io/SdkBufferedSink$DefaultImpls {
929947
public static synthetic fun writeUtf8$default (Laws/smithy/kotlin/runtime/io/SdkBufferedSink;Ljava/lang/String;IIILjava/lang/Object;)V
930948
}
931949

932-
public abstract interface class aws/smithy/kotlin/runtime/io/SdkBufferedSource : aws/smithy/kotlin/runtime/io/SdkSource, java/nio/channels/ReadableByteChannel {
950+
public abstract interface class aws/smithy/kotlin/runtime/io/SdkBufferedSource : aws/smithy/kotlin/runtime/io/SdkSource {
933951
public abstract fun exhausted ()Z
934952
public abstract fun getBuffer ()Laws/smithy/kotlin/runtime/io/SdkBuffer;
935-
public abstract fun inputStream ()Ljava/io/InputStream;
936953
public abstract fun peek ()Laws/smithy/kotlin/runtime/io/SdkBufferedSource;
937954
public abstract fun read ([BII)I
938955
public static synthetic fun read$default (Laws/smithy/kotlin/runtime/io/SdkBufferedSource;[BIIILjava/lang/Object;)I
@@ -1068,16 +1085,13 @@ public abstract interface class aws/smithy/kotlin/runtime/io/SdkSource : java/io
10681085
public abstract fun read (Laws/smithy/kotlin/runtime/io/SdkBuffer;J)J
10691086
}
10701087

1071-
public final class aws/smithy/kotlin/runtime/io/SdkSourceJVMKt {
1088+
public final class aws/smithy/kotlin/runtime/io/SdkSourceKt {
1089+
public static final fun readFully (Laws/smithy/kotlin/runtime/io/SdkSource;Laws/smithy/kotlin/runtime/io/SdkBuffer;J)V
10721090
public static final fun readToByteArray (Laws/smithy/kotlin/runtime/io/SdkSource;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
10731091
public static final fun toSdkByteReadChannel (Laws/smithy/kotlin/runtime/io/SdkSource;Lkotlinx/coroutines/CoroutineScope;)Laws/smithy/kotlin/runtime/io/SdkByteReadChannel;
10741092
public static synthetic fun toSdkByteReadChannel$default (Laws/smithy/kotlin/runtime/io/SdkSource;Lkotlinx/coroutines/CoroutineScope;ILjava/lang/Object;)Laws/smithy/kotlin/runtime/io/SdkByteReadChannel;
10751093
}
10761094

1077-
public final class aws/smithy/kotlin/runtime/io/SdkSourceKt {
1078-
public static final fun readFully (Laws/smithy/kotlin/runtime/io/SdkSource;Laws/smithy/kotlin/runtime/io/SdkBuffer;J)V
1079-
}
1080-
10811095
public final class aws/smithy/kotlin/runtime/io/internal/ConvertKt {
10821096
public static final fun toOkio (Laws/smithy/kotlin/runtime/io/SdkBuffer;)Lokio/Buffer;
10831097
public static final fun toOkio (Laws/smithy/kotlin/runtime/io/SdkSink;)Lokio/Sink;
@@ -2391,9 +2405,12 @@ public final class aws/smithy/kotlin/runtime/util/OperatingSystem {
23912405
public final class aws/smithy/kotlin/runtime/util/OsFamily : java/lang/Enum {
23922406
public static final field Android Laws/smithy/kotlin/runtime/util/OsFamily;
23932407
public static final field Ios Laws/smithy/kotlin/runtime/util/OsFamily;
2408+
public static final field IpadOs Laws/smithy/kotlin/runtime/util/OsFamily;
23942409
public static final field Linux Laws/smithy/kotlin/runtime/util/OsFamily;
23952410
public static final field MacOs Laws/smithy/kotlin/runtime/util/OsFamily;
2411+
public static final field TvOs Laws/smithy/kotlin/runtime/util/OsFamily;
23962412
public static final field Unknown Laws/smithy/kotlin/runtime/util/OsFamily;
2413+
public static final field WatchOs Laws/smithy/kotlin/runtime/util/OsFamily;
23972414
public static final field Windows Laws/smithy/kotlin/runtime/util/OsFamily;
23982415
public static fun getEntries ()Lkotlin/enums/EnumEntries;
23992416
public fun toString ()Ljava/lang/String;

0 commit comments

Comments
 (0)