Update room version to 2.8.4

In addition bump gradle and AGP version

Author: anod

lib/android_build/app/build.gradle

@@ -40,6 +40,6 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':maesdk')
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
 }

lib/android_build/app/src/androidTest/java/com/microsoft/applications/events/maesdktest/OfflineRoomUnitTest.java

@@ -19,6 +19,7 @@
 
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 
@@ -41,7 +42,8 @@ public void storeOneRecord() {
             room.storeRecords(record);
             assertEquals(1, room.getRecordCount(StorageRecord.EventLatency_Unspecified));
             assertEquals(1, room.getRecordCount(StorageRecord.EventLatency_Normal));
-            assertThat(room.totalSize(), Matchers.greaterThan(new Long(0)));
+            assertThat(room.totalSize(), Matchers.greaterThan(0L));
+            assertNotEquals(room.loadPageSize(), -1L);
             assertEquals(1, room.deleteAllRecords());
         }
     }

lib/android_build/app/src/androidTest/java/com/microsoft/applications/events/maesdktest/SDKUnitNativeTest.java

@@ -254,7 +254,6 @@ public void resumingAlsoEnds() {
   @Test
   public void runNativeTests() {
     System.loadLibrary("native-lib");
-    System.loadLibrary("maesdk");
 
     Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
     HttpClient client = new HttpClient(appContext);

lib/android_build/app/src/main/cpp/CMakeLists.txt

@@ -81,10 +81,8 @@ include_directories(
 
 find_library(zlib-path z)
 
-add_library(maesdk SHARED IMPORTED)
-set_target_properties(maesdk PROPERTIES
-        IMPORTED_LOCATION "${SDK_ROOT}/lib/android_build/maesdk/build/intermediates/cmake/debug/obj/${CMAKE_ANDROID_ARCH_ABI}/libmaesdk.so"
-        IMPORTED_LOCATION_Release "${SDK_ROOT}/lib/android_build/maesdk/build/intermediates/cmake/debug/obj/${CMAKE_ANDROID_ARCH_ABI}/libmaesdk.so")
+#Add maesdk as a dependency
+add_subdirectory(../../../../maesdk/src/main/cpp maesdk)
 
 # include the other flavor of database: if maesdk builds with Room include sqlite
 # if maesdk builds with native sqlite, include Room

lib/android_build/app/src/main/java/com/microsoft/applications/events/maesdktest/MainActivity.java

@@ -27,7 +27,6 @@ void log_failure(String filename, int line, String summary) {
     // Used to load the 'native-lib' library on application startup.
     static {
         System.loadLibrary("native-lib");
-        System.loadLibrary("maesdk");
     }
 
     HttpClient m_client;

lib/android_build/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

lib/android_build/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
-#Wed Feb 01 08:36:33 EET 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists