Merge SCI-MR-159: add deploy script

This commit is contained in:
Alexander Nozik 2022-07-10 08:49:01 +00:00 committed by Space
commit 0f1e42ab36
4 changed files with 29 additions and 15 deletions

View File

@ -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]

View File

@ -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)
)
}

View File

@ -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() {

View File

@ -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,