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

Jump to bottom

KTOR-6447 Update Kotlin to 1.9.20 #3817

Merged
merged 2 commits into from
Nov 10, 2023
Merged

KTOR-6447 Update Kotlin to 1.9.20 #3817

merged 2 commits into from
Nov 10, 2023

Conversation

e5l
Copy link
Member

@e5l e5l commented Nov 8, 2023

Fix KTOR-6447

@e5l e5l requested a review from rsinukov November 8, 2023 09:57
@e5l e5l self-assigned this Nov 8, 2023
rsinukov
rsinukov suggested changes Nov 8, 2023
View reviewed changes
build.gradle.kts Show resolved Hide resolved
gradle.properties Outdated
@@ -4,7 +4,7 @@

# ktor
# Makes Ktor import and resolve
ktor.ide.jvmAndCommonOnly=true
ktor.ide.jvmAndCommonOnly=false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it intended?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nope, will revert

gradle.properties Outdated
@@ -17,6 +17,7 @@ org.gradle.daemon=true
org.gradle.caching=true
org.gradle.vfs.watch=true
org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC
# org.gradle.configuration-cache=true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is it commented?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks, will drop, it's not compatible anyway

ktor-network/nix/src/io/ktor/network/sockets/SocketAddressNative.kt
@@ -2,11 +2,50 @@ package io.ktor.network.sockets

public actual sealed class SocketAddress

public actual data class InetSocketAddress actual constructor(
public actual class InetSocketAddress actual constructor(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should you add equals and hashcode implementations?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, will add

ktor-network/nix/src/io/ktor/network/sockets/SocketAddressNative.kt
}
}

public actual class UnixSocketAddress actual constructor(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

@e5l e5l requested a review from rsinukov November 9, 2023 12:11
@e5l e5l merged commit ce44013 into main Nov 10, 2023
10 of 16 checks passed
@e5l e5l deleted the e5l/kotlin-1.9.20 branch November 10, 2023 08:54
marychatte pushed a commit that referenced this pull request Nov 10, 2023
@e5l @marychatte
KTOR-6447 Update Kotlin to 1.9.20 (#3817)
ca7b230 
* KTOR-6447 Update Kotlin to 1.9.20
@IgnatBeresnev
Copy link
Contributor

Since Dokka was updated to 1.9.10, JFYI this workaround is no longer needed and can be removed

ktor/gradle.properties

Lines 37 to 39 in b4a2f07

# dokka
# workaround for resolving platform dependencies, see https://github.com/Kotlin/dokka/issues/3153
org.jetbrains.dokka.classpath.useNativeDistributionAccessor=true

cc @rsinukov @e5l

@e5l
Copy link
Member Author

e5l commented Nov 24, 2023

Thanks, will update.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rsinukov rsinukov rsinukov approved these changes

Assignees

@e5l e5l

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@e5l @IgnatBeresnev @rsinukov