Merge branch 'master' into ehsann/update-or-query-tests

Author: milaGGL

.github/workflows/post_release_cleanup.yml

@@ -0,0 +1,38 @@
+name: Post release cleanup
+
+on:
+  workflow_dispatch:
+    inputs:
+      name:
+        description: 'Release name'
+        required: true
+        type: string
+
+jobs:
+  create-pull-request:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/[email protected]
+        with:
+          fetch-depth: 0
+
+      - name: Run post release cleanup task
+        run: |
+          ./gradlew postReleaseCleanup
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v4
+        with:
+          base: 'master'
+          branch: 'releases/${{ inputs.name }}.mergeback'
+          add-paths: |
+            **/CHANGELOG.md
+            **/gradle.properties
+            **/*.gradle
+            **/*.gradle.kts
+          title: '${{ inputs.name}} mergeback'
+          body: |
+            Auto-generated PR for cleaning up release ${{ inputs.name}}
+            
+            NO_RELEASE_CHANGE
+          commit-message: 'Post release cleanup for ${{ inputs.name }}'

.github/workflows/sessions-e2e.yml

@@ -39,4 +39,4 @@ jobs:
         env:
           FTL_RESULTS_BUCKET: fireescape
         run: |
-          ./gradlew :firebase-sessions:test-app:deviceCheck withErrorProne -PtargetBackend="prod"
+          ./gradlew :firebase-sessions:test-app:deviceCheck withErrorProne -PtargetBackend="prod" -PuseReleasedVersions

README.md

@@ -255,6 +255,11 @@ To run formatting on your entire project you can run
 ./gradlew :<firebase-project>:googleJavaFormat
 ```
 
+To auto-format, just run
+```bash
+./gradlew :<firebase-project>:gJf
+```
+
 #### Kotlin
 
 Kotlin code in this repo is formatted with the `ktfmt` tool. You can enable

appcheck/firebase-appcheck-debug-testing/gradle.properties

@@ -1,2 +1,2 @@
-version=17.0.2
+version=17.1.0
 latestReleasedVersion=17.0.1

appcheck/firebase-appcheck-debug/gradle.properties

@@ -1,2 +1,2 @@
-version=17.0.2
+version=17.1.0
 latestReleasedVersion=17.0.1

appcheck/firebase-appcheck-interop/gradle.properties

@@ -1,2 +1,2 @@
-version=17.0.2
+version=17.1.0
 latestReleasedVersion=17.0.1

appcheck/firebase-appcheck-playintegrity/gradle.properties

@@ -1,2 +1,2 @@
-version=17.0.2
+version=17.1.0
 latestReleasedVersion=17.0.1

appcheck/firebase-appcheck/api.txt

@@ -32,5 +32,23 @@ package com.google.firebase.appcheck {
     method public void onAppCheckTokenChanged(@NonNull com.google.firebase.appcheck.AppCheckToken);
   }
 
+  public final class FirebaseAppCheckKt {
+    method @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck appCheck(@NonNull com.google.firebase.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+    method @NonNull public static operator String component1(@NonNull com.google.firebase.appcheck.AppCheckToken);
+    method public static operator long component2(@NonNull com.google.firebase.appcheck.AppCheckToken);
+    method @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck getAppCheck(@NonNull com.google.firebase.Firebase);
+  }
+
+}
+
+package com.google.firebase.appcheck.ktx {
+
+  public final class FirebaseAppCheckKt {
+    method @Deprecated @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck appCheck(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
+    method @Deprecated @NonNull public static operator String component1(@NonNull com.google.firebase.appcheck.AppCheckToken);
+    method @Deprecated public static operator long component2(@NonNull com.google.firebase.appcheck.AppCheckToken);
+    method @Deprecated @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck getAppCheck(@NonNull com.google.firebase.ktx.Firebase);
+  }
+
 }
 

appcheck/firebase-appcheck/firebase-appcheck.gradle

@@ -14,6 +14,7 @@
 
 plugins {
     id 'firebase-library'
+    id("kotlin-android")
 }
 
 firebaseLibrary {
@@ -44,31 +45,34 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.firebase:firebase-annotations:16.2.0'
-    implementation 'com.google.firebase:firebase-common:20.3.1'
-    implementation 'com.google.firebase:firebase-components:17.1.0'
-    implementation project(':appcheck:firebase-appcheck-interop')
+    androidTestImplementation "androidx.annotation:annotation:1.0.0"
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
+    androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
+    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'junit:junit:4.12'
+    androidTestImplementation 'org.mockito:mockito-core:2.25.0'
+    androidTestImplementation 'org.mockito:mockito-inline:2.25.0'
+    androidTestImplementation project(':appcheck:firebase-appcheck')
+    androidTestImplementation project(':integ-testing')
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+    implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'com.google.android.gms:play-services-base:18.0.1'
     implementation 'com.google.android.gms:play-services-tasks:18.0.1'
-
+    implementation 'com.google.firebase:firebase-annotations:16.2.0'
+    implementation project(':appcheck:firebase-appcheck-interop')
+    implementation project(path: ':appcheck:firebase-appcheck-interop')
+    implementation(project(":firebase-common"))
+    implementation(project(":firebase-common:ktx"))
+    implementation(project(":firebase-components"))
     javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
-
-    testImplementation project(':integ-testing')
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
+    testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
+    testImplementation 'androidx.test:rules:1.2.0'
+    testImplementation 'junit:junit:4.12'
     testImplementation 'junit:junit:4.13-beta-2'
     testImplementation 'org.mockito:mockito-core:2.25.0'
     testImplementation 'org.mockito:mockito-inline:2.25.0'
-    testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation "androidx.test:core:$androidxTestCoreVersion"
-    testImplementation 'androidx.test:rules:1.2.0'
-
-    androidTestImplementation project(':appcheck:firebase-appcheck')
-    androidTestImplementation project(':integ-testing')
-    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
-    androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation "androidx.annotation:annotation:1.0.0"
-    androidTestImplementation 'org.mockito:mockito-core:2.25.0'
-    androidTestImplementation 'org.mockito:mockito-inline:2.25.0'
-}
+    testImplementation project(':integ-testing')
+}

appcheck/firebase-appcheck/gradle.properties

@@ -1,2 +1,2 @@
-version=17.0.2
+version=17.1.0
 latestReleasedVersion=17.0.1

appcheck/firebase-appcheck/ktx/api.txt

@@ -1,11 +1,7 @@
 // Signature format: 2.0
 package com.google.firebase.appcheck.ktx {
 
-  public final class FirebaseAppCheckKt {
-    method @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck appCheck(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
-    method @NonNull public static operator String component1(@NonNull com.google.firebase.appcheck.AppCheckToken);
-    method public static operator long component2(@NonNull com.google.firebase.appcheck.AppCheckToken);
-    method @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck getAppCheck(@NonNull com.google.firebase.ktx.Firebase);
+  public final class LoggingKt {
   }
 
 }

appcheck/firebase-appcheck/ktx/ktx.gradle

@@ -14,13 +14,13 @@
 
 plugins {
     id 'firebase-library'
-    id 'kotlin-android'
+    id("kotlin-android")
 }
 
 firebaseLibrary {
     libraryGroup "appcheck"
     testLab.enabled = true
-    publishJavadoc = true
+    publishJavadoc = false
     publishSources = true
 }
 
@@ -52,22 +52,17 @@ android {
 }
 
 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 'androidx.annotation:annotation:1.1.0'
-    implementation project(path: ':appcheck:firebase-appcheck')
-    implementation project(path: ':appcheck:firebase-appcheck-interop')
-
+    androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
+    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'junit:junit:4.12'
+    api(project(":appcheck:firebase-appcheck"))
+    androidTestImplementation(project(":appcheck:firebase-appcheck-interop"))
+    api(project(":firebase-common"))
+    api(project(":firebase-common:ktx"))
+    implementation(project(":firebase-components"))
+    testImplementation "com.google.truth:truth:$googleTruthVersion"
     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:$androidxTestCoreVersion"
-}
+}

appcheck/firebase-appcheck/ktx/src/main/AndroidManifest.xml

@@ -17,8 +17,8 @@
 
     <application>
         <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
-            <meta-data android:name="com.google.firebase.components:com.google.firebase.appcheck.ktx.FirebaseAppCheckKtxRegistrar"
+            <meta-data android:name="com.google.firebase.components:com.google.firebase.appcheck.ktx.FirebaseAppcheckLegacyRegistrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
     </application>
-</manifest>
+</manifest>

appcheck/firebase-appcheck/ktx/src/main/kotlin/com/google/firebase/appcheck/ktx/Logging.kt

@@ -0,0 +1,30 @@
+// 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.
+package com.google.firebase.appcheck.ktx
+
+import androidx.annotation.Keep
+import com.google.firebase.appcheck.BuildConfig
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.platforminfo.LibraryVersionComponent
+
+internal const val LIBRARY_NAME: String = "fire-app-check-ktx"
+
+/** @suppress */
+@Keep
+class FirebaseAppcheckLegacyRegistrar : ComponentRegistrar {
+  override fun getComponents(): List<Component<*>> {
+    return listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
+  }
+}

appcheck/firebase-appcheck/src/androidTest/java/com/google/firebase/appcheck/FirebaseAppCheckTests.kt

@@ -0,0 +1,101 @@
+// Copyright 2022 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.
+
+package com.google.firebase.appcheck
+
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.app
+import com.google.firebase.initialize
+import com.google.firebase.platforminfo.UserAgentPublisher
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+const val APP_ID = "APP_ID"
+const val API_KEY = "API_KEY"
+
+const val EXISTING_APP = "existing"
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+abstract class BaseTestCase {
+  @Before
+  fun setUp() {
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build()
+    )
+
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
+
+  @After
+  fun cleanUp() {
+    FirebaseApp.clearInstancesForTest()
+  }
+}
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+class FirebaseAppCheckTests : BaseTestCase() {
+  @Test
+  fun appCheck_default_callsDefaultGetInstance() {
+    assertThat(Firebase.appCheck).isSameInstanceAs(FirebaseAppCheck.getInstance())
+  }
+
+  @Test
+  fun appCheck_with_custom_firebaseapp_calls_GetInstance() {
+    val app = Firebase.app(EXISTING_APP)
+    assertThat(Firebase.appCheck(app)).isSameInstanceAs(FirebaseAppCheck.getInstance(app))
+  }
+
+  @Test
+  fun appCheckToken_destructuring_declaration_works() {
+    val mockAppCheckToken =
+      object : AppCheckToken() {
+        override fun getToken(): String = "randomToken"
+
+        override fun getExpireTimeMillis(): Long = 23121997
+      }
+
+    val (token, expiration) = mockAppCheckToken
+
+    assertThat(token).isEqualTo(mockAppCheckToken.token)
+    assertThat(expiration).isEqualTo(mockAppCheckToken.expireTimeMillis)
+  }
+}
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+class LibraryVersionTest : BaseTestCase() {
+  @Test
+  fun libraryRegistrationAtRuntime() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+  }
+}