To Kotlin 1.7.0
This commit is contained in:
parent
eed0f274c7
commit
90880fc10f
@ -1,6 +1,7 @@
|
|||||||
plugins {
|
plugins {
|
||||||
alias(libs.plugins.changelog)
|
alias(libs.plugins.changelog)
|
||||||
alias(libs.plugins.dokka)
|
alias(libs.plugins.dokka)
|
||||||
|
alias(libs.plugins.kotlin.jvm)
|
||||||
`java-gradle-plugin`
|
`java-gradle-plugin`
|
||||||
`kotlin-dsl`
|
`kotlin-dsl`
|
||||||
`maven-publish`
|
`maven-publish`
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[versions]
|
[versions]
|
||||||
tools = "0.11.5-kotlin-1.6.21"
|
tools = "0.11.5-kotlin-1.7.0"
|
||||||
kotlin = "1.6.21"
|
kotlin = "1.7.0"
|
||||||
atomicfu = "0.17.2"
|
atomicfu = "0.17.2"
|
||||||
binary-compatibility-validator = "0.9.0"
|
binary-compatibility-validator = "0.9.0"
|
||||||
changelog = "1.3.1"
|
changelog = "1.3.1"
|
||||||
|
@ -5,6 +5,6 @@ import org.gradle.api.Project
|
|||||||
|
|
||||||
public open class KScienceCommonPlugin : Plugin<Project> {
|
public open class KScienceCommonPlugin : Plugin<Project> {
|
||||||
override fun apply(project: Project): Unit = project.configureKScience(
|
override fun apply(project: Project): Unit = project.configureKScience(
|
||||||
KotlinVersion(1, 6, 21)
|
KotlinVersion(1, 7, 0)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -7,9 +7,9 @@ import org.gradle.api.tasks.testing.Test
|
|||||||
import org.gradle.kotlin.dsl.*
|
import org.gradle.kotlin.dsl.*
|
||||||
import org.jetbrains.dokka.gradle.DokkaPlugin
|
import org.jetbrains.dokka.gradle.DokkaPlugin
|
||||||
import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
|
import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
|
||||||
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
|
|
||||||
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
|
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
|
||||||
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
|
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
|
||||||
|
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||||
import ru.mipt.npm.gradle.internal.applyRepos
|
import ru.mipt.npm.gradle.internal.applyRepos
|
||||||
import ru.mipt.npm.gradle.internal.applySettings
|
import ru.mipt.npm.gradle.internal.applySettings
|
||||||
import ru.mipt.npm.gradle.internal.fromJsDependencies
|
import ru.mipt.npm.gradle.internal.fromJsDependencies
|
||||||
@ -42,7 +42,7 @@ public fun Project.configureKScience(
|
|||||||
|
|
||||||
if (explicitApi == null) explicitApiWarning()
|
if (explicitApi == null) explicitApiWarning()
|
||||||
}
|
}
|
||||||
tasks.withType<KotlinJvmCompile> {
|
tasks.withType<KotlinCompile> {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = KScienceVersions.JVM_TARGET.toString()
|
jvmTarget = KScienceVersions.JVM_TARGET.toString()
|
||||||
freeCompilerArgs = freeCompilerArgs + defaultJvmArgs
|
freeCompilerArgs = freeCompilerArgs + defaultJvmArgs
|
||||||
|
Loading…
Reference in New Issue
Block a user