Skip to content

Commit b5c8c15

Browse files
authored
Changed actual FormatLanguage annotation for JS and native (#2379)
The declaration of annotation `org.intellij.lang.annotations.Language` in the JS and native source has been removed, because if this annotation is declared in other dependency, then this leads to compilation errors. Fixes #2377
1 parent 245030b commit b5c8c15

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

formats/json/jsMain/src/kotlinx/serialization/json/internal/FormatLanguage.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,9 @@ package kotlinx.serialization.json.internal;
77
import kotlinx.serialization.InternalSerializationApi
88

99
@InternalSerializationApi
10-
public actual typealias FormatLanguage = org.intellij.lang.annotations.Language
10+
public actual annotation class FormatLanguage(
11+
public actual val value: String,
12+
// default parameters are not used due to https://youtrack.jetbrains.com/issue/KT-25946/
13+
public actual val prefix: String,
14+
public actual val suffix: String,
15+
)

formats/json/nativeMain/src/kotlinx/serialization/json/internal/FormatLanguage.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,9 @@ package kotlinx.serialization.json.internal;
77
import kotlinx.serialization.InternalSerializationApi
88

99
@InternalSerializationApi
10-
public actual typealias FormatLanguage = org.intellij.lang.annotations.Language
10+
public actual annotation class FormatLanguage(
11+
public actual val value: String,
12+
// default parameters are not used due to https://youtrack.jetbrains.com/issue/KT-25946/
13+
public actual val prefix: String,
14+
public actual val suffix: String,
15+
)

0 commit comments

Comments
 (0)