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
4
4
import kotlinx.validation.build.signPublicationIfKeyPresent
5
5
import org.gradle.api.attributes.TestSuiteType.FUNCTIONAL_TEST
6
6
import org.jetbrains.dokka.gradle.DokkaTask
7
- import org.jetbrains.dokka.gradle.DokkaTaskPartial
8
7
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
9
8
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
10
9
import java.net.URL
@@ -101,9 +100,10 @@ tasks.compileKotlin {
101
100
java {
102
101
withJavadocJar()
103
102
withSourcesJar()
104
- toolchain {
105
- languageVersion.set(JavaLanguageVersion .of(8 ))
106
- }
103
+ }
104
+
105
+ kotlin {
106
+ jvmToolchain(8 )
107
107
}
108
108
109
109
tasks.compileTestKotlin {
Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2016-2020 JetBrains s.r.o.
2
+ * Copyright 2016-2024 JetBrains s.r.o.
3
3
* Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
4
4
*/
5
5
6
- import java.util.Properties
7
6
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
8
7
9
8
plugins {
10
9
`kotlin- dsl`
11
10
}
12
11
12
+ kotlin {
13
+ jvmToolchain(8 )
14
+ }
15
+
13
16
dependencies {
14
17
implementation(libs.gradlePlugin.kotlin)
15
18
implementation(libs.gradlePlugin.pluginPublishing)
Original file line number Diff line number Diff line change @@ -13,6 +13,10 @@ pluginManagement {
13
13
}
14
14
}
15
15
16
+ plugins {
17
+ id(" org.gradle.toolchains.foojay-resolver-convention" )
18
+ }
19
+
16
20
@Suppress(" UnstableApiUsage" )
17
21
dependencyResolutionManagement {
18
22
Original file line number Diff line number Diff line change @@ -10,9 +10,6 @@ plugins {
10
10
}
11
11
12
12
java {
13
- toolchain {
14
- languageVersion.set(JavaLanguageVersion .of(8 ))
15
- }
16
13
withSourcesJar()
17
14
withJavadocJar()
18
15
}
Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2016-2023 JetBrains s.r.o.
2
+ * Copyright 2016-2024 JetBrains s.r.o.
3
3
* Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
4
4
*/
5
5
import org.gradle.api.initialization.resolve.RepositoriesMode.PREFER_SETTINGS
@@ -14,6 +14,10 @@ pluginManagement {
14
14
}
15
15
}
16
16
17
+ plugins {
18
+ id(" org.gradle.toolchains.foojay-resolver-convention" ) version (" 0.8.0" )
19
+ }
20
+
17
21
@Suppress(" UnstableApiUsage" )
18
22
dependencyResolutionManagement {
19
23
You can’t perform that action at this time.
0 commit comments