File tree Expand file tree Collapse file tree 5 files changed +18
-10
lines changed
libraries/tools/abi-validation
src/main/kotlin/conventions Expand file tree Collapse file tree 5 files changed +18
-10
lines changed Original file line number Diff line number Diff line change @@ -4,7 +4,6 @@ import kotlinx.validation.build.mavenRepositoryPublishing
44import kotlinx.validation.build.signPublicationIfKeyPresent
55import org.gradle.api.attributes.TestSuiteType.FUNCTIONAL_TEST
66import org.jetbrains.dokka.gradle.DokkaTask
7- import org.jetbrains.dokka.gradle.DokkaTaskPartial
87import org.jetbrains.kotlin.gradle.dsl.JvmTarget
98import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
109import java.net.URL
@@ -101,9 +100,10 @@ tasks.compileKotlin {
101100java {
102101 withJavadocJar()
103102 withSourcesJar()
104- toolchain {
105- languageVersion.set(JavaLanguageVersion .of(8 ))
106- }
103+ }
104+
105+ kotlin {
106+ jvmToolchain(8 )
107107}
108108
109109tasks.compileTestKotlin {
Original file line number Diff line number Diff line change 11/*
2- * Copyright 2016-2020 JetBrains s.r.o.
2+ * Copyright 2016-2024 JetBrains s.r.o.
33 * Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
44 */
55
6- import java.util.Properties
76import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
87
98plugins {
109 `kotlin- dsl`
1110}
1211
12+ kotlin {
13+ jvmToolchain(8 )
14+ }
15+
1316dependencies {
1417 implementation(libs.gradlePlugin.kotlin)
1518 implementation(libs.gradlePlugin.pluginPublishing)
Original file line number Diff line number Diff line change @@ -13,6 +13,10 @@ pluginManagement {
1313 }
1414}
1515
16+ plugins {
17+ id(" org.gradle.toolchains.foojay-resolver-convention" )
18+ }
19+
1620@Suppress(" UnstableApiUsage" )
1721dependencyResolutionManagement {
1822
Original file line number Diff line number Diff line change @@ -10,9 +10,6 @@ plugins {
1010}
1111
1212java {
13- toolchain {
14- languageVersion.set(JavaLanguageVersion .of(8 ))
15- }
1613 withSourcesJar()
1714 withJavadocJar()
1815}
Original file line number Diff line number Diff line change 11/*
2- * Copyright 2016-2023 JetBrains s.r.o.
2+ * Copyright 2016-2024 JetBrains s.r.o.
33 * Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
44 */
55import org.gradle.api.initialization.resolve.RepositoriesMode.PREFER_SETTINGS
@@ -14,6 +14,10 @@ pluginManagement {
1414 }
1515}
1616
17+ plugins {
18+ id(" org.gradle.toolchains.foojay-resolver-convention" ) version (" 0.8.0" )
19+ }
20+
1721@Suppress(" UnstableApiUsage" )
1822dependencyResolutionManagement {
1923
You can’t perform that action at this time.
0 commit comments