Merge branch 'develop' into fix/show-cell-file-name

Author: sbakhtiarov

benchmark/build.gradle.kts

@@ -23,7 +23,7 @@ plugins {
 android {
     defaultConfig {
         minSdk = 23
-        compileSdk = 34
+        compileSdk = 35
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 

build-logic/plugins/src/main/kotlin/AndroidCoordinates.kt

@@ -20,7 +20,7 @@ import java.io.File
 
 object AndroidSdk {
     const val min = 26
-    const val compile = 34
+    const val compile = 35
     const val target = compile
 }
 

build-logic/plugins/src/main/kotlin/com/wire/android/gradle/KotlinAndroidConfiguration.kt

@@ -29,6 +29,7 @@ import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import versionCatalog
 import findLibrary
+import org.gradle.api.tasks.JavaExec
 import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.jetbrains.kotlin.gradle.dsl.KotlinBaseExtension
 
@@ -105,6 +106,13 @@ private fun CommonExtension<*, *, *, *, *, *>.configureLint(project: Project) {
         baseline = project.file("lint-baseline.xml")
     }
 
+    // Configure lint heap size for CI environments
+    project.tasks.withType(JavaExec::class.java).configureEach {
+        if (name.contains("lint", ignoreCase = true)) {
+            jvmArgs("-Xmx6g", "-XX:+UseParallelGC", "-XX:MaxMetaspaceSize=1g")
+        }
+    }
+
     with(project) {
         dependencies {
             add("lintChecks", findLibrary("lint-compose"))

gradle.properties

@@ -16,11 +16,15 @@
 # along with this program. If not, see http://www.gnu.org/licenses/.
 #
 
-org.gradle.jvmargs=-Xmx8g
+org.gradle.jvmargs=-Xmx10g -XX:+UseParallelGC
 android.useAndroidX=true
 kotlin.code.style=official
 
 # Support KMP Gradle Composite Builds - See https://youtrack.jetbrains.com/issue/KT-52172/
 kotlin.mpp.import.enableKgpDependencyResolution=true
 org.gradle.logging.level=LIFECYCLE
 android.experimental.enableScreenshotTest=true
+
+# Configure lint heap size and workers
+org.gradle.workers.max=4
+android.lint.jvmargs=-Xmx6g -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g

gradle/libs.versions.toml

@@ -109,7 +109,7 @@ junit5 = "5.11.0"
 mockk = "1.13.16"
 okio = "3.9.0"
 turbine = "1.2.0"
-robolectric = "4.12.2"
+robolectric = "4.14"
 hamcrest = "3.0"
 
 [plugins]