File tree Expand file tree Collapse file tree 6 files changed +42
-33
lines changed
io/spring/gradle/convention Expand file tree Collapse file tree 6 files changed +42
-33
lines changed Original file line number Diff line number Diff line change @@ -48,37 +48,6 @@ springRelease {
4848 replaceSnapshotVersionInReferenceDocUrl = true
4949}
5050
51- def toolchainVersion () {
52- if (project. hasProperty(' testToolchain' )) {
53- return project. property(' testToolchain' ). toString(). toInteger()
54- }
55- return 25
56- }
57-
58- subprojects {
59- java {
60- toolchain {
61- languageVersion = JavaLanguageVersion . of(toolchainVersion())
62- }
63- }
64- kotlin {
65- jvmToolchain {
66- languageVersion = JavaLanguageVersion . of(toolchainVersion())
67- }
68- }
69- tasks. withType(JavaCompile ). configureEach {
70- options. encoding = " UTF-8"
71- options. compilerArgs. add(" -parameters" )
72- options. release. set(17 )
73- }
74- tasks. withType(KotlinCompile ). configureEach {
75- compilerOptions {
76- javaParameters = true
77- jvmTarget. set(JvmTarget . JVM_17 )
78- }
79- }
80- }
81-
8251allprojects {
8352 if (! [' spring-security-bom' , ' spring-security-docs' ]. contains(project. name)) {
8453 apply plugin : ' io.spring.javaformat'
Original file line number Diff line number Diff line change @@ -35,6 +35,7 @@ class SpringModulePlugin extends AbstractSpringJavaPlugin {
3535 pluginManager. apply(SpringMavenPlugin . class);
3636 pluginManager. apply(CheckClasspathForProhibitedDependenciesPlugin . class);
3737 pluginManager. apply(" io.spring.convention.jacoco" );
38+ pluginManager. apply(" java-toolchain" );
3839
3940 def deployArtifacts = project. task(" deployArtifacts" )
4041 deployArtifacts. group = ' Deploy tasks'
Original file line number Diff line number Diff line change 1+ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
3+
4+ def toolchainVersion () {
5+ if (project. hasProperty(' testToolchain' )) {
6+ return project. property(' testToolchain' ). toString(). toInteger()
7+ }
8+ return 25
9+ }
10+
11+ java {
12+ toolchain {
13+ languageVersion = JavaLanguageVersion . of(toolchainVersion())
14+ }
15+ }
16+
17+ tasks. withType(JavaCompile ). configureEach {
18+ options. encoding = " UTF-8"
19+ options. compilerArgs. add(" -parameters" )
20+ options. release = 17
21+ }
22+
23+ pluginManager. withPlugin(" org.jetbrains.kotlin.jvm" ) {
24+ kotlin {
25+ jvmToolchain {
26+ languageVersion = JavaLanguageVersion . of(toolchainVersion())
27+ }
28+ }
29+
30+ tasks. withType(KotlinCompile ). configureEach {
31+ compilerOptions {
32+ javaParameters = true
33+ jvmTarget. set(JvmTarget . JVM_17 )
34+ }
35+ }
36+ }
Original file line number Diff line number Diff line change @@ -3,6 +3,8 @@ plugins {
33 id ' io.spring.antora.generate-antora-yml' version ' 0.0.1'
44 id ' io.spring.convention.repository'
55 id ' security-kotlin'
6+ id ' java-toolchain'
7+ id ' test-compile-target-jdk25'
68}
79
810apply plugin : ' io.spring.convention.docs'
Original file line number Diff line number Diff line change 11apply plugin : ' io.spring.convention.spring-test'
2+ apply plugin : ' java-toolchain'
3+ apply plugin : ' test-compile-target-jdk25'
24
35dependencies {
46 implementation platform(project(" :spring-security-dependencies" ))
Original file line number Diff line number Diff line change 11plugins {
2+ id ' io.spring.convention.spring-module'
23 id ' security-nullability'
34 id ' javadoc-warnings-error'
45 id ' test-compile-target-jdk25'
56}
67
7- apply plugin : ' io.spring.convention.spring-module'
8-
98configurations {
109 javascript {
1110 canBeConsumed = false
You can’t perform that action at this time.
0 commit comments