From 26a268129ab84c2428f8b4470cceed01c2011e08 Mon Sep 17 00:00:00 2001
From: Tom Hicks <headhunter3@gmail.com>
Date: Sun, 15 Aug 2021 15:09:07 -0700
Subject: [PATCH] Updates to build on arm macs.

---
 Android/.idea/gradle.xml | 2 +-
 Android/.idea/misc.xml   | 3 ++-
 Android/build.gradle     | 6 ++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Android/.idea/gradle.xml b/Android/.idea/gradle.xml
index 2c7e034..625b371 100644
--- a/Android/.idea/gradle.xml
+++ b/Android/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
+        <option name="gradleJvm" value="Android Studio java home" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/Android/.idea/misc.xml b/Android/.idea/misc.xml
index 6c2e59d..4b03f8d 100644
--- a/Android/.idea/misc.xml
+++ b/Android/.idea/misc.xml
@@ -25,7 +25,7 @@
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="13">
+        <list size="14">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="2" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
@@ -39,6 +39,7 @@
           <item index="10" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
           <item index="11" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
           <item index="12" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
+          <item index="13" class="java.lang.String" itemvalue="lombok.NonNull" />
         </list>
       </value>
     </option>
diff --git a/Android/build.gradle b/Android/build.gradle
index 71e4554..2e3a4d6 100644
--- a/Android/build.gradle
+++ b/Android/build.gradle
@@ -20,6 +20,12 @@ allprojects {
         // maven { url "https://oss.jfrog.org/libs-snapshot" }
         // maven { url 'http://repo1.maven.org/maven2' }
     }
+    // Temporary workaround until room 2.4.0 is released https://issuetracker.google.com/issues/174695268?pli=1#comment10
+    configurations.configureEach {
+        resolutionStrategy {
+            force 'org.xerial:sqlite-jdbc:3.34.0'
+        }
+    }
 }
 
 task clean(type: Delete) {