Skip to content

Navigation Menu

Sign inAppearance settings
Sign in
Appearance settings

Commit 576bd2f

Browse filesBrowse the repository at this point in the historyBrowse files
SvyatoslavScherbinaSpace Team
SvyatoslavScherbina
authored and
Space Team
committed
[K/N] Remove deprecated kotlin-native/Interop/JSInterop
This component was used for the "JS interop" capability of the wasm32 target in Kotlin/Native. The target and its capability are long gone. The API of the component was error-deprecated in 3ec4f2e. This commit removes the component and its traces. It has nothing to do with the modern replacement of that target, Kotlin/Wasm. ^KT-61549 Fixed
1 parent f749ee5 commit 576bd2f
Copy full SHA for 576bd2f

9 files changed

-286Lines changed: 0 additions & 286 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎kotlin-native/Interop/JsRuntime/build.gradle‎

Copy file name to clipboardExpand all lines: kotlin-native/Interop/JsRuntime/build.gradle
-20Lines changed: 0 additions & 20 deletions
This file was deleted.
Collapse file

‎kotlin-native/Interop/JsRuntime/src/main/kotlin/jsinterop.kt‎

Copy file name to clipboardExpand all lines: kotlin-native/Interop/JsRuntime/src/main/kotlin/jsinterop.kt
-155Lines changed: 0 additions & 155 deletions
This file was deleted.
Collapse file

‎kotlin-native/build.gradle‎

Copy file name to clipboardExpand all lines: kotlin-native/build.gradle
-3Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,6 @@ tasks.register("distNativeSources", Zip) {
175175
from(project(':kotlin-native:runtime').file('src/main/kotlin'))
176176
from(project(':kotlin-native:Interop:Runtime').file('src/main/kotlin'))
177177
from(project(':kotlin-native:Interop:Runtime').file('src/native/kotlin'))
178-
from(project(':kotlin-native:Interop:JsRuntime').file('src/main/kotlin')) {
179-
into('kotlinx/wasm/jsinterop')
180-
}
181178
}
182179
}
183180

Collapse file

‎kotlin-native/runtime/build.gradle.kts‎

Copy file name to clipboardExpand all lines: kotlin-native/runtime/build.gradle.kts
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,6 @@ val stdlibBuildTask by tasks.registering(KonanCompileTask::class) {
525525
val nativeMain by sourceSets.creating {
526526
srcDir(project(":kotlin-native:Interop:Runtime").file("src/main/kotlin"))
527527
srcDir(project(":kotlin-native:Interop:Runtime").file("src/native/kotlin"))
528-
srcDir(project(":kotlin-native:Interop:JsRuntime").file("src/main/kotlin"))
529528
srcDir(project.file("src/main/kotlin"))
530529
}
531530
}
Collapse file

‎kotlin-native/runtime/src/main/cpp/KString.cpp‎

Copy file name to clipboardExpand all lines: kotlin-native/runtime/src/main/cpp/KString.cpp
-12Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -563,18 +563,6 @@ extern "C" KInt Kotlin_String_hashCode(KRef thiz) {
563563
return result;
564564
}
565565

566-
extern "C" const KChar* Kotlin_String_utf16pointer(KConstRef message) {
567-
auto header = StringHeader::of(message);
568-
if (header->encoding() != StringEncoding::kUTF16) ThrowIllegalArgumentException();
569-
return reinterpret_cast<const KChar*>(header->data());
570-
}
571-
572-
extern "C" KInt Kotlin_String_utf16length(KConstRef message) {
573-
auto header = StringHeader::of(message);
574-
if (header->encoding() != StringEncoding::kUTF16) ThrowIllegalArgumentException();
575-
return header->size();
576-
}
577-
578566
extern "C" KConstNativePtr Kotlin_Arrays_getStringAddressOfElement(KConstRef thiz, KInt index) {
579567
return encodingAware(thiz, [=](auto thiz) { return reinterpret_cast<KConstNativePtr>(boundsCheckedIteratorAt(thiz, index).ptr()); });
580568
}
Collapse file

‎libraries/tools/binary-compatibility-validator/klib-public-api/kotlin-stdlib.api‎

Copy file name to clipboardExpand all lines: libraries/tools/binary-compatibility-validator/klib-public-api/kotlin-stdlib.api
-92Lines changed: 0 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -11501,30 +11501,6 @@ open class kotlinx.cinterop/NativePointed { // kotlinx.cinterop/NativePointed|nu
1150111501
final fun <get-rawPtr>(): kotlin.native.internal/NativePtr // kotlinx.cinterop/NativePointed.rawPtr.<get-rawPtr>|<get-rawPtr>(){}[0]
1150211502
}
1150311503

11504-
// Targets: [native]
11505-
open class kotlinx.wasm.jsinterop/JsArray : kotlinx.wasm.jsinterop/JsValue { // kotlinx.wasm.jsinterop/JsArray|null[0]
11506-
constructor <init>(kotlin/Int, kotlin/Int) // kotlinx.wasm.jsinterop/JsArray.<init>|<init>(kotlin.Int;kotlin.Int){}[0]
11507-
constructor <init>(kotlinx.wasm.jsinterop/JsValue) // kotlinx.wasm.jsinterop/JsArray.<init>|<init>(kotlinx.wasm.jsinterop.JsValue){}[0]
11508-
11509-
final val size // kotlinx.wasm.jsinterop/JsArray.size|{}size[0]
11510-
final fun <get-size>(): kotlin/Int // kotlinx.wasm.jsinterop/JsArray.size.<get-size>|<get-size>(){}[0]
11511-
11512-
final fun get(kotlin/Int): kotlinx.wasm.jsinterop/JsValue // kotlinx.wasm.jsinterop/JsArray.get|get(kotlin.Int){}[0]
11513-
}
11514-
11515-
// Targets: [native]
11516-
open class kotlinx.wasm.jsinterop/JsValue { // kotlinx.wasm.jsinterop/JsValue|null[0]
11517-
constructor <init>(kotlin/Int, kotlin/Int) // kotlinx.wasm.jsinterop/JsValue.<init>|<init>(kotlin.Int;kotlin.Int){}[0]
11518-
11519-
final val arena // kotlinx.wasm.jsinterop/JsValue.arena|{}arena[0]
11520-
final fun <get-arena>(): kotlin/Int // kotlinx.wasm.jsinterop/JsValue.arena.<get-arena>|<get-arena>(){}[0]
11521-
final val index // kotlinx.wasm.jsinterop/JsValue.index|{}index[0]
11522-
final fun <get-index>(): kotlin/Int // kotlinx.wasm.jsinterop/JsValue.index.<get-index>|<get-index>(){}[0]
11523-
11524-
final fun getInt(kotlin/String): kotlin/Int // kotlinx.wasm.jsinterop/JsValue.getInt|getInt(kotlin.String){}[0]
11525-
final fun getProperty(kotlin/String): kotlinx.wasm.jsinterop/JsValue // kotlinx.wasm.jsinterop/JsValue.getProperty|getProperty(kotlin.String){}[0]
11526-
}
11527-
1152811504
// Targets: [native]
1152911505
sealed class kotlinx.cinterop/CPrimitiveVar : kotlinx.cinterop/CVariable { // kotlinx.cinterop/CPrimitiveVar|null[0]
1153011506
open class Type : kotlinx.cinterop/CVariable.Type { // kotlinx.cinterop/CPrimitiveVar.Type|null[0]
@@ -11831,20 +11807,6 @@ final object kotlinx.cinterop/nativeMemUtils { // kotlinx.cinterop/nativeMemUtil
1183111807
final fun zeroMemory(kotlinx.cinterop/NativePointed, kotlin/Int) // kotlinx.cinterop/nativeMemUtils.zeroMemory|zeroMemory(kotlinx.cinterop.NativePointed;kotlin.Int){}[0]
1183211808
}
1183311809

11834-
// Targets: [native]
11835-
final object kotlinx.wasm.jsinterop/ArenaManager { // kotlinx.wasm.jsinterop/ArenaManager|null[0]
11836-
final val globalArena // kotlinx.wasm.jsinterop/ArenaManager.globalArena|{}globalArena[0]
11837-
final fun <get-globalArena>(): kotlin/Int // kotlinx.wasm.jsinterop/ArenaManager.globalArena.<get-globalArena>|<get-globalArena>(){}[0]
11838-
11839-
final var currentArena // kotlinx.wasm.jsinterop/ArenaManager.currentArena|{}currentArena[0]
11840-
final fun <get-currentArena>(): kotlin/Int // kotlinx.wasm.jsinterop/ArenaManager.currentArena.<get-currentArena>|<get-currentArena>(){}[0]
11841-
final fun <set-currentArena>(kotlin/Int) // kotlinx.wasm.jsinterop/ArenaManager.currentArena.<set-currentArena>|<set-currentArena>(kotlin.Int){}[0]
11842-
}
11843-
11844-
// Targets: [native]
11845-
final const val kotlinx.wasm.jsinterop/upperWord // kotlinx.wasm.jsinterop/upperWord|{}upperWord[0]
11846-
final fun <get-upperWord>(): kotlin/Long // kotlinx.wasm.jsinterop/upperWord.<get-upperWord>|<get-upperWord>(){}[0]
11847-
1184811810
// Targets: [native]
1184911811
final val kotlin.math/ulp // kotlin.math/ulp|@kotlin.Float{}ulp[0]
1185011812
final fun (kotlin/Float).<get-ulp>(): kotlin/Float // kotlin.math/ulp.<get-ulp>|<get-ulp>@kotlin.Float(){}[0]
@@ -12315,12 +12277,6 @@ final fun (kotlinx.cinterop/Pinned<kotlin/ULongArray>).kotlinx.cinterop/addressO
1231512277
// Targets: [native]
1231612278
final fun (kotlinx.cinterop/Pinned<kotlin/UShortArray>).kotlinx.cinterop/addressOf(kotlin/Int): kotlinx.cinterop/CPointer<kotlinx.cinterop/UShortVarOf<kotlin/UShort>> // kotlinx.cinterop/addressOf|addressOf@kotlinx.cinterop.Pinned<kotlin.UShortArray>(kotlin.Int){}[0]
1231712279

12318-
// Targets: [native]
12319-
final fun (kotlinx.wasm.jsinterop/JsValue).kotlinx.wasm.jsinterop/setter(kotlin/String, kotlin/Function1<kotlin.collections/ArrayList<kotlinx.wasm.jsinterop/JsValue>, kotlin/Unit>) // kotlinx.wasm.jsinterop/setter|setter@kotlinx.wasm.jsinterop.JsValue(kotlin.String;kotlin.Function1<kotlin.collections.ArrayList<kotlinx.wasm.jsinterop.JsValue>,kotlin.Unit>){}[0]
12320-
12321-
// Targets: [native]
12322-
final fun (kotlinx.wasm.jsinterop/JsValue).kotlinx.wasm.jsinterop/setter(kotlin/String, kotlin/String) // kotlinx.wasm.jsinterop/setter|setter@kotlinx.wasm.jsinterop.JsValue(kotlin.String;kotlin.String){}[0]
12323-
1232412280
// Targets: [native]
1232512281
final fun <#A: kotlin/Any> kotlin.test/assertNotNull(#A?, kotlin/String? = ...): #A // kotlin.test/assertNotNull|assertNotNull(0:0?;kotlin.String?){0§<kotlin.Any>}[0]
1232612282

@@ -12570,9 +12526,6 @@ final fun <#A: kotlin/Any?> kotlinx.cinterop/interpretObjCPointerOrNull(kotlin.n
1257012526
// Targets: [native]
1257112527
final fun <#A: kotlin/Any?> kotlinx.cinterop/staticCFunction(kotlin/Function0<#A>): kotlinx.cinterop/CPointer<kotlinx.cinterop/CFunction<kotlin/Function0<#A>>> // kotlinx.cinterop/staticCFunction|staticCFunction(kotlin.Function0<0:0>){0§<kotlin.Any?>}[0]
1257212528

12573-
// Targets: [native]
12574-
final fun <#A: kotlin/Any?> kotlinx.wasm.jsinterop/wrapFunction(kotlin/Function1<kotlin.collections/ArrayList<kotlinx.wasm.jsinterop/JsValue>, #A>): kotlin/Int // kotlinx.wasm.jsinterop/wrapFunction|wrapFunction(kotlin.Function1<kotlin.collections.ArrayList<kotlinx.wasm.jsinterop.JsValue>,0:0>){0§<kotlin.Any?>}[0]
12575-
1257612529
// Targets: [native]
1257712530
final fun <#A: kotlin/Boolean> (kotlinx.cinterop/NativePlacement).kotlinx.cinterop/alloc(#A): kotlinx.cinterop/BooleanVarOf<#A> // kotlinx.cinterop/alloc|alloc@kotlinx.cinterop.NativePlacement(0:0){0§<kotlin.Boolean>}[0]
1257812531

@@ -13275,51 +13228,6 @@ final fun kotlinx.cinterop/vectorOf(kotlin/Int, kotlin/Int, kotlin/Int, kotlin/I
1327513228
// Targets: [native]
1327613229
final fun kotlinx.cinterop/writeBits(kotlin.native.internal/NativePtr, kotlin/Long, kotlin/Int, kotlin/Long) // kotlinx.cinterop/writeBits|writeBits(kotlin.native.internal.NativePtr;kotlin.Long;kotlin.Int;kotlin.Long){}[0]
1327713230

13278-
// Targets: [native]
13279-
final fun kotlinx.wasm.jsinterop/Konan_js_getProperty(kotlin/Int, kotlin/Int, kotlin/Int, kotlin/Int): kotlin/Int // kotlinx.wasm.jsinterop/Konan_js_getProperty|Konan_js_getProperty(kotlin.Int;kotlin.Int;kotlin.Int;kotlin.Int){}[0]
13280-
13281-
// Targets: [native]
13282-
final fun kotlinx.wasm.jsinterop/ReturnSlot_getDouble(): kotlin/Double // kotlinx.wasm.jsinterop/ReturnSlot_getDouble|ReturnSlot_getDouble(){}[0]
13283-
13284-
// Targets: [native]
13285-
final fun kotlinx.wasm.jsinterop/allocateArena(): kotlin/Int // kotlinx.wasm.jsinterop/allocateArena|allocateArena(){}[0]
13286-
13287-
// Targets: [native]
13288-
final fun kotlinx.wasm.jsinterop/doubleLower(kotlin/Double): kotlin/Int // kotlinx.wasm.jsinterop/doubleLower|doubleLower(kotlin.Double){}[0]
13289-
13290-
// Targets: [native]
13291-
final fun kotlinx.wasm.jsinterop/doubleUpper(kotlin/Double): kotlin/Int // kotlinx.wasm.jsinterop/doubleUpper|doubleUpper(kotlin.Double){}[0]
13292-
13293-
// Targets: [native]
13294-
final fun kotlinx.wasm.jsinterop/freeArena(kotlin/Int) // kotlinx.wasm.jsinterop/freeArena|freeArena(kotlin.Int){}[0]
13295-
13296-
// Targets: [native]
13297-
final fun kotlinx.wasm.jsinterop/getInt(kotlin/Int, kotlin/Int, kotlin/Int, kotlin/Int): kotlin/Int // kotlinx.wasm.jsinterop/getInt|getInt(kotlin.Int;kotlin.Int;kotlin.Int;kotlin.Int){}[0]
13298-
13299-
// Targets: [native]
13300-
final fun kotlinx.wasm.jsinterop/pushIntToArena(kotlin/Int, kotlin/Int) // kotlinx.wasm.jsinterop/pushIntToArena|pushIntToArena(kotlin.Int;kotlin.Int){}[0]
13301-
13302-
// Targets: [native]
13303-
final fun kotlinx.wasm.jsinterop/runLambda(kotlin/Int, kotlin/Int, kotlin/Int): kotlin/Int // kotlinx.wasm.jsinterop/runLambda|runLambda(kotlin.Int;kotlin.Int;kotlin.Int){}[0]
13304-
13305-
// Targets: [native]
13306-
final fun kotlinx.wasm.jsinterop/setFunction(kotlin/Int, kotlin/Int, kotlin/Int, kotlin/Int, kotlin/Int) // kotlinx.wasm.jsinterop/setFunction|setFunction(kotlin.Int;kotlin.Int;kotlin.Int;kotlin.Int;kotlin.Int){}[0]
13307-
13308-
// Targets: [native]
13309-
final fun kotlinx.wasm.jsinterop/setString(kotlin/Int, kotlin/Int, kotlin/Int, kotlin/Int, kotlin/Int, kotlin/Int) // kotlinx.wasm.jsinterop/setString|setString(kotlin.Int;kotlin.Int;kotlin.Int;kotlin.Int;kotlin.Int;kotlin.Int){}[0]
13310-
13311-
// Targets: [native]
13312-
final fun kotlinx.wasm.jsinterop/setter(kotlinx.wasm.jsinterop/JsValue, kotlin/String, kotlin/Function1<kotlin.collections/ArrayList<kotlinx.wasm.jsinterop/JsValue>, kotlin/Unit>) // kotlinx.wasm.jsinterop/setter|setter(kotlinx.wasm.jsinterop.JsValue;kotlin.String;kotlin.Function1<kotlin.collections.ArrayList<kotlinx.wasm.jsinterop.JsValue>,kotlin.Unit>){}[0]
13313-
13314-
// Targets: [native]
13315-
final fun kotlinx.wasm.jsinterop/setter(kotlinx.wasm.jsinterop/JsValue, kotlin/String, kotlin/String) // kotlinx.wasm.jsinterop/setter|setter(kotlinx.wasm.jsinterop.JsValue;kotlin.String;kotlin.String){}[0]
13316-
13317-
// Targets: [native]
13318-
final fun kotlinx.wasm.jsinterop/stringLengthBytes(kotlin/String): kotlin/Int // kotlinx.wasm.jsinterop/stringLengthBytes|stringLengthBytes(kotlin.String){}[0]
13319-
13320-
// Targets: [native]
13321-
final fun kotlinx.wasm.jsinterop/stringPointer(kotlin/String): kotlin/Int // kotlinx.wasm.jsinterop/stringPointer|stringPointer(kotlin.String){}[0]
13322-
1332313231
// Targets: [native]
1332413232
final inline fun (kotlin/Any?).kotlin/toString(): kotlin/String // kotlin/toString|toString@kotlin.Any?(){}[0]
1332513233

Collapse file

‎libraries/tools/kotlin-stdlib-docs-legacy/build-docs.xml‎

Copy file name to clipboardExpand all lines: libraries/tools/kotlin-stdlib-docs-legacy/build-docs.xml
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,6 @@
249249

250250
<sourceroot path="${kotlin_native_root}/Interop/Runtime/src/main/kotlin"/>
251251
<sourceroot path="${kotlin_native_root}/Interop/Runtime/src/native/kotlin"/>
252-
<sourceroot path="${kotlin_native_root}/Interop/JsRuntime/src/main/kotlin"/>
253252
<sourceroot path="${kotlin_native_root}/runtime/src/main/kotlin"/>
254253
<sourceroot path="${kotlin_stdlib_dir}/native-wasm/src"/>
255254

Collapse file

‎libraries/tools/kotlin-stdlib-docs/build.gradle.kts‎

Copy file name to clipboardExpand all lines: libraries/tools/kotlin-stdlib-docs/build.gradle.kts
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ fun createStdLibVersionedDocTask(version: String, isLatest: Boolean) =
169169

170170
sourceRoots.from("$kotlin_native_root/Interop/Runtime/src/main/kotlin")
171171
sourceRoots.from("$kotlin_native_root/Interop/Runtime/src/native/kotlin")
172-
sourceRoots.from("$kotlin_native_root/Interop/JsRuntime/src/main/kotlin")
173172
sourceRoots.from("$kotlin_native_root/runtime/src/main/kotlin")
174173
sourceRoots.from("$kotlin_stdlib_dir/native-wasm/src")
175174
perPackageOption("kotlin.test") {
Collapse file

‎settings.gradle‎

Copy file name to clipboardExpand all lines: settings.gradle
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,6 @@ if (buildProperties.isKotlinNativeEnabled) {
988988
project(':kotlin-native:backend.native').projectDir = "$rootDir/kotlin-native/backend.native/compiler/ir/backend.native" as File
989989
include ':kotlin-native:Interop:Runtime'
990990
include ':kotlin-native:Interop:Indexer'
991-
include ':kotlin-native:Interop:JsRuntime'
992991
include ':kotlin-native:utilities:cli-runner'
993992
include ':kotlin-native:klib'
994993
include ':kotlin-native:common'

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.