Merge pull request #985 from ZeusWPI/bump/everything

Bump/everything

app/build.gradle

@@ -168,11 +168,11 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.1'
 
     implementation 'androidx.core:core:1.13.1'
     implementation 'androidx.media:media:1.7.0'
-    implementation 'androidx.fragment:fragment:1.8.0'
+    implementation 'androidx.fragment:fragment:1.8.2'
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.preference:preference:1.2.1'
     implementation 'androidx.cardview:cardview:1.0.0'
@@ -181,10 +181,9 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.browser:browser:1.8.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.7.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata:2.7.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata:2.7.0'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.7.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.8.4'
+    implementation 'androidx.lifecycle:lifecycle-livedata:2.8.1'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.8.4'
     implementation 'androidx.viewpager2:viewpager2:1.1.0'
     implementation 'androidx.room:room-runtime:2.6.1'
     annotationProcessor 'androidx.room:room-compiler:2.6.1'
@@ -199,17 +198,17 @@ dependencies {
     implementation 'dev.chrisbanes.insetter:insetter:0.6.1'
     implementation 'com.github.niqdev:ipcam-view:2.4.1'
 
-    annotationProcessor 'io.soabase.record-builder:record-builder-processor:41'
-    compileOnly 'io.soabase.record-builder:record-builder-core:41'
+    annotationProcessor 'io.soabase.record-builder:record-builder-processor:42'
+    compileOnly 'io.soabase.record-builder:record-builder-core:42'
 
     // Dependencies for the Play Store version.
-    storeImplementation 'com.google.android.gms:play-services-maps:18.2.0'
-    storeImplementation 'com.google.firebase:firebase-analytics:22.0.2'
-    storeImplementation 'com.google.firebase:firebase-crashlytics:19.0.2'
+    storeImplementation 'com.google.android.gms:play-services-maps:19.0.0'
+    storeImplementation 'com.google.firebase:firebase-analytics:22.1.0'
+    storeImplementation 'com.google.firebase:firebase-crashlytics:19.0.3'
     storeImplementation 'com.google.android.gms:play-services-code-scanner:16.1.0'
 
     // Dependencies for open version.
-    openImplementation 'org.osmdroid:osmdroid-android:6.1.18'
+    openImplementation 'org.osmdroid:osmdroid-android:6.1.20'
     openImplementation 'com.journeyapps:zxing-android-embedded:4.3.0'
 
     if (props.getProperty("hydra.debug.leaks").toBoolean()) {
@@ -220,23 +219,23 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     // Once final classes can be mocked, go back to mockito-core.
     testImplementation 'org.mockito:mockito-inline:5.2.0'
-    testImplementation 'org.robolectric:robolectric:4.12.2'
-    testImplementation 'androidx.test:core:1.5.0'
-    testImplementation 'androidx.test.ext:junit:1.1.5'
-    testImplementation 'androidx.test:rules:1.5.0'
-    testImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    testImplementation 'androidx.test.espresso:espresso-intents:3.5.1'
-    testImplementation 'androidx.test.espresso:espresso-contrib:3.5.1'
+    testImplementation 'org.robolectric:robolectric:4.13'
+    testImplementation 'androidx.test:core:1.6.1'
+    testImplementation 'androidx.test.ext:junit:1.2.1'
+    testImplementation 'androidx.test:rules:1.6.1'
+    testImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    testImplementation 'androidx.test.espresso:espresso-intents:3.6.1'
+    testImplementation 'androidx.test.espresso:espresso-contrib:3.6.1'
     testImplementation 'androidx.arch.core:core-testing:2.2.0'
     testImplementation 'androidx.room:room-testing:2.6.1'
     testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'
-    testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.16.1'
+    testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.16.2'
     testImplementation 'com.shazam:shazamcrest:0.11'
-    testImplementation 'org.skyscreamer:jsonassert:1.5.1'
+    testImplementation 'org.skyscreamer:jsonassert:1.5.3'
     testImplementation 'com.github.niknetniko:easy-random:master-SNAPSHOT'
-    testImplementation 'org.apache.commons:commons-lang3:3.14.0'
+    testImplementation 'org.apache.commons:commons-lang3:3.17.0'
     testImplementation 'commons-validator:commons-validator:1.9.0'
-    testImplementation 'com.google.guava:guava:33.2.1-jre'
+    testImplementation 'com.google.guava:guava:33.3.0-jre'
 }
 
 

app/src/main/AndroidManifest.xml

@@ -192,7 +192,8 @@
             android:label="@string/wpi_cammie_title"
             android:parentActivityName=".wpi.cammie.CammieActivity"
             android:screenOrientation="fullSensor"
-            android:theme="@style/Zeus.Material.Cammie" />
+            android:theme="@style/Zeus.Material.Cammie"
+            tools:ignore="DiscouragedApi" />
 
         <activity
             android:name=".wpi.door.NfcIntentReceiverActivity"

app/src/test/java/be/ugent/zeus/hydra/common/utils/StringUtilsTest.java

@@ -23,7 +23,7 @@
 package be.ugent.zeus.hydra.common.utils;
 
 import android.os.Build;
-import androidx.annotation.RequiresApi;
+import androidx.test.filters.SdkSuppress;
 
 import org.junit.Test;
 
@@ -32,7 +32,7 @@
 /**
  * @author Niko Strijbol
  */
-@RequiresApi(api = Build.VERSION_CODES.KITKAT)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
 public class StringUtilsTest {
 
     @Test

app/src/test/java/be/ugent/zeus/hydra/feed/cards/dismissal/DismissalDaoTest.java

@@ -23,7 +23,6 @@
 package be.ugent.zeus.hydra.feed.cards.dismissal;
 
 import android.content.Context;
-import androidx.annotation.RequiresApi;
 import androidx.room.Room;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -47,7 +46,6 @@
 
 import static be.ugent.zeus.hydra.testing.Assert.assertCollectionEquals;
 import static be.ugent.zeus.hydra.testing.Assert.assertThat;
-import static be.ugent.zeus.hydra.testing.Assert.samePropertyValuesAs;
 import static be.ugent.zeus.hydra.testing.Utils.generate;
 import static be.ugent.zeus.hydra.testing.Utils.getRandom;
 import static org.hamcrest.Matchers.empty;
@@ -59,8 +57,6 @@
  *
  * @author Niko Strijbol
  */
-// Request an older version of Android, since the SQLite version in Robolectric does not follow Android releases.
-@RequiresApi(api = 26)
 @RunWith(AndroidJUnit4.class)
 @LooperMode(LooperMode.Mode.PAUSED)
 @Config(application = TestApp.class)

app/src/test/java/be/ugent/zeus/hydra/feed/commands/MemoryDismissalDao.java

@@ -23,7 +23,7 @@
 package be.ugent.zeus.hydra.feed.commands;
 
 import android.os.Build;
-import androidx.annotation.RequiresApi;
+import androidx.test.filters.SdkSuppress;
 
 import java.util.HashSet;
 import java.util.List;
@@ -38,7 +38,7 @@
 /**
  * @author Niko Strijbol
  */
-@RequiresApi(api = Build.VERSION_CODES.N)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
 public class MemoryDismissalDao extends DismissalDao {
 
     private final Set<CardDismissal> dismissals = new HashSet<>();

app/src/test/java/be/ugent/zeus/hydra/testing/matcher/Fields.java

@@ -23,7 +23,7 @@
 package be.ugent.zeus.hydra.testing.matcher;
 
 import android.os.Build;
-import androidx.annotation.RequiresApi;
+import androidx.test.filters.SdkSuppress;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -37,13 +37,12 @@
  *
  * @author Niko Strijbol
  */
-@RequiresApi(api = Build.VERSION_CODES.N)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
 class Fields<T> {
 
     private final Class<T> clazz;
 
     private final Collection<String> ignoredFields;
-    private List<Field> results;
 
     Fields(Class<T> clazz) {
         this.clazz = clazz;

build.gradle

@@ -27,7 +27,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.2'
+        classpath 'com.android.tools.build:gradle:8.5.2'
         classpath 'com.google.gms:google-services:4.4.2'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2'
     }

buildSrc/build.gradle

@@ -13,10 +13,10 @@ repositories {
 dependencies {
     implementation gradleApi()
     implementation localGroovy()
-    implementation 'com.android.tools.build:gradle:8.2.2'
+    implementation 'com.android.tools.build:gradle:8.5.2'
     implementation 'org.jetbrains:annotations:24.1.0'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:5.12.0'
+    testImplementation 'org.mockito:mockito-core:5.13.0'
 }
 
 validatePlugins {