Merge pull request #14089 from nextcloud/increase-build-speed

Increase Build Speed
nextcloud · Dec 9, 2024 · 329f113 · 329f113
2 parents 1a7f34d + aa3c87a
commit 329f113
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -147,6 +147,7 @@ android {
         buildTypes {
             debug {
                 testCoverageEnabled(project.hasProperty('coverage'))
+                resConfigs "en", "xxxhdpi"
             }
         }
 
@@ -186,7 +187,6 @@ android {
             }
         }
 
-
         testOptions {
             unitTests.returnDefaultValues = true
             animationsDisabled true
@@ -261,6 +261,10 @@ android {
         // Adds exported schema location as test app assets.
         androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
     }
+
+    kapt {
+        useBuildCache true
+    }
 }
 
 dependencies {

diff --git a/build.gradle b/build.gradle
@@ -37,9 +37,9 @@ buildscript {
 subprojects {
     buildscript {
         repositories {
-            gradlePluginPortal()
             google()
             mavenCentral()
+            gradlePluginPortal()
         }
     }
     repositories {

diff --git a/gradle.properties b/gradle.properties
@@ -13,12 +13,13 @@ android.nonFinalResIds=false
 
 
 # JVM arguments to optimize heap usage, enable heap dump on out-of-memory errors, and set the file encoding
-org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g
 org.gradle.dependency.verification.console=verbose
-kotlin.daemon.jvmargs=-Xmx4096m
+kotlin.daemon.jvmargs=-Xmx6144m -XX:+UseParallelGC
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.configureondemand=true
+kapt.incremental.apt=true
 
 # Needed for local libs
 # org.gradle.dependency.verification=lenient
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -188,7 +188,10 @@
             <trusting group="com.sun.activation" name="all" version="1.2.1"/>
             <trusting group="jakarta.activation"/>
          </trusted-key>
-         <trusted-key id="6F538074CCEBF35F28AF9B066A0975F8B1127B83" group="org.jetbrains.kotlin"/>
+         <trusted-key id="6F538074CCEBF35F28AF9B066A0975F8B1127B83">
+            <trusting group="org.jetbrains.kotlin"/>
+            <trusting group="^org[.]jetbrains[.]kotlin($|([.].*))" regex="true"/>
+         </trusted-key>
          <trusted-key id="6F656B7F6BFB238D38ACF81F3C27D97B0C83A85C" group="com.google.errorprone"/>
          <trusted-key id="6F7E5ACBCD02DB60DFD232E45E1F79A7C298661E" group="com.google.auto"/>
          <trusted-key id="720746177725A89207A7075BFD5DEA07FCB690A8" group="org.codehaus.mojo" name="mojo-parent" version="50"/>
@@ -5699,10 +5702,14 @@
       </component>
       <component group="com.android.tools.build" name="transform-api" version="2.0.0-deprecated-use-gradle-api">
          <artifact name="transform-api-2.0.0-deprecated-use-gradle-api.jar">
-            <sha256 value="e8b4151ae1679f1abe7a14ee371ac9b3c651ae7b63290d1f586bdd0f78face9a" origin="Generated by Gradle"/>
+            <sha256 value="e8b4151ae1679f1abe7a14ee371ac9b3c651ae7b63290d1f586bdd0f78face9a" origin="Generated by Gradle" reason="Artifact is not signed">
+               <also-trust value="4de4a3d05e1c534c2db9e4588bf34082bb2bd232d8abb9727c430290ce225740"/>
+            </sha256>
          </artifact>
          <artifact name="transform-api-2.0.0-deprecated-use-gradle-api.pom">
-            <sha256 value="d49d179f707d3f3a00b2a7d36136b54aa8d44fa22770703cd82fe52fb39e22eb" origin="Generated by Gradle"/>
+            <sha256 value="d49d179f707d3f3a00b2a7d36136b54aa8d44fa22770703cd82fe52fb39e22eb" origin="Generated by Gradle" reason="Artifact is not signed">
+               <also-trust value="7c62f3856e8abca1d79257925f26c12668693f5d95904056bbac88605cfd8575"/>
+            </sha256>
          </artifact>
       </component>
       <component group="com.android.tools.build.jetifier" name="jetifier-core" version="1.0.0-beta10">
@@ -14563,6 +14570,11 @@
             <sha256 value="8347e5c10c0f818183e419da3e98a0e83679b5dd358d07d00495fef377ff69d1" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+       <component group="org.jetbrains.kotlin.kapt" name="org.jetbrains.kotlin.kapt.gradle.plugin" version="2.1.0">
+           <artifact name="org.jetbrains.kotlin.kapt.gradle.plugin-2.1.0.pom">
+               <sha256 value="26c69e5b5b3c49c748f14755e2bc04f9a3b0fa0b5b156405e0bfeece953c0271" origin="Generated by Gradle" reason="Artifact is not signed"/>
+           </artifact>
+       </component>
       <component group="org.jetbrains.kotlin.plugin.compose" name="org.jetbrains.kotlin.plugin.compose.gradle.plugin" version="2.0.0">
          <artifact name="org.jetbrains.kotlin.plugin.compose.gradle.plugin-2.0.0.pom">
             <sha256 value="38e76d688eddcf2d92ab20838c0adf28d8fd5de2cc965edcd273a9b4f7d636de" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -14588,6 +14600,11 @@
             <sha256 value="fe78fa62efbf0c89ebef4bb0695ab219f41d802e854aafe0fedc561b1bc4a0d7" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+       <component group="org.jetbrains.kotlin.plugin.compose" name="org.jetbrains.kotlin.plugin.compose.gradle.plugin" version="2.1.0">
+           <artifact name="org.jetbrains.kotlin.plugin.compose.gradle.plugin-2.1.0.pom">
+               <sha256 value="db3bde26de3ea7433086163644a5750e280a1540990e30f1ae99fe80f2d5f160" origin="Generated by Gradle" reason="Artifact is not signed"/>
+           </artifact>
+       </component>
       <component group="org.jetbrains.kotlinx" name="atomicfu" version="0.16.1">
          <artifact name="atomicfu-0.16.1.module">
             <sha256 value="fdcf04fc25f6a43f557f341ee0053caa25e759f591169c86566f1dad37fc77a6" origin="Generated by Gradle"/>