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

0.11.5-kotlin-1.7.0 #44

Merged
altavir merged 9 commits from dev into master 2022-06-09 19:44:46 +03:00
Conversation 0 Commits 9 Files Changed 7 +6 -5
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 90880fc10f - Show all commits

1
build.gradle.kts
View File

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

4
gradle/libs.versions.toml
View File

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

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

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

4
src/main/kotlin/ru/mipt/npm/gradle/commonConfigurations.kt
View File

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