Merge reactor#2795 into 3.4.11

congtong · Oct 1, 2021 · 608ca46 · 608ca46
2 parents aaadad6 + 15b9825
commit 608ca46
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -256,12 +256,20 @@ configure(subprojects) { p ->
 		if (p.plugins.hasPlugin("kotlin")) {
 			println "Applying Kotlin conventions to ${p.name}"
 			compileKotlin {
-				kotlinOptions.jvmTarget = "1.8"
-				kotlinOptions.freeCompilerArgs = ["-Xjsr305=strict"]
+				kotlinOptions {
+					jvmTarget = "1.8"
+					freeCompilerArgs = ["-Xjsr305=strict"]
+					languageVersion = "1.3" //TODO kotlin languageVersion 1.3 is now deprecated
+					apiVersion = "1.3"
+				}
 			}
 			compileTestKotlin {
-				kotlinOptions.jvmTarget = "1.8"
-				kotlinOptions.freeCompilerArgs = ["-Xjsr305=strict"]
+				kotlinOptions {
+					jvmTarget = "1.8"
+					freeCompilerArgs = ["-Xjsr305=strict"]
+					languageVersion = "1.3" //TODO kotlin languageVersion 1.3 is now deprecated
+					apiVersion = "1.3"
+				}
 			}
 		}
 	}