Merge branch '1.0.x'

2022-07-20 16:12:30 +02:00
parent 788f0ef155 8ce2622d6c
commit 355f32213a
2 changed files with 3 additions and 5 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -33,8 +33,9 @@ configure(moduleProjects) {
 	apply plugin: 'org.springframework.graphql.compiler'

 	java {
-		sourceCompatibility = JavaVersion.VERSION_17
-		targetCompatibility = JavaVersion.VERSION_17
+		toolchain {
+			languageVersion = JavaLanguageVersion.of(17)
+		}
 	}

 	pluginManager.withPlugin("kotlin") {
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -9,9 +9,6 @@ repositories {
 	maven { url "https://repo.spring.io/release" }
 }

-sourceCompatibility = 17
-targetCompatibility = 17
-
 dependencies {
 	checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}"
 	implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}")