From 517b9d9625633a5f6e7582326738f3cec3a8cb7b Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@vmware.com>
Date: Wed, 4 May 2022 13:19:37 -0400
Subject: [PATCH] Upgrade Kotlin to 1.6.21 and use jvmTarget=17

---
 build.gradle | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 19d897b806..0cc60a36f4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlinVersion = '1.6.10'
+    ext.kotlinVersion = '1.6.21'
     ext.isCI = System.getenv('GITHUB_ACTION') || System.getenv('bamboo_buildKey')
     repositories {
         mavenCentral()
@@ -196,8 +196,7 @@ configure(javaProjects) { subproject ->
     }
 
     compileJava {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        options.release = 17
     }
 
     compileTestJava {
@@ -210,15 +209,15 @@ configure(javaProjects) { subproject ->
         kotlinOptions {
             languageVersion = '1.6'
             apiVersion = '1.6'
-            jvmTarget = '16'
-            freeCompilerArgs = ['-Xjsr305=strict', '-Xsuppress-version-warnings', '-Xopt-in=kotlin.RequiresOptIn']
+            jvmTarget = '17'
+            freeCompilerArgs = ['-Xjsr305=strict', '-Xsuppress-version-warnings', '-opt-in=kotlin.RequiresOptIn']
             allWarningsAsErrors = true
         }
     }
 
     compileTestKotlin {
         kotlinOptions {
-            jvmTarget = '16'
+            jvmTarget = '17'
             freeCompilerArgs = ['-Xjsr305=strict']
         }
     }