fix merge conflicts with version-10.0.0-dev (#2276)

* Begin development on 9.1.0

* chore: use minSdk=23 for auth, and minSdk=21 for other modules (#2196)

* fix(auth): remove enableHints parsing from FlowParameters (#2199)

* feat: add support for API 35 EdgeToEdge (#2187)

* Revert "chore: use minSdk=23 for auth, and minSdk=21 for other modules (#2196)"

This reverts commit eca0ca3

* Version 9.1.0

* chore(*): update release infrastructure

* Version 9.1.1 (#2257)

---------

Co-authored-by: rosariopf <[email protected]>
Co-authored-by: Guillaume Bernos <[email protected]>

Author: 3 people

buildSrc/src/main/kotlin/Config.kt

@@ -16,7 +16,7 @@ object Config {
         const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         const val google = "com.google.gms:google-services:4.3.8"
 
-        const val mavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.30.0"
+        const val mavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.34.0"
         const val buildInfo = "org.jfrog.buildinfo:build-info-extractor-gradle:4.15.2"
     }
 

docs/internal/releasing.md

@@ -48,7 +48,7 @@ When ready, merge the pull request.
 ### Credentials
 
 The library is published to Maven Central by the `firebase-sonatype` account, Googlers can find the
-password for this account in [Valentine](http://go/valentine/)
+password for this account in [Valentine](http://go/valentine/).
 
 ### GPG Key
 
@@ -100,8 +100,8 @@ sudo pkill dirmngr
 
 ### Local Properties
 
-1. Navigate to https://oss.sonatype.org/ and **Log In** using the credentials from [Valentine](http://go/valentine).
-1. Follow [these instructions](https://central.sonatype.org/publish/generate-token/) to **Access User Token**.
+1. Navigate to https://central.sonatype.com/ and **Log In** using the credentials from [Valentine](http://go/valentine).
+1. Go to [View user tokens](https://central.sonatype.com/usertoken) and generate a new token.
     You should see an XML that looks like this:
     ```xml
     <server>
@@ -122,11 +122,6 @@ mavenCentralPassword=<PASSWORD FROM THE XML ABOVE (eg. tokenkey-dlghnfgh8+4LfXmg
 
 ## 2b - Publish and release
 
-_Publish_ and _release_ [used to be done](https://github.com/firebase/FirebaseUI-Android/blob/9.0.0/docs/internal/releasing.md#2b---publish-and-release)
-in two separate manual steps, but starting in [v0.22.0](https://vanniktech.github.io/gradle-maven-publish-plugin/changelog/#0220-2022-09-09)
-of the `com.vanniktech:gradle-maven-publish-plugin`, the `publishAllPublicationsToMavenRepository`
-now handles the _publish_ step automatically and you only need to perform the _release_ manually.
-
 Once you are sure the release branch is healthy, run the following commands:
 
 ```shell
@@ -136,9 +131,10 @@ Once you are sure the release branch is healthy, run the following commands:
 
 Follow [the instructions here](https://central.sonatype.org/pages/releasing-the-deployment.html):
 
-  1. Navigate to https://oss.sonatype.org/ and **Log In**, if you haven't already.
-  1. On the left side click **Staging Repositories** and look for the `com.firebaseui` repo.
-  1. Click **Release**
+  1. Navigate to https://central.sonatype.com/ and **Log In**, if you haven't already.
+  1. Click on [View deployments](https://central.sonatype.com/publishing/deployments) and look for
+  the `com.firebaseui-firebase-ui-$VERSION` deployment that you started.
+  1. Wait for the artifacts to be verified, and when ready, click **Publish**.
 
 ## 3 - Update issues, milestones, and release notes
 

gradle.properties

@@ -28,6 +28,6 @@ POM_LICENCE_NAME=The Apache Software License, Version 2.0
 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
 POM_DEVELOPER_NAME=FirebaseUI Contributors
 POM_DEVELOPER_URL=https://github.com/firebase/FirebaseUI-Android/graphs/contributors
-# See https://vanniktech.github.io/gradle-maven-publish-plugin/changelog/#0200-2022-06-02
-SONATYPE_HOST=DEFAULT
-RELEASE_SIGNING_ENABLED=true
+# See https://github.com/vanniktech/gradle-maven-publish-plugin/releases/tag/0.33.0
+mavenCentralPublishing=true
+signAllPublications=true