Merge pull request #31849 from dreis2211

wilkinsona · wilkinsona · commit add720594e01 · 2022-07-22T19:35:05.000+01:00
* gh-31849: Align Kotlin API and language versions Closes gh-31849
diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle
@@ -40,11 +40,6 @@ plugins.withType(EclipsePlugin) {
 	}
 }
 
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) { 
-	kotlinOptions.apiVersion = '1.6'
-	kotlinOptions.languageVersion = '1.6'
-}
-
 dependencies {
 	actuatorApiDocumentation(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure", configuration: "documentation"))
 

Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,6 @@ plugins.withType(EclipsePlugin) {`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {`
`44`		`- kotlinOptions.apiVersion = '1.6'`
`45`		`- kotlinOptions.languageVersion = '1.6'`
`46`		`-}`
`47`		`-`
`48`	`43`	`dependencies {`
`49`	`44`	`actuatorApiDocumentation(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure", configuration: "documentation"))`
`50`	`45`