kscience/gradle-tools
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 9 Wiki Activity

0.10.7 with kotlin 1.6 and indy lambdas

Browse Source
This commit is contained in:
Alexander Nozik 2021-11-16 12:19:03 +03:00
parent 5b88c2c5ad
commit b5270617fc
5 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- html builders for readme
### Changed
- Kotlin 1.6.0
- Use indy lambdas by default #32
### Deprecated

1
build.gradle.kts
View File

@ -96,6 +96,7 @@ gradlePlugin {
//publishing version catalog
@Suppress("UnstableApiUsage")
catalog.versionCatalog {
from(files("gradle/libs.versions.toml"))
}

19
gradle/libs.versions.toml
View File

@ -1,11 +1,11 @@
[versions]
tools = "0.10.6"
kotlin = "1.6.0-RC2"
atomicfu = "0.16.2"
binary-compatibility-validator = "0.7.1"
changelog = "1.3.0"
dokka = "1.5.0"
kotlin-jupyter = "0.10.3-31"
tools = "0.10.7"
kotlin = "1.6.0"
atomicfu = "0.16.3"
binary-compatibility-validator = "0.8.0"
changelog = "1.3.1"
dokka = "1.5.30"
kotlin-jupyter = "0.10.3-36"
kotlinx-benchmark = "0.3.1"
kotlinx-cli = "0.3.3"
kotlinx-collections-immutable = "0.3.4"
@ -14,11 +14,12 @@ kotlinx-datetime = "0.3.1"
kotlinx-html = "0.7.3"
kotlinx-knit = "0.2.3"
kotlinx-nodejs = "0.0.7"
kotlinx-serialization = "1.3.0"
kotlinx-serialization = "1.3.1"
ktor = "1.6.3"
xmlutil = "0.83.0"
yamlkt = "0.10.2"
jsBom = "0.0.1-pre.263-kotlin-1.5.31"
jsBom = "0.0.1-pre.265-kotlin-1.5.31"
junit = "5.8.1"
[libraries]
atomicfu-gradle = { module = "org.jetbrains.kotlinx:atomicfu-gradle-plugin", version.ref = "atomicfu" }

13
src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt
View File

@ -17,6 +17,11 @@ import ru.mipt.npm.gradle.internal.fromJsDependencies
@Suppress("UNUSED_VARIABLE")
public open class KScienceCommonPlugin : Plugin<Project> {
public companion object{
public val defaultJvmArgs: List<String> = listOf("-Xjvm-default=all","-Xlambdas=indy")
}
override fun apply(project: Project): Unit = project.run {
//Common configuration
registerKScienceExtension()
@ -35,14 +40,14 @@ public open class KScienceCommonPlugin : Plugin<Project> {
sourceSets["test"].apply {
dependencies {
implementation(kotlin("test-junit5"))
implementation("org.junit.jupiter:junit-jupiter:5.6.1")
implementation("org.junit.jupiter:junit-jupiter:${KScienceVersions.junit}")
}
}
}
tasks.withType<KotlinJvmCompile> {
kotlinOptions {
jvmTarget = KScienceVersions.JVM_TARGET.toString()
freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all"
freeCompilerArgs = freeCompilerArgs + defaultJvmArgs
}
}
@ -99,7 +104,7 @@ public open class KScienceCommonPlugin : Plugin<Project> {
compilations.all {
kotlinOptions {
jvmTarget = KScienceVersions.JVM_TARGET.toString()
freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all"
freeCompilerArgs = freeCompilerArgs + defaultJvmArgs
}
}
}
@ -128,7 +133,7 @@ public open class KScienceCommonPlugin : Plugin<Project> {
val jvmTest by getting {
dependencies {
implementation(kotlin("test-junit5"))
implementation("org.junit.jupiter:junit-jupiter:5.7.2")
implementation("org.junit.jupiter:junit-jupiter:${KScienceVersions.junit}")
}
}
val jsMain by getting

1
src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt
View File

@ -22,6 +22,7 @@ public object KScienceVersions {
public val htmlVersion: String get() = toml.getString("versions.kotlinx-html")!!
public val dateTimeVersion: String get() = toml.getString("versions.kotlinx-datetime")!!
public val jsBom: String get() = toml.getString("versions.jsBom")!!
internal val junit: String get() = toml.getString("versions.junit")!!
public val JVM_TARGET: JavaVersion = JavaVersion.VERSION_11