From 51513c5508fb974f2625b99204bfd18f778af49e Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 14 Feb 2023 12:41:01 +0100
Subject: [PATCH 1/3] include verification metadata for buildEnvironment task

./gradlew --write-verification-metadata pgp,sha256 --export-keys  buildEnvironment --scan

Hopefully this helps with #2475.  My hunch is that Android Studio is
running some tasks that gradle from the command line never does.  This
confirms that idea to some degree, since running the buildEnvironment
task found new dependencies.
---
 gradle/verification-keyring.keys | 36 ++++++++++++++++++++++++++++++++
 gradle/verification-metadata.xml |  6 ++++++
 2 files changed, 42 insertions(+)

diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index 902bd40f3..5c2375397 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -7228,3 +7228,39 @@ CRBXGlKR6Cfhx0GuAJ497rs0V5ZsLuKaJw91EnPmwn5x/wCfbCh/AZ1+6AqvAaSl
 84Y498fRoPE=
 =oQxC
 -----END PGP PUBLIC KEY BLOCK-----
+
+pub    5208812E1E4A6DB0
+uid    Gradle Inc. <info@gradle.com>
+
+sub    33AEBC1F01C98081
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+mQENBFxaxWYBCADI4/gRCJYfXwZYdUoEGlAlCfRgABy90rvebzcs8MKtolAbPVkG
+iqnjftXd28sZhEDx9YJrUfmzspdrYmU7hy1kgV1/WGIcWyTExTH3bqlnaIWnnTxA
+HD0x4NJ2AzmX5VO8LxhqGID+BErrv7uGZvVmJT6trqUIcKeNEq7mzdDJKqTBY4cw
+q+Dm8P0vs4IFTD8q5f1Vr78FmUth2srIBmsIH1wNV1nAUTmQppNBFlCmcvnWTYI1
+0UMcsFFrJ2pFT1yP2AEGUNl4Lgj4hmVHZwX38/lu9pQ7iWtHSLOwZsfuC34/goS+
+ldFt63JqDV7ZaqwAgk7Iq6jbr4pSVsB4VdglABEBAAG0HUdyYWRsZSBJbmMuIDxp
+bmZvQGdyYWRsZS5jb20+iQFOBBMBCAA4FiEEMU/oLlpMU3e8ou3sUgiBLh5KbbAF
+Al6+3fgCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQUgiBLh5KbbDr4ggA
+tmAjpH0VPImxcfV+by6itQkY6BQQ0VO9adO9Q/C7JIaiPQ8Rz+2f1SzAtLB/44SZ
+4mseP/Hb5CQEAysRPd3/3GP56GXzXgGURT9/4j/1RPyHIndBd9mmvd9L9+lKWMbZ
+Y7JzPC4Ew/2WPeB3GVsOgn+sMBVHZcVDATqZ5OdfSmuIil7DueWSPUNbFFJkLy7P
+6nkRkk4GMRXSlAjKOLNNQV41cUChqAqf8Yj1sD6cX75YZylsm9voV6JoR2u8lAfT
+zr1VPKdy9xLfDh9Fizth7r0t3OmrUvlEey2IkOoT5cUl/2/jPaz/ypVw4G8nbzW3
+0lyW43RWIIXZC8WAMRdWUbkBDQRcWsVmAQgA3teo6Yf13mAxnW4NloQGU6aMWtcT
+AbYtvbizF0E0ScepqthcFbou4FGN++YQU0jzf7Etc0hmH/gxmzRYSdA72lSm58hW
+1IkvkY1JQUn+VT/9NCsAP/vnSfBb5L5JkC+gtfg26pIBJdmAQNAK/IYU2C4gDKp8
+WiJP7Dv7M6IuEOnjRmkMvHwdyFjMKvTJlnSyldpsc6EcXlF55zQn4xN0czD/be01
+iH8B1SbFULJG1dvXmHTQB+nTVBkY+rbRUIBVqz9ZocuTfJeLZ6HDlcxfbpjPX2NP
+JVqhDKAVmnuhukeu5qHTMgUApxA3qICpzxkp0NiLwEpmfEHm/82aSZMXCQARAQAB
+iQE2BBgBCAAgAhsMFiEEMU/oLlpMU3e8ou3sUgiBLh5KbbAFAlxaxq8ACgkQUgiB
+Lh5KbbBF3Qf/ZvRrrRAAzLYZPZEIv2Xd0Tbdu6nWAxpRl/YiC3qDSVzPJvaYjcxP
+dpDYSFtpNmLqboevTqSj9dRNRMxm3TnW8AdsiiIQjicTW9kImaMYpHXA+LxNp9Hu
+UoEqtB9qQ7eL/Q8tKVjrcsot5rqPj9vJPyIGOJ0Xdw0dhWgYl15fOt5KT7fHNWk6
+Octrtag1nzTT7aZH5kHATTooE/466sx44Hk0arUj1qaT5dB9GxJXqwXEwSu/gF+8
+C5F7ZQoBWe31rN9voDISiV1YbHn8IIwHygSEUu6DpmbZpVgOoAth16V5HJ+MQzkK
+NcHP2WzBY8pJSwQJtVhEwYqkfpObsF5ifA==
+=6kQ8
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 51d66649e..122ac9419 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -3239,6 +3239,12 @@
             <sha256 value="7846399b35c7cd642a9b3a000c3e2d62d04eb37a4547b6933cc8b18bcc2f086b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.gradle" name="gradle-enterprise-gradle-plugin" version="3.10.2">
+         <artifact name="gradle-enterprise-gradle-plugin-3.10.2.jar">
+            <pgp value="314fe82e5a4c5377bca2edec5208812e1e4a6db0"/>
+            <sha256 value="71bfd64b143cf8ed37fd2e0d8383de127856c5f313aa3f564721ab4b31710bfa" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.hannesdorfmann" name="adapterdelegates3" version="3.0.1">
          <artifact name="adapterdelegates3-3.0.1.aar">
             <pgp value="49977dad0140e24894f9b955354214e5e508c045"/>

From 0788688e75b8b055a6b73dc9f95c03e140084207 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 23 Feb 2023 12:06:26 +0100
Subject: [PATCH 2/3] remove -XX:MaxPermSize=2g from gradle.properties

This is not supported in Java17 and it just some detailed optimization
that is better left to the local configuration.

Unrecognized VM option 'MaxPermSize=2g'
Error: Could not create the Java Virtual Machine.
Error: A fatal exception has occurred. Program will exit.
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 6b27a189b..be6ae89d2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xms1g -Xmx2g -XX:MaxPermSize=2g
+org.gradle.jvmargs=-Xms1g -Xmx2g
 android.enableJetifier=false
 android.useAndroidX=true
 

From ab2e855f26b03a6cc00a7fe9610ae1b731f00627 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 23 Feb 2023 16:46:57 +0100
Subject: [PATCH 3/3] add job to check whether database schema needs updating,
 closes #2493

---
 .gitlab-ci.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7e4ac5f7..36b499c20 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,6 +85,18 @@ errorprone:
     - cat config/errorprone.gradle >> app/build.gradle
     - ./gradlew -Dorg.gradle.dependency.verification=lenient assembleDebug
 
+database schema:
+  stage: test
+  image: debian:bullseye-backports
+  script:
+    - apt-get update
+    - apt-get -qy --no-install-recommends install default-jdk-headless git sdkmanager
+    - export ANDROID_HOME=/opt/android-sdk
+    - export ANDROID_COMPILE_SDK=`sed -n 's,.*compileSdkVersion\s*\([0-9][0-9]*\).*,\1,p' app/build.gradle`
+    - sdkmanager "platforms;android-$ANDROID_COMPILE_SDK" "build-tools;30.0.3"
+    - ./gradlew :libs:database:kaptDebugKotlin
+    - git --no-pager diff --exit-code
+
 # Run the tests in the emulator.  Each step is broken out to run on
 # its own since the CI runner can have limited RAM, and the emulator
 # can take a while to start.