From 9cfb95fee700982d095c533e98fa5b7fc1149629 Mon Sep 17 00:00:00 2001
From: Ehren Kret <ehren@signal.org>
Date: Thu, 2 Mar 2023 09:13:54 -0600
Subject: [PATCH] Update Github CI to build with more cores and limit metaspace
 size.

---
 .github/workflows/android.yml | 7 ++-----
 gradle.properties             | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 774302298..ae28f7f4e 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-8-cores
 
     steps:
     - uses: actions/checkout@v3
@@ -29,11 +29,8 @@ jobs:
     - name: Validate Gradle Wrapper
       uses: gradle/wrapper-validation-action@v1
 
-    - name: Remove Android 31 (S)
-      run: $ANDROID_HOME/tools/bin/sdkmanager --uninstall "platforms;android-31"
-
     - name: Build with Gradle
-      run: ./gradlew qa
+      run: ./gradlew qa --parallel
 
     - name: Archive reports for failed build
       if: ${{ failure() }}
diff --git a/gradle.properties b/gradle.properties
index 5f01bf39c..5a60ad10d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
-org.gradle.jvmargs=-Xmx4096m
+org.gradle.jvmargs=-Xmx4g -Xms256m -XX:MaxMetaspaceSize=1g
 android.useAndroidX=true
 android.enableJetifier=true
 kapt.incremental.apt=false
-android.experimental.androidTest.numManagedDeviceShards=4
\ No newline at end of file
+android.experimental.androidTest.numManagedDeviceShards=4