Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ktype overrides #77

Merged
merged 3 commits into from
Jun 6, 2024
Merged

Fix ktype overrides #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
143f637
Fix ktype overrides
ZacSweers Jun 6, 2024
c14ea26
Spotless
ZacSweers Jun 6, 2024
cc83d7b
Update comment
ZacSweers Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ jobs:
uses: gradle/actions/setup-gradle@v3

- name: Test
run: ./gradlew check
run: |
# Run compileCommonMainKotlinMetadata to ensure metadata compilation works too, as it's
# not covered under the normal check command
./gradlew check compileCommonMainKotlinMetadata

- name: Publish (default branch only)
if: github.repository == 'slackhq/EitherNet' && github.ref == 'refs/heads/main'
Expand Down
7 changes: 6 additions & 1 deletion eithernet/src/commonMain/kotlin/com/slack/eithernet/KTypes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,12 @@ internal expect class KTypeImpl(
arguments: List<KTypeProjection>,
isMarkedNullable: Boolean,
annotations: List<Annotation>,
) : KType, EitherNetKType
) : KType, EitherNetKType {
override val classifier: KClassifier?
override val arguments: List<KTypeProjection>
override val isMarkedNullable: Boolean
override val annotations: List<Annotation>
}

@InternalEitherNetApi
public fun KType.canonicalize(): KType {
Expand Down
8 changes: 4 additions & 4 deletions eithernet/src/jsMain/kotlin/com/slack/eithernet/platform.js.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ internal actual val KClass<*>.qualifiedNameForComparison: String?

internal actual class KTypeImpl
actual constructor(
override val classifier: KClassifier?,
override val arguments: List<KTypeProjection>,
override val isMarkedNullable: Boolean,
override val annotations: List<Annotation>,
actual override val classifier: KClassifier?,
actual override val arguments: List<KTypeProjection>,
actual override val isMarkedNullable: Boolean,
actual override val annotations: List<Annotation>,
) : KType, EitherNetKType {
private val impl = EitherNetKTypeImpl(classifier, arguments, isMarkedNullable, annotations)

Expand Down
8 changes: 4 additions & 4 deletions eithernet/src/jvmMain/kotlin/com/slack/eithernet/platform.jvm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ internal actual val KClass<*>.qualifiedNameForComparison: String?

internal actual class KTypeImpl
actual constructor(
override val classifier: KClassifier?,
override val arguments: List<KTypeProjection>,
override val isMarkedNullable: Boolean,
override val annotations: List<Annotation>,
actual override val classifier: KClassifier?,
actual override val arguments: List<KTypeProjection>,
actual override val isMarkedNullable: Boolean,
actual override val annotations: List<Annotation>,
) : KType, EitherNetKType {
private val impl = EitherNetKTypeImpl(classifier, arguments, isMarkedNullable, annotations)

Expand Down
8 changes: 4 additions & 4 deletions eithernet/src/nativeMain/kotlin/com/slack/eithernet/platform.native.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ internal actual val KClass<*>.qualifiedNameForComparison: String?

internal actual class KTypeImpl
actual constructor(
override val classifier: KClassifier?,
override val arguments: List<KTypeProjection>,
override val isMarkedNullable: Boolean,
override val annotations: List<Annotation>,
actual override val classifier: KClassifier?,
actual override val arguments: List<KTypeProjection>,
actual override val isMarkedNullable: Boolean,
actual override val annotations: List<Annotation>,
) : KType, EitherNetKType {
private val impl = EitherNetKTypeImpl(classifier, arguments, isMarkedNullable, annotations)

Expand Down
8 changes: 4 additions & 4 deletions eithernet/src/wasmJsMain/kotlin/com/slack/eithernet/platform.wasmJs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ internal actual val KClass<*>.qualifiedNameForComparison: String?

internal actual class KTypeImpl
actual constructor(
override val classifier: KClassifier?,
override val arguments: List<KTypeProjection>,
override val isMarkedNullable: Boolean,
override val annotations: List<Annotation>,
actual override val classifier: KClassifier?,
actual override val arguments: List<KTypeProjection>,
actual override val isMarkedNullable: Boolean,
actual override val annotations: List<Annotation>,
) : KType, EitherNetKType {
private val impl = EitherNetKTypeImpl(classifier, arguments, isMarkedNullable, annotations)

Expand Down