diff options
| author | Sergey Shanshin <sergey.shanshin@jetbrains.com> | 2023-07-26 17:27:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-26 16:27:19 +0200 |
| commit | b5c8c1553bffcc1ac7bcfdf5fb1402e32663b9d0 (patch) | |
| tree | e0b587e488bb89958682b2c43ddc98e4f51a8763 /formats/json | |
| parent | 245030b1b8f2eefe41feb2e5d5baf4aeba37b08f (diff) | |
| download | kotlinx.serialization-b5c8c1553bffcc1ac7bcfdf5fb1402e32663b9d0.tar.gz | |
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
Diffstat (limited to 'formats/json')
| -rw-r--r-- | formats/json/jsMain/src/kotlinx/serialization/json/internal/FormatLanguage.kt | 7 | ||||
| -rw-r--r-- | formats/json/nativeMain/src/kotlinx/serialization/json/internal/FormatLanguage.kt | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/formats/json/jsMain/src/kotlinx/serialization/json/internal/FormatLanguage.kt b/formats/json/jsMain/src/kotlinx/serialization/json/internal/FormatLanguage.kt index 6804859d..eb96ea2e 100644 --- a/formats/json/jsMain/src/kotlinx/serialization/json/internal/FormatLanguage.kt +++ b/formats/json/jsMain/src/kotlinx/serialization/json/internal/FormatLanguage.kt @@ -7,4 +7,9 @@ package kotlinx.serialization.json.internal; import kotlinx.serialization.InternalSerializationApi @InternalSerializationApi -public actual typealias FormatLanguage = org.intellij.lang.annotations.Language +public actual annotation class FormatLanguage( + public actual val value: String, + // default parameters are not used due to https://youtrack.jetbrains.com/issue/KT-25946/ + public actual val prefix: String, + public actual val suffix: String, +) diff --git a/formats/json/nativeMain/src/kotlinx/serialization/json/internal/FormatLanguage.kt b/formats/json/nativeMain/src/kotlinx/serialization/json/internal/FormatLanguage.kt index 9eedf1b8..1518d86c 100644 --- a/formats/json/nativeMain/src/kotlinx/serialization/json/internal/FormatLanguage.kt +++ b/formats/json/nativeMain/src/kotlinx/serialization/json/internal/FormatLanguage.kt @@ -7,4 +7,9 @@ package kotlinx.serialization.json.internal; import kotlinx.serialization.InternalSerializationApi @InternalSerializationApi -public actual typealias FormatLanguage = org.intellij.lang.annotations.Language
\ No newline at end of file +public actual annotation class FormatLanguage( + public actual val value: String, + // default parameters are not used due to https://youtrack.jetbrains.com/issue/KT-25946/ + public actual val prefix: String, + public actual val suffix: String, +)
\ No newline at end of file |