From e3ecfb54c976791c72682cbde908a31353e79748 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 15 May 2022 12:59:49 +0300
Subject: [PATCH] Remove context receivers by default.

---
 CHANGELOG.md                                  |  5 ++-
 gradle/libs.versions.toml                     | 31 +++++++++----------
 .../mipt/npm/gradle/KScienceCommonPlugin.kt   |  2 +-
 .../mipt/npm/gradle/commonConfigurations.kt   |  2 +-
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 045a7b4..c7aab19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,9 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Separate release tasks for each target
-- Kotlin 1.6.20
-- Context receivers enabled
-- Ktor 2.0
+- Kotlin 1.7.0
+- Ktor 2.0.1
 - ExplicitAPI does not override existing value
 
 ### Deprecated
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 43b2c04..e457841 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,24 +1,23 @@
 [versions]
-tools = "0.11.4-kotlin-1.6.20"
-kotlin = "1.6.20"
-atomicfu = "0.17.1"
-binary-compatibility-validator = "0.8.0"
+tools = "0.11.5-kotlin-1.6.21"
+kotlin = "1.6.21"
+atomicfu = "0.17.2"
+binary-compatibility-validator = "0.9.0"
 changelog = "1.3.1"
-dokka = "1.6.10"
-kotlin-jupyter = "0.11.0-71"
+dokka = "1.6.21"
+kotlin-jupyter = "0.11.0-89-1"
 kotlinx-benchmark = "0.4.2"
 kotlinx-cli = "0.3.4"
-kotlinx-collections-immutable = "0.3.5"
 kotlinx-coroutines = "1.6.1"
-kotlinx-datetime = "0.3.2"
-kotlinx-html = "0.7.3"
-kotlinx-knit = "0.3.0"
+kotlinx-datetime = "0.3.3"
+kotlinx-html = "0.7.5"
+kotlinx-knit = "0.4.0"
 kotlinx-nodejs = "0.0.7"
-kotlinx-serialization = "1.3.2"
-ktor = "2.0.0"
-xmlutil = "0.84.1"
-yamlkt = "0.10.2"
-jsBom = "0.0.1-pre.313-kotlin-1.6.10"
+kotlinx-serialization = "1.3.3"
+ktor = "2.0.1"
+xmlutil = "0.84.2"
+yamlkt = "0.11.0"
+jsBom = "1.0.0-pre.337"
 junit = "5.8.2"
 
 [libraries]
@@ -38,8 +37,6 @@ kotlin-jupyter-gradle = { module = "org.jetbrains.kotlin:kotlin-jupyter-api-grad
 
 kotlinx-benchmark-runtime = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "kotlinx-benchmark" }
 
-kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinx-collections-immutable" }
-
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-debug = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-debug", version.ref = "kotlinx-coroutines" }
diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt
index de3f16c..5eaf4d5 100644
--- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt
+++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt
@@ -5,6 +5,6 @@ import org.gradle.api.Project
 
 public open class KScienceCommonPlugin : Plugin<Project> {
     override fun apply(project: Project): Unit = project.configureKScience(
-        KotlinVersion(1, 6, 20)
+        KotlinVersion(1, 6, 21)
     )
 }
diff --git a/src/main/kotlin/ru/mipt/npm/gradle/commonConfigurations.kt b/src/main/kotlin/ru/mipt/npm/gradle/commonConfigurations.kt
index f8a33e4..c7fcda8 100644
--- a/src/main/kotlin/ru/mipt/npm/gradle/commonConfigurations.kt
+++ b/src/main/kotlin/ru/mipt/npm/gradle/commonConfigurations.kt
@@ -15,7 +15,7 @@ import ru.mipt.npm.gradle.internal.applySettings
 import ru.mipt.npm.gradle.internal.fromJsDependencies
 
 
-private val defaultJvmArgs: List<String> = listOf("-Xjvm-default=all", "-Xlambdas=indy", "-Xcontext-receivers")
+private val defaultJvmArgs: List<String> = listOf("-Xjvm-default=all", "-Xlambdas=indy")
 
 public fun Project.configureKScience(
     kotlinVersion: KotlinVersion,