Merge branch '2022.1' into 2022.2

DenWav · DenWav · commit 5953139ac80c · 2022-10-02T22:53:21.000-05:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -44,6 +44,11 @@ java {
         languageVersion.set(JavaLanguageVersion.of(11))
     }
 }
+kotlin {
+    jvmToolchain {
+        languageVersion.set(java.toolchain.languageVersion.get())
+    }
+}
 
 val gradleToolingExtensionSourceSet: SourceSet = sourceSets.create("gradle-tooling-extension") {
     configurations.named(compileOnlyConfigurationName) {

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,11 @@ java {`
`44`	`44`	`languageVersion.set(JavaLanguageVersion.of(11))`
`45`	`45`	`}`
`46`	`46`	`}`
	`47`	`+kotlin {`
	`48`	`+ jvmToolchain {`
	`49`	`+ languageVersion.set(java.toolchain.languageVersion.get())`
	`50`	`+ }`
	`51`	`+}`
`47`	`52`
`48`	`53`	`val gradleToolingExtensionSourceSet: SourceSet = sourceSets.create("gradle-tooling-extension") {`
`49`	`54`	`configurations.named(compileOnlyConfigurationName) {`