Skip to content

Commit

Permalink
Bump Kotlin version to 1.8.22
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Nivaldo Bondança authored and facebook-github-bot committed Sep 18, 2023
1 parent 699a2ec commit 289f4bb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 3 additions & 5 deletions online_formatter/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion online_formatter/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 289f4bb

Please sign in to comment.