Rename

Author: samedson

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

@@ -41,7 +41,7 @@ internal data class AndroidApplicationInfo(
   val versionName: String,
 
   /** The build version of the application. */
-  val buildVersion: String,
+  val appBuildVersion: String,
 
   /** The manufacturer of the device that runs the application. */
   val deviceManufacturer: String,
@@ -58,7 +58,7 @@ internal data class ApplicationInfo(
   val sessionSdkVersion: String,
 
   /** The display version of the Android operating system. */
-  val osDisplayVersion: String,
+  val osVersion: String,
 
   /** The logging environment for the events. */
   val logEnvironment: LogEnvironment,

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

@@ -81,7 +81,7 @@ internal object SessionEvents {
             ctx.add(FieldDescriptor.of("app_id"), applicationInfo.appId)
             ctx.add(FieldDescriptor.of("device_model"), applicationInfo.deviceModel)
             ctx.add(FieldDescriptor.of("session_sdk_version"), applicationInfo.sessionSdkVersion)
-            ctx.add(FieldDescriptor.of("os_version"), applicationInfo.osDisplayVersion)
+            ctx.add(FieldDescriptor.of("os_version"), applicationInfo.osVersion)
             ctx.add(FieldDescriptor.of("log_environment"), applicationInfo.logEnvironment)
             ctx.add(FieldDescriptor.of("android_app_info"), applicationInfo.androidAppInfo)
           }
@@ -93,7 +93,7 @@ internal object SessionEvents {
           run {
             ctx.add(FieldDescriptor.of("package_name"), androidAppInfo.packageName)
             ctx.add(FieldDescriptor.of("version_name"), androidAppInfo.versionName)
-            ctx.add(FieldDescriptor.of("app_build_version"), androidAppInfo.buildVersion)
+            ctx.add(FieldDescriptor.of("app_build_version"), androidAppInfo.appBuildVersion)
             ctx.add(FieldDescriptor.of("device_manufacturer"), androidAppInfo.deviceManufacturer)
           }
         }
@@ -133,13 +133,13 @@ internal object SessionEvents {
       appId = firebaseApp.options.applicationId,
       deviceModel = Build.MODEL,
       sessionSdkVersion = BuildConfig.VERSION_NAME,
-      osDisplayVersion = Build.VERSION.RELEASE,
+      osVersion = Build.VERSION.RELEASE,
       logEnvironment = LogEnvironment.LOG_ENVIRONMENT_PROD,
       androidAppInfo =
         AndroidApplicationInfo(
           packageName = packageName,
           versionName = packageInfo.versionName,
-          buildVersion = packageInfo.versionCode.toString(),
+          appBuildVersion = packageInfo.versionCode.toString(),
           deviceManufacturer = Build.MANUFACTURER,
         )
     )

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

@@ -39,12 +39,12 @@ class ApplicationInfoTest {
           appId = FakeFirebaseApp.MOCK_APP_ID,
           deviceModel = Build.MODEL,
           sessionSdkVersion = BuildConfig.VERSION_NAME,
-          osDisplayVersion = Build.VERSION.RELEASE,
+          osVersion = Build.VERSION.RELEASE,
           logEnvironment = LogEnvironment.LOG_ENVIRONMENT_PROD,
           AndroidApplicationInfo(
             packageName = ApplicationProvider.getApplicationContext<Context>().packageName,
             versionName = FakeFirebaseApp.MOCK_APP_VERSION,
-            buildVersion = FakeFirebaseApp.MOCK_APP_BUILD_VERSION,
+            appBuildVersion = FakeFirebaseApp.MOCK_APP_BUILD_VERSION,
             deviceManufacturer = Build.MANUFACTURER,
           )
         )

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

@@ -104,12 +104,12 @@ class SessionEventEncoderTest {
             appId = "",
             deviceModel = "",
             sessionSdkVersion = "",
-            osDisplayVersion = "",
+            osVersion = "",
             logEnvironment = LogEnvironment.LOG_ENVIRONMENT_PROD,
             AndroidApplicationInfo(
               packageName = "",
               versionName = "",
-              buildVersion = "",
+              appBuildVersion = "",
               deviceManufacturer = "",
             ),
           )

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

@@ -57,12 +57,12 @@ internal object TestSessionEventData {
           appId = FakeFirebaseApp.MOCK_APP_ID,
           deviceModel = Build.MODEL,
           sessionSdkVersion = BuildConfig.VERSION_NAME,
-          osDisplayVersion = Build.VERSION.RELEASE,
+          osVersion = Build.VERSION.RELEASE,
           logEnvironment = LogEnvironment.LOG_ENVIRONMENT_PROD,
           AndroidApplicationInfo(
             packageName = ApplicationProvider.getApplicationContext<Context>().packageName,
             versionName = FakeFirebaseApp.MOCK_APP_VERSION,
-            buildVersion = FakeFirebaseApp.MOCK_APP_BUILD_VERSION,
+            appBuildVersion = FakeFirebaseApp.MOCK_APP_BUILD_VERSION,
             deviceManufacturer = Build.MANUFACTURER,
           ),
         )