Merge branch 'build-fixes' into 'master'

three build fixes

Closes #2493

See merge request fdroid/fdroidclient!1200

.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.

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
 

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-----

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"/>