Merge branch 'master' into executors

Author: vkryachko

.github/workflows/build-release-artifacts.yml

@@ -0,0 +1,25 @@
+name: Build Release Artifacts
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - 'releases/**'
+
+jobs:
+  build-artifacts:
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Perform gradle build
+        run: |
+          ./gradlew  firebasePublish -PprojectsToPublish=firebase-firestore -PpublishMode=RELEASE -PincludeFireEscapeArtifacts=true
+      - name: Upload generated artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: release_artifacts.zip
+          path: build/*.zip
+          retention-days: 5

.github/workflows/create_releases.yml

@@ -17,11 +17,11 @@ jobs:
       - name: Create base branch
         uses: peterjgrainger/[email protected]
         with:
-          branch: '${{ inputs.name }}'
+          branch: 'releases/${{ inputs.name }}'
       - name: Create release branch
         uses: peterjgrainger/[email protected]
         with:
-          branch: '${{ inputs.name }}.release'
+          branch: 'releases/${{ inputs.name }}.release'
 
   create-pull-request:
     runs-on: ubuntu-latest
@@ -44,6 +44,6 @@ jobs:
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v4
         with:
-          base: '${{ inputs.name }}'
-          branch: '${{ inputs.name }}.release'
+          base: 'releases/${{ inputs.name }}'
+          branch: 'releases/${{ inputs.name }}.release'
           title: '${{ inputs.name}} release'

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

@@ -0,0 +1,40 @@
+name: Merge to main
+
+on:
+  pull_request:
+    branches:
+      - master
+    types:
+      - opened
+      - labeled
+      - unlabeled
+
+jobs:
+  pr-message:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+    - uses: mshick/add-pr-comment@v2
+      with:
+        message: >
+          ### 📝 PRs merging into main branch
+
+          **Our main branch should always be in a releasable state**.
+          If you are working on a larger change, or if you don't want
+          this change to see the light of the day just yet, consider
+          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

appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/SafetyNetAppCheckProviderFactory.java

@@ -23,10 +23,7 @@
 /**
  * Implementation of an {@link AppCheckProviderFactory} that builds {@link
  * SafetyNetAppCheckProvider}s. This is the default implementation.
- *
- * @deprecated Use {@code PlayIntegrityAppCheckProviderFactory} instead.
  */
-@Deprecated
 public class SafetyNetAppCheckProviderFactory implements AppCheckProviderFactory {
 
   private static final SafetyNetAppCheckProviderFactory instance =
@@ -37,10 +34,7 @@ private SafetyNetAppCheckProviderFactory() {}
   /**
    * Gets an instance of this class for installation into a {@link
    * com.google.firebase.appcheck.FirebaseAppCheck} instance.
-   *
-   * @deprecated Use {@code PlayIntegrityAppCheckProviderFactory#getInstance} instead.
    */
-  @Deprecated
   @NonNull
   public static SafetyNetAppCheckProviderFactory getInstance() {
     return instance;

appcheck/firebase-appcheck/ktx/src/androidTest/kotlin/com/google/firebase/appcheck/ktx/FirebaseAppCheckTests.kt

@@ -37,70 +37,70 @@ 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()
-        )
+  @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
-        )
-    }
+    Firebase.initialize(
+      ApplicationProvider.getApplicationContext(),
+      FirebaseOptions.Builder()
+        .setApplicationId(APP_ID)
+        .setApiKey(API_KEY)
+        .setProjectId("123")
+        .build(),
+      EXISTING_APP
+    )
+  }
 
-    @After
-    fun cleanUp() {
-        FirebaseApp.clearInstancesForTest()
-    }
+  @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_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 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"
+  @Test
+  fun appCheckToken_destructuring_declaration_works() {
+    val mockAppCheckToken =
+      object : AppCheckToken() {
+        override fun getToken(): String = "randomToken"
 
-            override fun getExpireTimeMillis(): Long = 23121997
-        }
+        override fun getExpireTimeMillis(): Long = 23121997
+      }
 
-        val (token, expiration) = mockAppCheckToken
+    val (token, expiration) = mockAppCheckToken
 
-        assertThat(token).isEqualTo(mockAppCheckToken.token)
-        assertThat(expiration).isEqualTo(mockAppCheckToken.expireTimeMillis)
-    }
+    assertThat(token).isEqualTo(mockAppCheckToken.token)
+    assertThat(expiration).isEqualTo(mockAppCheckToken.expireTimeMillis)
+  }
 }
 
 internal const val LIBRARY_NAME: String = "fire-app-check-ktx"
 
 @RunWith(AndroidJUnit4ClassRunner::class)
 class LibraryVersionTest : BaseTestCase() {
-    @Test
-    fun libraryRegistrationAtRuntime() {
-        val publisher = Firebase.app.get(UserAgentPublisher::class.java)
-        assertThat(publisher.userAgent).contains(LIBRARY_NAME)
-    }
+  @Test
+  fun libraryRegistrationAtRuntime() {
+    val publisher = Firebase.app.get(UserAgentPublisher::class.java)
+    assertThat(publisher.userAgent).contains(LIBRARY_NAME)
+  }
 }

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

@@ -25,7 +25,7 @@ import com.google.firebase.platforminfo.LibraryVersionComponent
 
 /** Returns the [FirebaseAppCheck] instance of the default [FirebaseApp]. */
 val Firebase.appCheck: FirebaseAppCheck
-    get() = FirebaseAppCheck.getInstance()
+  get() = FirebaseAppCheck.getInstance()
 
 /** Returns the [FirebaseAppCheck] instance of a given [FirebaseApp]. */
 fun Firebase.appCheck(app: FirebaseApp) = FirebaseAppCheck.getInstance(app)
@@ -48,6 +48,6 @@ internal const val LIBRARY_NAME: String = "fire-app-check-ktx"
 
 /** @suppress */
 class FirebaseAppCheckKtxRegistrar : ComponentRegistrar {
-    override fun getComponents(): List<Component<*>> =
-            listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
+  override fun getComponents(): List<Component<*>> =
+    listOf(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
 }

build.gradle

@@ -39,7 +39,7 @@ buildscript {
         classpath 'net.ltgt.gradle:gradle-errorprone-plugin:1.3.0'
         classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9'
         classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'org.jlleitschuh.gradle:ktlint-gradle:9.2.1'
+        classpath "com.ncorti.ktfmt.gradle:plugin:0.11.0"
     }
 }
 
@@ -87,7 +87,11 @@ configure(subprojects) {
         }
     }
 
-    apply plugin: "org.jlleitschuh.gradle.ktlint"
+    apply plugin: "com.ncorti.ktfmt.gradle"
+
+    ktfmt {
+        googleStyle()
+    }
 }
 
 task clean(type: Delete) {

buildSrc/build.gradle.kts

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 plugins {
-    id("org.jlleitschuh.gradle.ktlint") version "9.2.1"
+    id("com.ncorti.ktfmt.gradle") version "0.11.0"
     id("com.github.sherter.google-java-format") version "0.9"
     `kotlin-dsl`
 }
@@ -32,7 +32,11 @@ repositories {
 val perfPluginVersion = System.getenv("FIREBASE_PERF_PLUGIN_VERSION") ?: "1.4.1"
 
 googleJavaFormat {
-    toolVersion = "1.10.0"
+    toolVersion = "1.15.0"
+}
+
+ktfmt {
+    googleStyle()
 }
 
 dependencies {

buildSrc/src/main/java/com/google/firebase/gradle/NdkBinaryFixTask.kt

@@ -0,0 +1,45 @@
+// Copyright 2021 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.gradle
+
+import java.io.File
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+
+abstract class NdkBinaryFixTask : DefaultTask() {
+  @get:InputFile abstract val inputFile: RegularFileProperty
+
+  @get:OutputFile
+  val outputFile: File
+    get() = inputFile.get().asFile.let { File(it.parentFile, "lib${it.name}.so") }
+
+  @get:Internal
+  val into: String
+    get() = "jni/${outputFile.parentFile.name}"
+
+  @TaskAction
+  fun run() {
+    Files.copy(
+      inputFile.get().asFile.toPath(),
+      outputFile.toPath(),
+      StandardCopyOption.REPLACE_EXISTING
+    )
+  }
+}