User: rednesto Date: 25 Sep 22 11:38 Revision: 52338e5cdb1b4d412d2fcd71589cd259f652de18 Summary: Merge branch '2022.1' into 2022.2 TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8106&personal=false Index: build.gradle.kts =================================================================== --- build.gradle.kts (revision b6fd287525a149b335b648b120793aec04f8e0d0) +++ build.gradle.kts (revision 52338e5cdb1b4d412d2fcd71589cd259f652de18) @@ -22,7 +22,7 @@ mcdev groovy idea - id("org.jetbrains.intellij") version "1.8.0" + id("org.jetbrains.intellij") version "1.9.0" id("org.cadixdev.licenser") id("org.jlleitschuh.gradle.ktlint") version "10.3.0" } @@ -188,7 +188,9 @@ tasks.withType().configureEach { kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() - freeCompilerArgs = listOf("-Xjvm-default=all") + // K2 causes the following error: https://youtrack.jetbrains.com/issue/KT-52786 + freeCompilerArgs = listOf(/*"-Xuse-k2", */"-Xjvm-default=all", "-Xjdk-release=11") + kotlinDaemonJvmArguments.add("-Xmx1G") } }