Merge branch 'api-24' into 'master'

Api 24

Based on https://gitlab.com/fdroid/fdroidclient/merge_requests/352 with fixes for robolectric

See merge request !360

app/src/test/java/org/fdroid/fdroid/AcceptableMultiRepoUpdaterTest.java

@@ -19,7 +19,8 @@ import java.util.List;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-@Config(constants = BuildConfig.class)
+// TODO: Use sdk=24 when Robolectric supports this
+@Config(constants = BuildConfig.class, sdk = 23)
 @RunWith(RobolectricGradleTestRunner.class)
 public class AcceptableMultiRepoUpdaterTest extends MultiRepoUpdaterTest {
     private static final String TAG = "AcceptableMultiRepoTest";

app/src/test/java/org/fdroid/fdroid/RepoXMLHandlerTest.java

@@ -38,7 +38,8 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-@Config(constants = BuildConfig.class)
+// TODO: Use sdk=24 when Robolectric supports this
+@Config(constants = BuildConfig.class, sdk = 23)
 @RunWith(RobolectricGradleTestRunner.class)
 public class RepoXMLHandlerTest {
     private static final String TAG = "RepoXMLHandlerTest";

app/src/test/java/org/fdroid/fdroid/UtilsTest.java

@@ -15,7 +15,8 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-@Config(constants = BuildConfig.class)
+// TODO: Use sdk=24 when Robolectric supports this
+@Config(constants = BuildConfig.class, sdk = 23)
 @RunWith(RobolectricGradleTestRunner.class)
 public class UtilsTest {
 

app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java

@@ -31,7 +31,8 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
-@Config(constants = BuildConfig.class, application = Application.class)
+// TODO: Use sdk=24 when Robolectric supports this
+@Config(constants = BuildConfig.class, application = Application.class, sdk = 23)
 @RunWith(RobolectricGradleTestRunner.class)
 public class ApkProviderTest extends FDroidProviderTest {
 

app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java

@@ -27,7 +27,8 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-@Config(constants = BuildConfig.class, application = Application.class)
+// TODO: Use sdk=24 when Robolectric supports this
+@Config(constants = BuildConfig.class, application = Application.class, sdk = 23)
 @RunWith(RobolectricGradleTestRunner.class)
 public class AppProviderTest extends FDroidProviderTest {
 

app/src/test/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java

@@ -23,7 +23,8 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.Map;
 
-@Config(constants = BuildConfig.class, application = Application.class)
+// TODO: Use sdk=24 when Robolectric supports this
+@Config(constants = BuildConfig.class, application = Application.class, sdk = 23)
 @RunWith(RobolectricGradleTestRunner.class)
 public class InstalledAppProviderTest extends FDroidProviderTest {
 

app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java

@@ -20,7 +20,8 @@ import java.util.List;
 import static org.fdroid.fdroid.Assert.assertInvalidUri;
 import static org.fdroid.fdroid.Assert.assertValidUri;
 
-@Config(constants = BuildConfig.class)
+// TODO: Use sdk=24 when Robolectric supports this
+@Config(constants = BuildConfig.class, sdk = 23)
 @RunWith(RobolectricGradleTestRunner.class)
 public class ProviderUriTests {
 

app/src/test/java/org/fdroid/fdroid/installer/ApkCacheTest.java

@@ -13,7 +13,8 @@ import java.io.IOException;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-@Config(constants = BuildConfig.class)
+// TODO: Use sdk=24 when Robolectric supports this
+@Config(constants = BuildConfig.class, sdk = 23)
 @RunWith(RobolectricGradleTestRunner.class)
 public class ApkCacheTest {