Versions

Author: samedson

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/ApplicationInfo.kt

@@ -37,8 +37,11 @@ internal data class AndroidApplicationInfo(
   /** The package name of the application/bundle name. */
   val packageName: String,
 
-  /** The version of the application. */
+  /** The display version of the application. */
   val versionName: String,
+
+  /** The build version of the application. */
+  val buildVersion: String,
 )
 
 internal data class ApplicationInfo(

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionEvents.kt

@@ -134,7 +134,11 @@ internal object SessionEvents {
       osDisplayVersion = Build.VERSION.RELEASE,
       logEnvironment = LogEnvironment.LOG_ENVIRONMENT_PROD,
       androidAppInfo =
-        AndroidApplicationInfo(packageName = packageName, versionName = packageInfo.versionName)
+        AndroidApplicationInfo(
+          packageName = packageName,
+          versionName = packageInfo.versionName,
+          buildVersion = packageInfo.versionCode.toString()
+        )
     )
   }
 }

firebase-sessions/src/test/kotlin/com/google/firebase/sessions/ApplicationInfoTest.kt

@@ -43,7 +43,8 @@ class ApplicationInfoTest {
           logEnvironment = LogEnvironment.LOG_ENVIRONMENT_PROD,
           AndroidApplicationInfo(
             packageName = ApplicationProvider.getApplicationContext<Context>().packageName,
-            versionName = FakeFirebaseApp.MOCK_APP_VERSION
+            versionName = FakeFirebaseApp.MOCK_APP_VERSION,
+            buildVersion = FakeFirebaseApp.MOCK_APP_BUILD_VERSION,
           )
         )
       )

firebase-sessions/src/test/kotlin/com/google/firebase/sessions/SessionEventEncoderTest.kt

@@ -104,7 +104,7 @@ class SessionEventEncoderTest {
             sessionSdkVersion = "",
             osDisplayVersion = "",
             logEnvironment = LogEnvironment.LOG_ENVIRONMENT_PROD,
-            AndroidApplicationInfo(packageName = "", versionName = ""),
+            AndroidApplicationInfo(packageName = "", versionName = "", buildVersion = ""),
           )
       )
 

firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/FakeFirebaseApp.kt

@@ -57,5 +57,6 @@ internal class FakeFirebaseApp(metadata: Bundle? = null) {
     internal const val MOCK_APP_ID = "1:12345:android:app"
     internal const val MOCK_API_KEY = "RANDOM_APIKEY_FOR_TESTING"
     internal const val MOCK_APP_VERSION = "1.0.0"
+    internal const val MOCK_APP_BUILD_VERSION = "0"
   }
 }

firebase-sessions/src/test/kotlin/com/google/firebase/sessions/testing/TestSessionEventData.kt

@@ -61,7 +61,8 @@ internal object TestSessionEventData {
           logEnvironment = LogEnvironment.LOG_ENVIRONMENT_PROD,
           AndroidApplicationInfo(
             packageName = ApplicationProvider.getApplicationContext<Context>().packageName,
-            versionName = FakeFirebaseApp.MOCK_APP_VERSION
+            versionName = FakeFirebaseApp.MOCK_APP_VERSION,
+            buildVersion = FakeFirebaseApp.MOCK_APP_BUILD_VERSION,
           ),
         )
     )