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

json-okio: rename target variables to sink #2226

Merged
merged 1 commit into from
Mar 27, 2023

Conversation

BenWoodworth
Copy link
Contributor

The Okio codebase names Sink/BufferedSink variables "sink", so this aligns the naming convention

okio-sink

The Okio codebase names Sink/BufferedSink variables "sink", so this aligns the naming convention
@shanshin
Copy link
Contributor

Thanks!

@shanshin shanshin merged commit 2b77da3 into Kotlin:dev Mar 27, 2023
@BenWoodworth BenWoodworth deleted the json-okio-sink-rename branch March 27, 2023 14:19
xBaank pushed a commit to xBaank/kotlinx.serialization that referenced this pull request Apr 20, 2023
The Okio codebase names Sink/BufferedSink variables "sink", so this aligns the naming convention
xBaank added a commit to xBaank/kotlinx.serialization that referenced this pull request Apr 20, 2023
xBaank added a commit to xBaank/kotlinx.serialization that referenced this pull request Apr 20, 2023
* Revert "Adapt tests for K2 and upcoming deprecations in K1 (Kotlin#2230)"

This reverts commit f9229ef.

* Revert "Fix value class encoding in various corner cases (Kotlin#2242)"

This reverts commit 3cec2f7.

* Revert "Improved docs for JsonContentPolymorphicSerializer (Kotlin#2189)"

This reverts commit 3555872.

* Revert "Fix incorrect json decoding iterator's .hasNext() behavior on array-wrapped inputs: (Kotlin#2268)"

This reverts commit 2864aea.

* Revert "Fix memory leak caused by invalid KTypeWrapper's equals method (Kotlin#2274)"

This reverts commit 836f2bd.

* Revert "Replace deprecated ThreadLocal with kotlin.native.concurrent.ThreadLocal (Kotlin#2266)"

This reverts commit d73f6e3.

* Revert "Get rid of deprecated toChar() in JS-specific code (Kotlin#2252)"

This reverts commit 3686362.

* Revert "Rename json-okio `target` variables to `sink` (Kotlin#2226)"

This reverts commit a978cf0.

* Revert "Replace `runCatching-map-getOrDefault` in caching (Kotlin#2248)"

This reverts commit da91066.

* Revert "Configure project settings for Intellij IDEA (Kotlin#2217)"

This reverts commit d519d45.

* Revert "Updated K/N targets in accordance with official recommendations (Kotlin#2216)"

This reverts commit fe63ced.
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.

2 participants