User: rednesto
Date: 25 Sep 22 12:22
Revision: 20975ac0cfc216dd85ab67b41e5a8b1efb65b74c
Summary:
Merge branch '2022.2' into 2022.3

# Conflicts:
#	build.gradle.kts


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8107&personal=false

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision 0b4be1f421fea06588a6f184e184cffa13352e68)
+++ build.gradle.kts	(revision 20975ac0cfc216dd85ab67b41e5a8b1efb65b74c)
@@ -188,7 +188,9 @@
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_17.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=17")
+        kotlinDaemonJvmArguments.add("-Xmx1G")
     }
 }