Merge branch 'minSdk24' into 'master'

Bump minSdk to 24 due to a serialization bug

Closes #3073

See merge request fdroid/fdroidclient!1585

.gitlab-ci.yml

@@ -300,7 +300,6 @@ libs database schema:
     - export AVD="$AVD_PACKAGE"
     - echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install "$AVD"
     - echo no | $ANDROID_HOME/cmdline-tools/latest/bin/avdmanager --verbose create avd --name "$NAME_AVD" --package "$AVD" --device "pixel"
-    - sed -i "s@hw.cpu.ncore=3@hw.cpu.ncore=$(nproc --all)@" $HOME/.android/avd/"$NAME_AVD".avd/config.ini
     - df -h
     - start-emulator.sh
     - ./gradlew installFullDebug
@@ -338,7 +337,7 @@ kvm jobs skipped:
     - printf "\x1b[32m${CI_SERVER_URL}/$CI_PROJECT_PATH/-/settings/ci_cd#js-cicd-variables-settings\n"
 
 
-kvm 23 default x86:
+kvm 24 default x86:
   <<: *kvm-template
 
 

app/build.gradle

@@ -37,7 +37,7 @@ android {
         applicationId "org.fdroid"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-        minSdkVersion 23
+        minSdkVersion 24
         targetSdkVersion 31
         /*
           The Android Testing Support Library collects analytics to continuously improve the testing

app/src/testFull/java/kellinwood/security/zipsigner/ZipSignerTest.java

@@ -34,12 +34,10 @@ import java.util.jar.JarOutputStream;
  * This test the JAR signing functions of {@link ZipSigner}.
  */
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = {23, 25, 32}) // minSdkVersion, targetSdkVersion, max SDK supported by Robolectric
+@Config(sdk = {24, 25, 32, 35}) // minSdkVersion, targetSdkVersion, max SDK supported by Robolectric
 public class ZipSignerTest {
-    public static final String TAG = "ZipSignerTest";
 
     private File unsigned;
-    private File signed;
 
     @Before
     public void setUp() {
@@ -64,9 +62,6 @@ public class ZipSignerTest {
         if (unsigned != null) {
             unsigned.delete();
         }
-        if (signed != null) {
-            signed.delete();
-        }
     }
 
     @Test

app/src/testFull/java/org/fdroid/fdroid/nearby/LocalRepoKeyStoreTest.java

@@ -31,7 +31,7 @@ import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = {23, 25, 32}) // minSdkVersion, targetSdkVersion, max SDK supported by Robolectric
+@Config(sdk = {24, 25, 32, 35}) // minSdkVersion, targetSdkVersion, max SDK supported by Robolectric
 public class LocalRepoKeyStoreTest {
 
     @Test