From 97b0aa9d02e9681c85f4ebdecbe3bf57f64fe2c1 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 10 Jul 2022 10:25:52 +0300
Subject: [PATCH] 0.11.8 up versions

---
 gradle/libs.versions.toml                     | 26 +++++++++----------
 .../mipt/npm/gradle/KScienceCommonPlugin.kt   |  2 +-
 .../ru/mipt/npm/gradle/KScienceExtension.kt   | 14 ++++++++++
 .../mipt/npm/gradle/commonConfigurations.kt   |  2 +-
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c1696b2..0fb2c45 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,23 +1,23 @@
 [versions]
-tools = "0.11.7-kotlin-1.7.0"
-kotlin = "1.7.0"
-atomicfu = "0.17.3"
-binary-compatibility-validator = "0.9.0"
+tools = "0.11.8-kotlin-1.7.10"
+kotlin = "1.7.10"
+atomicfu = "0.18.2"
+binary-compatibility-validator = "0.10.1"
 changelog = "1.3.1"
-dokka = "1.6.21"
-kotlin-jupyter = "0.11.0-106"
-kotlinx-benchmark = "0.4.2"
-kotlinx-cli = "0.3.4"
-kotlinx-coroutines = "1.6.1"
-kotlinx-datetime = "0.3.3"
+dokka = "1.7.0"
+kotlin-jupyter = "0.11.0-125"
+kotlinx-benchmark = "0.4.4"
+kotlinx-cli = "0.3.5"
+kotlinx-coroutines = "1.6.3"
+kotlinx-datetime = "0.4.0"
 kotlinx-html = "0.7.5"
 kotlinx-knit = "0.4.0"
 kotlinx-nodejs = "0.0.7"
 kotlinx-serialization = "1.3.3"
-ktor = "2.0.2"
+ktor = "2.0.3"
 xmlutil = "0.84.2"
-yamlkt = "0.11.0"
-jsBom = "1.0.0-pre.343"
+yamlkt = "0.12.0"
+jsBom = "1.0.0-pre.353"
 junit = "5.8.2"
 
 [libraries]
diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt
index 0db1539..331f4e2 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, 7, 0)
+        KotlinVersion(1, 7, 10)
     )
 }
diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt
index c255d4a..9563811 100644
--- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt
+++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlinx.jupyter.api.plugin.tasks.JupyterApiResourcesTask
 import ru.mipt.npm.gradle.internal.defaultPlatform
 import ru.mipt.npm.gradle.internal.useCommonDependency
@@ -169,6 +170,19 @@ public class KScienceExtension(public val project: Project) {
             }
         }
     }
+
+    /**
+     * Add context receivers to this project and all subprojects
+     */
+    public fun withContextReceivers(){
+        project.allprojects{
+            tasks.withType<KotlinCompile>{
+                kotlinOptions{
+                    freeCompilerArgs = freeCompilerArgs + "-Xcontext-receivers"
+                }
+            }
+        }
+    }
 }
 
 internal fun Project.registerKScienceExtension() {
diff --git a/src/main/kotlin/ru/mipt/npm/gradle/commonConfigurations.kt b/src/main/kotlin/ru/mipt/npm/gradle/commonConfigurations.kt
index e05df86..7f4ac18 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")
+private val defaultJvmArgs: List<String> = listOf("-Xjvm-default=all", "-Xlambdas=indy", "-Xjdk-release=11")
 
 public fun Project.configureKScience(
     kotlinVersion: KotlinVersion,