From 289f4bbc9384327cb9671838817d88dacdae548f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nivaldo=20Bondan=C3=A7a?= <nbondanca@meta.com>
Date: Mon, 18 Sep 2023 07:41:56 -0700
Subject: [PATCH] Bump Kotlin version to 1.8.22

Summary: This also required a bump on the Gradle version to 6.8.3, instead I just took the latest.

Reviewed By: natestedman

Differential Revision: D49326207

fbshipit-source-id: a4dcd301b7c5aac43cb75422c542b770928cd8fd
---
 core/pom.xml                                              | 2 +-
 online_formatter/build.gradle.kts                         | 8 +++-----
 online_formatter/gradle/wrapper/gradle-wrapper.properties | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 8ef784c6..1511db23 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -16,7 +16,7 @@
 
     <properties>
         <dokka.version>0.10.1</dokka.version>
-        <kotlin.version>1.6.20-M1</kotlin.version>
+        <kotlin.version>1.8.22</kotlin.version>
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
         <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
         <main.class>com.facebook.ktfmt.cli.Main</main.class>
diff --git a/online_formatter/build.gradle.kts b/online_formatter/build.gradle.kts
index 140c3384..60d07a40 100644
--- a/online_formatter/build.gradle.kts
+++ b/online_formatter/build.gradle.kts
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-plugins { kotlin("jvm") version "1.5.0" }
+plugins { kotlin("jvm") version "1.8.22" }
 
 repositories {
   mavenLocal()
@@ -35,11 +33,11 @@ dependencies {
   testImplementation(kotlin("test-junit"))
 }
 
+kotlin { jvmToolchain(11) }
+
 tasks {
   test { useJUnit() }
 
-  withType<KotlinCompile>() { kotlinOptions.jvmTarget = "11" }
-
   val packageFat by
       creating(Zip::class) {
         from(compileKotlin)
diff --git a/online_formatter/gradle/wrapper/gradle-wrapper.properties b/online_formatter/gradle/wrapper/gradle-wrapper.properties
index be52383e..db9a6b82 100644
--- a/online_formatter/gradle/wrapper/gradle-wrapper.properties
+++ b/online_formatter/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists