Merge branch 'firebase-sessions' into sessions-workflow

# Conflicts:
#	.github/workflows/sessions-e2e.yml

Author: mrober

.github/workflows/merge-to-main.yml

@@ -26,15 +26,5 @@ jobs:
           using a feature branch first, and only merge into the main
           branch when the code complete and ready to be released.
 
-
-          **Add the 'main-merge-ack' label to your PR to confirm
-          merging into the main branch is intended.**
-
-    - name: Label checker
-      if: "!contains( github.event.pull_request.labels.*.name, 'main-merge-ack')"
-      run: |
-        echo Missing 'main-merge-ack' label. Read the comment about merging to master in your PR for more information.
-        exit 1
-
     - name: Success
       run: exit 0

.github/workflows/sessions-e2e.yml

@@ -1,7 +1,7 @@
 name: Firebase Sessions E2E Tests
 
 on:
-  workflow_dispatch:     # allow triggering the workflow manually
+  workflow_dispatch: # allow triggering the workflow manually
 
 concurrency:
   group: ${{ github.workflow }}
@@ -10,26 +10,29 @@ env:
   SESSIONS_E2E_GOOGLE_SERVICES: ${{ secrets.SESSIONS_E2E_GOOGLE_SERVICES }}
 
 jobs:
-  test:
+  build:
+
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        environment: [ prod, autopush ]
+
     steps:
-      - name: Checkout firebase-android-sdk
-        uses: actions/checkout@v3
-
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
-        with:
-          java-version: 11
-          distribution: temurin
-          cache: gradle
-
-      - name: Add google-services.json
-        run: |
-          echo $SESSIONS_E2E_GOOGLE_SERVICES | base64 -d > google-services.json
-
-      - name: Run sessions end-to-end tests
-        run: |
-          ./gradlew firebase-sessions:deviceCheck withErrorProne -PtargetBackend="prod"
+    - name: Checkout firebase-sessions
+      uses: actions/checkout@v3
+      with:
+        ref: 'firebase-sessions'
+
+    - name: set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        cache: gradle
+
+    - name: Add google-services.json
+      run: |
+        echo $SESSIONS_E2E_GOOGLE_SERVICES | base64 -d > google-services.json
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+
+    - name: Run sessions end-to-end tests
+      run: ./gradlew firebase-sessions:deviceCheck withErrorProne -PtargetBackend="prod"

buildSrc/src/main/java/com/google/firebase/gradle/plugins/LibraryGroupRegistrar.kt

@@ -26,10 +26,14 @@ class LibraryGroupRegistrar {
       librariesByGroup
         .get(libraryGroup)
         .map { it.project.version.toString() }
-        .filter { it.first().isDigit() } // to filter out any flag values
+        .mapNotNull { ModuleVersion.fromStringOrNull(it) }
         .maxOrNull()
-        ?: "unspecified"
-    librariesByGroup.get(libraryGroup).forEach { it.project.version = maxVersion }
+    if (maxVersion != null) {
+      librariesByGroup
+        .get(libraryGroup)
+        .filter { ModuleVersion.fromStringOrNull(it.project.version.toString()) == null }
+        .forEach { it.project.version = maxVersion.toString() }
+    }
   }
 
   fun getLibrariesForGroup(name: String) = librariesByGroup.get(name)

buildSrc/src/main/java/com/google/firebase/gradle/plugins/ModuleVersion.kt

@@ -57,17 +57,17 @@ enum class PreReleaseVersionType {
  *
  * Note that `build` will always be present as starting at one by defalt. That is, the following
  * transform occurs:
- *
  * ```
  * "12.13.1-beta" // 12.13.1-beta01
  * ```
  *
  * @see fromStringsOrNull
- *
  * @property type an enum of [PreReleaseVersionType] that identifies the pre-release identifier
  * @property build an [Int] that specifies the build number; defaults to one
  */
-data class PreReleaseVersion(val type: PreReleaseVersionType, val build: Int = 1) {
+data class PreReleaseVersion(val type: PreReleaseVersionType, val build: Int = 1) :
+  Comparable<PreReleaseVersion> {
+
   companion object {
 
     /**
@@ -77,7 +77,6 @@ data class PreReleaseVersion(val type: PreReleaseVersionType, val build: Int = 1
      * [PreReleaseVersion].
      *
      * Example Usage:
-     *
      * ```
      * PreReleaseVersion.fromStringsOrNull("alpha", "6") // PreReleaseVersion(ALPHA, 6)
      * PreReleaseVersion.fromStringsOrNull("Beta", "") // PreReleaseVersion(BETA, 1)
@@ -87,7 +86,6 @@ data class PreReleaseVersion(val type: PreReleaseVersionType, val build: Int = 1
      * @param type a case insensitive string of any [PreReleaseVersionType]
      * @param build a string number; gets automatically converted to double digits, and defaults to
      * one if blank
-     *
      * @return a [PreReleaseVersion] created from the string, or null if the string was invalid.
      */
     fun fromStringsOrNull(type: String, build: String): PreReleaseVersion? =
@@ -100,14 +98,16 @@ data class PreReleaseVersion(val type: PreReleaseVersionType, val build: Int = 1
         .getOrNull()
   }
 
+  override fun compareTo(other: PreReleaseVersion) =
+    compareValuesBy(this, other, { it.type }, { it.build })
+
   /** Returns a copy of this [PreReleaseVersion], with the [build] increased by one. */
   fun bump() = copy(build = build + 1)
 
   /**
    * Formatted as `TypeBuild`
    *
    * For example:
-   *
    * ```
    * PreReleaseVersion(ALPHA, 5).toString() // "alpha05"
    * PreReleaseVersion(RC, 12).toString() // "rc12"
@@ -124,21 +124,32 @@ data class PreReleaseVersion(val type: PreReleaseVersionType, val build: Int = 1
  *
  * To see rules about pre-release (`PRE`) formatting, see [PreReleaseVersion].
  *
+ * @see fromStringOrNull
  * @property major An update that represents breaking changes
  * @property minor An update that represents new functionality
  * @property patch An update that represents bug fixes
  * @property pre An update that represents unstable changes not ready for a full release
- * @see fromStringOrNull
  */
 data class ModuleVersion(
   val major: Int,
   val minor: Int,
   val patch: Int,
   val pre: PreReleaseVersion? = null
-) {
+) : Comparable<ModuleVersion> {
 
   /** Formatted as `MAJOR.MINOR.PATCH-PRE` */
-  override fun toString() = "$major.$minor.$patch${pre?.let { "-${it.toString()}" }}"
+  override fun toString() = "$major.$minor.$patch${pre?.let { "-${it.toString()}" } ?: ""}"
+
+  override fun compareTo(other: ModuleVersion) =
+    compareValuesBy(
+      this,
+      other,
+      { it.major },
+      { it.minor },
+      { it.patch },
+      { it.pre == null }, // a version with no prerelease version takes precedence
+      { it.pre }
+    )
 
   companion object {
     /**
@@ -149,15 +160,13 @@ data class ModuleVersion(
      * `(N digits).(N digits).(N digits)-(maybe letters)(maybe numbers)`
      *
      * For example, the following would be valid matches:
-     *
      * ```
      * "13.1.5" // valid
      * "5.0.5-beta" // valid
      * "19.45.12-rc09" // valid
      * ```
      *
      * While the following would not be:
-     *
      * ```
      * "1.3.4-" // invalid
      * "16.2.3-01" // invalid
@@ -181,7 +190,6 @@ data class ModuleVersion(
      * ```
      *
      * @param str a [String] that matches the SemVer format.
-     *
      * @return a [ModuleVersion] created from the string, or null if the string was invalid.
      */
     fun fromStringOrNull(str: String): ModuleVersion? =

buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/PublishingPluginTests.kt

@@ -247,14 +247,13 @@ licenses {
 
   @Test
   fun `Publish project should also publish coreleased projects`() {
-    val project1 = Project(name = "childProject1", version = "1.0", libraryGroup = "test123")
+    val project1 = Project(name = "childProject1", version = "1.0.0", libraryGroup = "test123")
     val project2 =
       Project(
         name = "childProject2",
-        version = "0.9",
         projectDependencies = setOf(project1),
         libraryGroup = "test123",
-        expectedVersion = "1.0"
+        expectedVersion = "1.0.0"
       )
     subprojectsDefined(project1, project2)
 

docs/make_release_notes.py

@@ -45,7 +45,7 @@ def get_ktx_header(self):
         if not self.has_ktx:
             return ''
         version_str = f'{{: #{self.version_name}-ktx_v{self.version.replace(".", "-")}}}'
-        return f'### {self.alt_name} Kotlin extensions version {self.version} {version_str}\n'
+        return f'#### {self.alt_name} Kotlin extensions version {self.version} {version_str}\n'
 
     def _get_version(self):
         properties = os.path.join(os.path.dirname(self.path),

firebase-crashlytics/CHANGELOG.md

@@ -1,4 +1,5 @@
 # Unreleased
+* [feature] Added collection of version control information generated by the AGP.
 
 # 18.3.6
 * [feature] Added support for upcoming [crashlytics] features to report

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsController.java

@@ -22,6 +22,7 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.StatFs;
+import android.util.Base64;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.gms.tasks.SuccessContinuation;
@@ -39,9 +40,11 @@
 import com.google.firebase.crashlytics.internal.persistence.FileStore;
 import com.google.firebase.crashlytics.internal.settings.Settings;
 import com.google.firebase.crashlytics.internal.settings.SettingsProvider;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -70,6 +73,10 @@ class CrashlyticsController {
 
   private static final String GENERATOR_FORMAT = "Crashlytics Android SDK/%s";
 
+  private static final String VERSION_CONTROL_INFO_KEY = "com.crashlytics.version-control-info";
+  private static final String VERSION_CONTROL_INFO_FILE = "version-control-info.textproto";
+  private static final String META_INF_FOLDER = "META-INF/";
+
   private final Context context;
   private final DataCollectionArbiter dataCollectionArbiter;
   private final CrashlyticsFileMarker crashMarker;
@@ -611,6 +618,56 @@ List<File> listAppExceptionMarkerFiles() {
     return fileStore.getCommonFiles(APP_EXCEPTION_MARKER_FILTER);
   }
 
+  void saveVersionControlInfo() {
+    try {
+      String versionControlInfo = getVersionControlInfo();
+      if (versionControlInfo != null) {
+        setInternalKey(VERSION_CONTROL_INFO_KEY, versionControlInfo);
+        Logger.getLogger().i("Saved version control info");
+      }
+    } catch (IOException e) {
+      Logger.getLogger().w("Unable to save version control info", e);
+    }
+  }
+
+  String getVersionControlInfo() throws IOException {
+    InputStream is = getResourceAsStream(META_INF_FOLDER + VERSION_CONTROL_INFO_FILE);
+    if (is == null) {
+      return null;
+    }
+
+    Logger.getLogger().d("Read version control info");
+    return Base64.encodeToString(readResource(is), 0);
+  }
+
+  private InputStream getResourceAsStream(String resource) {
+    ClassLoader classLoader = this.getClass().getClassLoader();
+    if (classLoader == null) {
+      Logger.getLogger().w("Couldn't get Class Loader");
+      return null;
+    }
+
+    InputStream is = classLoader.getResourceAsStream(resource);
+    if (is == null) {
+      Logger.getLogger().i("No version control information found");
+      return null;
+    }
+
+    return is;
+  }
+
+  private static byte[] readResource(InputStream is) throws IOException {
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    byte[] buffer = new byte[1024];
+    int length;
+
+    while ((length = is.read(buffer)) != -1) {
+      out.write(buffer, 0, length);
+    }
+
+    return out.toByteArray();
+  }
+
   private void finalizePreviousNativeSession(String previousSessionId) {
     Logger.getLogger().v("Finalizing native report for session " + previousSessionId);
     NativeSessionFileProvider nativeSessionFileProvider =

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCore.java

@@ -227,6 +227,8 @@ private Task<Void> doBackgroundInitialization(SettingsProvider settingsProvider)
     try {
       breadcrumbSource.registerBreadcrumbHandler(this::log);
 
+      controller.saveVersionControlInfo();
+
       final Settings settingsData = settingsProvider.getSettingsSync();
 
       if (!settingsData.featureFlagData.collectReports) {

firebase-sessions/test-app/src/main/kotlin/com/google/firebase/testing/sessions/MainActivity.kt

@@ -19,12 +19,13 @@ package com.google.firebase.testing.sessions
 import android.os.Bundle
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
+import com.google.firebase.sessions.FirebaseSessions
 
 class MainActivity : AppCompatActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_main)
 
-    findViewById<TextView>(R.id.greeting_text).text = getString(R.string.firebase_greetings)
+    findViewById<TextView>(R.id.greeting_text).text = FirebaseSessions.instance.greeting()
   }
 }

firebase-sessions/test-app/test-app.gradle.kts

@@ -17,6 +17,7 @@
 plugins {
   id("com.android.application")
   id("org.jetbrains.kotlin.android")
+  id("com.google.gms.google-services")
 }
 
 android {
@@ -47,5 +48,5 @@ dependencies {
   implementation("com.google.android.material:material:1.8.0")
 }
 
-extra["packageName"] = "com.google.firebase.testing.sessions"
-apply(from = "../../gradle/googleServices.gradle")
+// extra["packageName"] = "com.google.firebase.testing.sessions"
+// apply(from = "../../gradle/googleServices.gradle")

firebase-storage/firebase-storage.gradle

@@ -102,7 +102,7 @@ dependencies {
     testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation 'androidx.test:rules:1.2.0'
     testImplementation 'androidx.test:core:1.2.0'
-    testImplementation project(':appcheck:firebase-appcheck')
+    testImplementation 'com.google.firebase:firebase-appcheck:16.1.1'
 }
 
 // ==========================================================================