Merge Firebase Sessions into main line

.github/workflows/ci_tests.yml

@@ -56,6 +56,12 @@ jobs:
           distribution: temurin
           cache: gradle
 
+      - name: Add google-services.json
+        env:
+          INTEG_TESTS_GOOGLE_SERVICES: ${{ secrets.INTEG_TESTS_GOOGLE_SERVICES }}
+        run: |
+          echo $INTEG_TESTS_GOOGLE_SERVICES | base64 -d > google-services.json
+
       - name: ${{ matrix.module }} Unit Tests
         env:
           FIREBASE_CI: 1

build.gradle

@@ -39,6 +39,7 @@ buildscript {
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "com.ncorti.ktfmt.gradle:plugin:0.11.0"
         classpath 'com.google.firebase:firebase-appdistribution-gradle:3.0.2'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
     }
 }
 

ci/fireci/fireciplugins/macrobenchmark/run/runner.py

@@ -132,6 +132,7 @@ def _process_changed_modules(path: Path) -> List[str]:
     ":firebase-messaging-directboot": ["fire-fcm"],
     ":firebase-ml-modeldownloader": ["firebase-ml-modeldownloader"],
     ":firebase-perf": ["fire-perf"],
+    ":firebase-sessions": ["fire-sessions"],
     ":firebase-storage": ["fire-gcs"],
     ":transport": ["fire-transport"],
   }

firebase-crashlytics/firebase-crashlytics.gradle

@@ -72,6 +72,7 @@ dependencies {
     runtimeOnly 'com.google.firebase:firebase-installations:17.1.3'
     implementation 'com.google.firebase:firebase-measurement-connector:18.0.2'
     implementation "com.google.android.gms:play-services-tasks:18.0.1"
+    implementation project(':firebase-sessions')
 
     javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2'
 

firebase-crashlytics/ktx/ktx.gradle

@@ -13,60 +13,44 @@
 // limitations under the License.
 
 plugins {
-    id 'firebase-library'
-    id 'kotlin-android'
+  id "firebase-library"
+  id "kotlin-android"
 }
 
 firebaseLibrary {
-    libraryGroup "crashlytics"
-    testLab.enabled = true
-    publishJavadoc = true
-    publishSources = true
+  libraryGroup "crashlytics"
+  testLab.enabled = true
+  publishJavadoc = true
+  publishSources = true
 }
 
 android {
-    compileSdkVersion project.targetSdkVersion
-    defaultConfig {
-        minSdkVersion 16
-        multiDexEnabled true
-        targetSdkVersion project.targetSdkVersion
-        versionName version
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-        test.java {
-            srcDir 'src/test/kotlin'
-        }
-        androidTest.java.srcDirs += 'src/androidTest/kotlin'
-    }
-    testOptions.unitTests.includeAndroidResources = true
+  compileSdk 33
+  defaultConfig {
+    minSdk 16
+    multiDexEnabled true
+    targetSdk 33
+    versionName version
+    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+  }
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+  kotlinOptions {
+    jvmTarget = '1.8'
+  }
+  testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-
-    implementation 'com.google.firebase:firebase-common:20.3.1'
-    implementation 'com.google.firebase:firebase-components:17.1.0'
-    implementation 'com.google.firebase:firebase-common-ktx:20.3.1'
-    implementation project(':firebase-crashlytics')
-    implementation 'androidx.annotation:annotation:1.1.0'
-
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'junit:junit:4.12'
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'org.mockito:mockito-core:2.25.0'
-
-    androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test:core:1.2.0'
+  implementation "com.google.firebase:firebase-common-ktx:20.3.2"
+  implementation "com.google.firebase:firebase-common:20.3.2"
+  implementation "com.google.firebase:firebase-components:17.1.0"
+  implementation(libs.androidx.annotation)
+  implementation project(":firebase-crashlytics")
+
+  androidTestImplementation(libs.androidx.test.junit)
+  androidTestImplementation(libs.androidx.test.runner)
+  androidTestImplementation(libs.truth)
 }
-
-// ==========================================================================
-// Copy from here down if you want to use the google-services plugin in your
-// androidTest integration tests.
-// ==========================================================================
-ext.packageName = "com.google.firebase.crashlytics.ktx"
-apply from: '../../gradle/googleServices.gradle'
-

firebase-crashlytics/ktx/src/androidTest/AndroidManifest.xml

@@ -1,13 +1,27 @@
+<!--
+  ~ Copyright 2023 Google LLC
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.google.firebase.crashlytics.ktx">
-  <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-  <!--<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />-->
-  <uses-permission android:name="android.permission.INTERNET"/>
+  package="com.google.firebase.crashlytics.ktx"
+  android:versionCode="1"
+  android:versionName="1.0.0">
+
   <application>
-    <uses-library android:name="android.test.runner" />
+
   </application>
 
-  <instrumentation
-    android:name="androidx.test.runner.AndroidJUnitRunner"
-    android:targetPackage="com.google.firebase.crashlytics.ktx" />
+  <uses-permission android:name="android.permission.INTERNET" />
 </manifest>

firebase-crashlytics/ktx/src/androidTest/kotlin/com/google/firebase/crashlytics/ktx/CrashlyticsTests.kt

@@ -14,36 +14,38 @@
 
 package com.google.firebase.crashlytics.ktx
 
-import androidx.test.InstrumentationRegistry
-import androidx.test.runner.AndroidJUnit4
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.ktx.app
 import com.google.firebase.ktx.initialize
 import com.google.firebase.platforminfo.UserAgentPublisher
-import org.junit.AfterClass
-import org.junit.BeforeClass
+import org.junit.After
+import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class CrashlyticsTests {
-  companion object {
-    lateinit var app: FirebaseApp
-
-    @BeforeClass
-    @JvmStatic
-    fun setup() {
-      app = Firebase.initialize(InstrumentationRegistry.getContext())!!
-    }
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId(PROJECT_ID)
+        .build()
+    )
+  }
 
-    @AfterClass
-    @JvmStatic
-    fun cleanup() {
-      app.delete()
-    }
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
   }
 
   @Test
@@ -52,32 +54,14 @@ class CrashlyticsTests {
   }
 
   @Test
-  fun testDataCall() {
-    assertThat("hola").isEqualTo("hola")
+  fun libraryRegistrationAtRuntime() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+    assertThat(publisher.userAgent).contains(FirebaseCrashlyticsKtxRegistrar.LIBRARY_NAME)
   }
-}
 
-@RunWith(AndroidJUnit4::class)
-class LibraryVersionTest {
   companion object {
-    lateinit var app: FirebaseApp
-
-    @BeforeClass
-    @JvmStatic
-    fun setup() {
-      app = Firebase.initialize(InstrumentationRegistry.getContext())!!
-    }
-
-    @AfterClass
-    @JvmStatic
-    fun cleanup() {
-      app.delete()
-    }
-  }
-
-  @Test
-  fun libraryRegistrationAtRuntime() {
-    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
-    assertThat(publisher.userAgent).contains(LIBRARY_NAME)
+    private const val APP_ID = "1:1:android:1a"
+    private const val API_KEY = "API-KEY-API-KEY-API-KEY-API-KEY-API-KEY"
+    private const val PROJECT_ID = "PROJECT-ID"
   }
 }

firebase-crashlytics/ktx/src/main/kotlin/com/google/firebase/crashlytics/ktx/FirebaseCrashlytics.kt

@@ -32,11 +32,13 @@ fun FirebaseCrashlytics.setCustomKeys(init: KeyValueBuilder.() -> Unit) {
   builder.init()
 }
 
-internal const val LIBRARY_NAME: String = "fire-cls-ktx"
-
 /** @suppress */
 @Keep
-class FirebaseCrashlyticsKtxRegistrar : ComponentRegistrar {
+internal class FirebaseCrashlyticsKtxRegistrar : ComponentRegistrar {
   override fun getComponents(): List<Component<*>> =
     listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
+
+  companion object {
+    internal const val LIBRARY_NAME: String = "fire-cls-ktx"
+  }
 }

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreInitializationTest.java

@@ -136,7 +136,8 @@ public CrashlyticsCore build() {
           new DisabledBreadcrumbSource(),
           new UnavailableAnalyticsEventLogger(),
           fileStore,
-          crashHandlerExecutor);
+          crashHandlerExecutor,
+          mock(CrashlyticsAppQualitySessionsSubscriber.class));
     }
   }
 

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreTest.java

@@ -426,7 +426,8 @@ CrashlyticsCore build(Context context) {
               breadcrumbSource,
               new UnavailableAnalyticsEventLogger(),
               new FileStore(context),
-              new SameThreadExecutorService());
+              new SameThreadExecutorService(),
+              mock(CrashlyticsAppQualitySessionsSubscriber.class));
       return crashlyticsCore;
     }
   }