Skip to content

Commit c9fe7f7

Browse files
zibet27zibet27
committed
WebRtc Client. Use kotlin-wrappers instead of manually generated browser declarations.
1 parent 67484e2 commit c9fe7f7

File tree

41 files changed

+3220
-5810
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+3220
-5810
lines changed

‎build-logic/src/main/kotlin/ktorbuild/internal/TrackedKotlinHierarchy.kt‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,6 @@ private class KotlinHierarchyTrackerImpl(
121121
override fun withWasmJs() = addTarget("wasmJs")
122122
override fun withWasmWasi() = addTarget("wasmWasi")
123123

124-
@Deprecated("Renamed to 'withAndroidTarget'", replaceWith = ReplaceWith("withAndroidTarget()"))
125-
override fun withAndroid() = withAndroidTarget()
126124
override fun withAndroidTarget() = addTarget("android")
127125
override fun withAndroidNativeX64() = addTarget("androidNativeX64")
128126
override fun withAndroidNativeX86() = addTarget("androidNativeX86")
@@ -148,29 +146,6 @@ private class KotlinHierarchyTrackerImpl(
148146
override fun withMingwX64() = addTarget("mingwX64")
149147
//endregion
150148

151-
//region Removed targets
152-
@Deprecated(REMOVED_TARGET_MESSAGE, level = DeprecationLevel.ERROR)
153-
override fun withIosArm32() = error("Target removed")
154-
155-
@Deprecated(REMOVED_TARGET_MESSAGE, level = DeprecationLevel.ERROR)
156-
override fun withWatchosX86() = error("Target removed")
157-
158-
@Deprecated(REMOVED_TARGET_MESSAGE, level = DeprecationLevel.ERROR)
159-
override fun withMingwX86() = error("Target removed")
160-
161-
@Deprecated(REMOVED_TARGET_MESSAGE, level = DeprecationLevel.ERROR)
162-
override fun withLinuxArm32Hfp() = error("Target removed")
163-
164-
@Deprecated(REMOVED_TARGET_MESSAGE, level = DeprecationLevel.ERROR)
165-
override fun withLinuxMips32() = error("Target removed")
166-
167-
@Deprecated(REMOVED_TARGET_MESSAGE, level = DeprecationLevel.ERROR)
168-
override fun withLinuxMipsel32() = error("Target removed")
169-
170-
@Deprecated(REMOVED_TARGET_MESSAGE, level = DeprecationLevel.ERROR)
171-
override fun withWasm32() = error("Target removed")
172-
//endregion
173-
174149
private fun addTarget(name: String) {
175150
if (groupName == null) return
176151
check(!targetsFrozen) { "Can't add targets to already declared group: $groupName" }

‎build-settings-logic/src/main/kotlin/ktorsettings.dependency-resolution-management.settings.gradle.kts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ dependencyResolutionManagement {
2424

2525
downgradeTestDependencies()
2626
}
27+
28+
create("kotlinWrappers") {
29+
from("org.jetbrains.kotlin-wrappers:kotlin-wrappers-catalog:2025.7.10")
30+
}
2731
}
2832
}
2933

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ org.gradle.kotlin.dsl.allWarningsAsErrors=true
5353

5454
# Speeds up the configuration phase but might cause problems with running some tasks on a single module.
5555
# If you experience problems with this flag, try to add `--no-configure-on-demand` or set this flag to `false`
56-
org.gradle.configureondemand=true
56+
org.gradle.configureondemand=false
5757

5858
# kotlin
5959
kotlin.native.ignoreDisabledTargets=true

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
android-kmp-plugin = "8.9.2"
44
androidx = "1.6.1"
5-
kotlin = "2.1.21"
5+
kotlin = "2.2.0"
66
kotlinx-html = "0.12.0"
77
kotlinx-datetime = "0.6.2"
88
kotlinx-io = "0.7.0"

‎kotlin-js-store/wasm/yarn.lock‎

Lines changed: 2617 additions & 0 deletions
Large diffs are not rendered by default.

‎kotlin-js-store/yarn.lock‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2292,11 +2292,6 @@ type-is@~1.6.18:
22922292
media-typer "0.3.0"
22932293
mime-types "~2.1.24"
22942294

2295-
typescript@5.5.4:
2296-
version "5.5.4"
2297-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
2298-
integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==
2299-
23002295
ua-parser-js@^0.7.30:
23012296
version "0.7.37"
23022297
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.37.tgz#e464e66dac2d33a7a1251d7d7a99d6157ec27832"

‎ktor-client/ktor-client-webrtc/api/android/ktor-client-webrtc.api‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,14 +291,15 @@ public final class io/ktor/client/webrtc/WebRtc$IceCandidate {
291291
public fun toString ()Ljava/lang/String;
292292
}
293293

294-
public synthetic class io/ktor/client/webrtc/WebRtc$IceCandidate$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
294+
public final synthetic class io/ktor/client/webrtc/WebRtc$IceCandidate$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
295295
public static final field INSTANCE Lio/ktor/client/webrtc/WebRtc$IceCandidate$$serializer;
296296
public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
297297
public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/ktor/client/webrtc/WebRtc$IceCandidate;
298298
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
299299
public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
300300
public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/ktor/client/webrtc/WebRtc$IceCandidate;)V
301301
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
302+
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
302303
}
303304

304305
public final class io/ktor/client/webrtc/WebRtc$IceCandidate$Companion {
@@ -416,14 +417,15 @@ public final class io/ktor/client/webrtc/WebRtc$SessionDescription {
416417
public fun toString ()Ljava/lang/String;
417418
}
418419

419-
public synthetic class io/ktor/client/webrtc/WebRtc$SessionDescription$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
420+
public final synthetic class io/ktor/client/webrtc/WebRtc$SessionDescription$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
420421
public static final field INSTANCE Lio/ktor/client/webrtc/WebRtc$SessionDescription$$serializer;
421422
public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
422423
public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/ktor/client/webrtc/WebRtc$SessionDescription;
423424
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
424425
public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
425426
public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/ktor/client/webrtc/WebRtc$SessionDescription;)V
426427
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
428+
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
427429
}
428430

429431
public final class io/ktor/client/webrtc/WebRtc$SessionDescription$Companion {

‎ktor-client/ktor-client-webrtc/api/jvm/ktor-client-webrtc.api‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,14 +189,15 @@ public final class io/ktor/client/webrtc/WebRtc$IceCandidate {
189189
public fun toString ()Ljava/lang/String;
190190
}
191191

192-
public synthetic class io/ktor/client/webrtc/WebRtc$IceCandidate$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
192+
public final synthetic class io/ktor/client/webrtc/WebRtc$IceCandidate$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
193193
public static final field INSTANCE Lio/ktor/client/webrtc/WebRtc$IceCandidate$$serializer;
194194
public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
195195
public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/ktor/client/webrtc/WebRtc$IceCandidate;
196196
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
197197
public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
198198
public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/ktor/client/webrtc/WebRtc$IceCandidate;)V
199199
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
200+
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
200201
}
201202

202203
public final class io/ktor/client/webrtc/WebRtc$IceCandidate$Companion {
@@ -314,14 +315,15 @@ public final class io/ktor/client/webrtc/WebRtc$SessionDescription {
314315
public fun toString ()Ljava/lang/String;
315316
}
316317

317-
public synthetic class io/ktor/client/webrtc/WebRtc$SessionDescription$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
318+
public final synthetic class io/ktor/client/webrtc/WebRtc$SessionDescription$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
318319
public static final field INSTANCE Lio/ktor/client/webrtc/WebRtc$SessionDescription$$serializer;
319320
public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
320321
public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/ktor/client/webrtc/WebRtc$SessionDescription;
321322
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
322323
public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
323324
public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/ktor/client/webrtc/WebRtc$SessionDescription;)V
324325
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
326+
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
325327
}
326328

327329
public final class io/ktor/client/webrtc/WebRtc$SessionDescription$Companion {

0 commit comments

Comments
 (0)