Update build optimizations

app/build.gradle.kts

@@ -299,18 +299,6 @@ dependencies {
     testImplementation(libs.square.turbine)
 }
 
-tasks.withType<Test>().configureEach {
-    useJUnitPlatform()
-    @Suppress("MagicNumber")
-    forkEvery = 100
-    maxHeapSize = "2g"
-    maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).coerceAtLeast(1)
-    jvmArgs = jvmArgs.orEmpty() + "-XX:+UseParallelGC" +
-        // Explicitly setting the user Country and Language because tests assume en-US
-        "-Duser.country=US" +
-        "-Duser.language=en"
-}
-
 afterEvaluate {
     // Disable Fdroid-specific tasks that we want to exclude
     val fdroidTasksToDisable = tasks.withType<GoogleServicesTask>() +

authenticator/build.gradle.kts

@@ -260,18 +260,6 @@ protobuf {
     }
 }
 
-tasks.withType<Test>().configureEach {
-    useJUnitPlatform()
-    @Suppress("MagicNumber")
-    forkEvery = 100
-    maxHeapSize = "2g"
-    maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).coerceAtLeast(1)
-    jvmArgs = jvmArgs.orEmpty() + "-XX:+UseParallelGC" +
-        // Explicitly setting the user Country and Language because tests assume en-US
-        "-Duser.country=US" +
-        "-Duser.language=en"
-}
-
 private fun renameFile(path: String, newName: String) {
     val originalFile = File(path)
     if (!originalFile.exists()) {

authenticatorbridge/build.gradle.kts

@@ -75,15 +75,3 @@ dependencies {
     testImplementation(libs.mockk.mockk)
     testImplementation(libs.square.turbine)
 }
-
-tasks.withType<Test>().configureEach {
-    useJUnitPlatform()
-    @Suppress("MagicNumber")
-    forkEvery = 100
-    maxHeapSize = "2g"
-    maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).coerceAtLeast(1)
-    jvmArgs = jvmArgs.orEmpty() + "-XX:+UseParallelGC" +
-        // Explicitly setting the user Country and Language because tests assume en-US
-        "-Duser.country=US" +
-        "-Duser.language=en"
-}

build.gradle.kts

@@ -183,6 +183,18 @@ subprojects {
     tasks.withType<JavaCompile>().configureEach {
         options.isFork = true
     }
+    tasks.withType<Test>().configureEach {
+        useJUnitPlatform()
+        @Suppress("MagicNumber")
+        forkEvery = 500
+        maxHeapSize = "2g"
+        maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).coerceAtLeast(1)
+        @Suppress("UselessCallOnNotNull")
+        jvmArgs = jvmArgs.orEmpty() + "-XX:+UseParallelGC" +
+            // Explicitly setting the user Country and Language because tests assume en-US
+            "-Duser.country=US" +
+            "-Duser.language=en"
+    }
 }
 
 afterEvaluate {

core/build.gradle.kts

@@ -68,15 +68,3 @@ kotlin {
         jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
     }
 }
-
-tasks.withType<Test>().configureEach {
-    useJUnitPlatform()
-    @Suppress("MagicNumber")
-    forkEvery = 100
-    maxHeapSize = "2g"
-    maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).coerceAtLeast(1)
-    jvmArgs = jvmArgs.orEmpty() + "-XX:+UseParallelGC" +
-        // Explicitly setting the user Country and Language because tests assume en-US
-        "-Duser.country=US" +
-        "-Duser.language=en"
-}

cxf/build.gradle.kts

@@ -63,15 +63,3 @@ dependencies {
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(libs.mockk.mockk)
 }
-
-tasks.withType<Test>().configureEach {
-    useJUnitPlatform()
-    @Suppress("MagicNumber")
-    forkEvery = 100
-    maxHeapSize = "2g"
-    maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).coerceAtLeast(1)
-    jvmArgs = jvmArgs.orEmpty() + "-XX:+UseParallelGC" +
-        // Explicitly setting the user Country and Language because tests assume en-US
-        "-Duser.country=US" +
-        "-Duser.language=en"
-}

data/build.gradle.kts

@@ -73,15 +73,3 @@ dependencies {
     testFixturesImplementation(libs.junit.jupiter)
     testFixturesImplementation(libs.kotlinx.coroutines.test)
 }
-
-tasks.withType<Test>().configureEach {
-    useJUnitPlatform()
-    @Suppress("MagicNumber")
-    forkEvery = 100
-    maxHeapSize = "2g"
-    maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).coerceAtLeast(1)
-    jvmArgs = jvmArgs.orEmpty() + "-XX:+UseParallelGC" +
-        // Explicitly setting the user Country and Language because tests assume en-US
-        "-Duser.country=US" +
-        "-Duser.language=en"
-}

gradle.properties

@@ -8,7 +8,7 @@ org.gradle.caching=true
 org.gradle.configuration-cache=true
 org.gradle.configuration-cache.parallel=true
 org.gradle.configuration-cache.problems=warn
-org.gradle.jvmargs=-Xmx4g -XX:+UseParallelGC -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 
 # Disable build features that are enabled by default and we do not need

network/build.gradle.kts

@@ -78,15 +78,3 @@ dependencies {
     testFixturesImplementation(libs.square.retrofit.kotlinx.serialization)
     testFixturesImplementation(libs.square.okhttp.mockwebserver)
 }
-
-tasks.withType<Test>().configureEach {
-    useJUnitPlatform()
-    @Suppress("MagicNumber")
-    forkEvery = 100
-    maxHeapSize = "2g"
-    maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).coerceAtLeast(1)
-    jvmArgs = jvmArgs.orEmpty() + "-XX:+UseParallelGC" +
-        // Explicitly setting the user Country and Language because tests assume en-US
-        "-Duser.country=US" +
-        "-Duser.language=en"
-}

testharness/build.gradle.kts

@@ -117,15 +117,3 @@ dependencies {
 
     testImplementation(testFixtures(project(":ui")))
 }
-
-tasks.withType<Test>().configureEach {
-    useJUnitPlatform()
-    @Suppress("MagicNumber")
-    forkEvery = 100
-    maxHeapSize = "2g"
-    maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).coerceAtLeast(1)
-    jvmArgs = jvmArgs.orEmpty() + "-XX:+UseParallelGC" +
-        // Explicitly setting the user Country and Language because tests assume en-US
-        "-Duser.country=US" +
-        "-Duser.language=en"
-}

ui/build.gradle.kts

@@ -115,14 +115,5 @@ kotlin {
 }
 
 tasks.withType<Test>().configureEach {
-    useJUnitPlatform()
-    @Suppress("MagicNumber")
-    forkEvery = 100
-    maxHeapSize = "2g"
-    maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).coerceAtLeast(1)
-    jvmArgs = jvmArgs.orEmpty() + "-XX:+UseParallelGC" +
-        // Explicitly setting the user Country and Language because tests assume en-US
-        "-Duser.country=US" +
-        "-Duser.language=en"
     android.sourceSets["main"].res.srcDirs("src/test/res")
 }