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.

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

KTOR-3248 Build Ktor on Apple Silicon #2664

Merged
merged 1 commit into from Nov 30, 2021
Merged

Conversation

hfhbd
Copy link
Contributor

@hfhbd hfhbd commented Oct 25, 2021

Subsystem
Infrastructure

Motivation
It is not possible to build Ktor on Apple Silicon Mac.
https://youtrack.jetbrains.com/issue/KTOR-3248

Solution
Adopt Gradle targets

@hfhbd hfhbd marked this pull request as draft October 25, 2021 23:02
@hfhbd
Copy link
Contributor Author

hfhbd commented Oct 25, 2021

Coroutines debug JUnit timeout rule does not work due to wrong architecture: Kotlin/kotlinx.coroutines#3001, and is fixed with coroutines 1.6.0. Until release, workaround is included.

@hfhbd hfhbd marked this pull request as ready for review October 26, 2021 08:55
@e5l e5l self-requested a review November 18, 2021 12:57
@hfhbd hfhbd force-pushed the hfhbd/KTOR-3248 branch 3 times, most recently from 3f0c5a6 to ca9ccf8 Compare November 18, 2021 16:08
Copy link
Member

@e5l e5l left a comment

Choose a reason for hiding this comment

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

Hey @hfhbd, thanks for the PR. LGTM
Will be merged after CI run

@hfhbd
Copy link
Contributor Author

hfhbd commented Nov 23, 2021

@e5l Just keep in mind, after coroutines 1.6.0 release you could remove these blocks:

// https://github.com/Kotlin/kotlinx.coroutines/issues/3001
val jna_version = "5.9.0"
api("net.java.dev.jna:jna:$jna_version")
api("net.java.dev.jna:jna-platform:$jna_version")

@e5l
Copy link
Member

e5l commented Nov 23, 2021

@hfhbd, could you check the build?

@hfhbd
Copy link
Contributor Author

hfhbd commented Nov 23, 2021

@e5l I already did. Reading only the log is not very helpful: cinteropLibcurlMacosX64 failed with exit code 1, wow...

@e5l e5l merged commit c6fbcff into ktorio:main Nov 30, 2021
@e5l
Copy link
Member

e5l commented Nov 30, 2021

lgtm, merged

@hfhbd hfhbd deleted the hfhbd/KTOR-3248 branch December 10, 2021 10:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants