Merge branch 'refs/heads/master' into feat/add-bcv-api-checker

adam-enko · adam-enko · commit 52697837bfe0 · 2024-04-08T10:53:55.000+02:00
diff --git a/integration/src/test/resources/templates/kmp-with-toolchain/build.gradle b/integration/src/test/resources/templates/kmp-with-toolchain/build.gradle
@@ -1,7 +1,6 @@
 kotlin {
-    jvm {
-        jvmToolchain(21)
-    }
+    jvmToolchain(21)
+    jvm {}
 
     sourceSets {
         commonMain {
diff --git a/integration/src/test/resources/templates/kmp-with-toolchain/gradle.properties b/integration/src/test/resources/templates/kmp-with-toolchain/gradle.properties
@@ -1 +1 @@
-org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
diff --git a/integration/src/test/resources/templates/kotlin-multiplatform/gradle.properties b/integration/src/test/resources/templates/kotlin-multiplatform/gradle.properties
@@ -1 +1 @@
-org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8`
	`1`	`+org.gradle.jvmargs=-Xmx2g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8`