Skip to content

Commit 1022965

Browse files
committed
Merge branch 'master' of https://github.com/firebase/FirebaseUI-Android into version-10.0.0-dev
2 parents 36cc2db + ab7d7a0 commit 1022965

File tree

3 files changed

+11
-15
lines changed

3 files changed

+11
-15
lines changed

buildSrc/src/main/kotlin/Config.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ object Config {
1616
const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
1717
const val google = "com.google.gms:google-services:4.3.8"
1818

19-
const val mavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.30.0"
19+
const val mavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.34.0"
2020
const val buildInfo = "org.jfrog.buildinfo:build-info-extractor-gradle:4.15.2"
2121
}
2222

docs/internal/releasing.md

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ When ready, merge the pull request.
4848
### Credentials
4949

5050
The library is published to Maven Central by the `firebase-sonatype` account, Googlers can find the
51-
password for this account in [Valentine](http://go/valentine/)
51+
password for this account in [Valentine](http://go/valentine/).
5252

5353
### GPG Key
5454

@@ -100,8 +100,8 @@ sudo pkill dirmngr
100100

101101
### Local Properties
102102

103-
1. Navigate to https://oss.sonatype.org/ and **Log In** using the credentials from [Valentine](http://go/valentine).
104-
1. Follow [these instructions](https://central.sonatype.org/publish/generate-token/) to **Access User Token**.
103+
1. Navigate to https://central.sonatype.com/ and **Log In** using the credentials from [Valentine](http://go/valentine).
104+
1. Go to [View user tokens](https://central.sonatype.com/usertoken) and generate a new token.
105105
You should see an XML that looks like this:
106106
```xml
107107
<server>
@@ -122,11 +122,6 @@ mavenCentralPassword=<PASSWORD FROM THE XML ABOVE (eg. tokenkey-dlghnfgh8+4LfXmg
122122
123123
## 2b - Publish and release
124124
125-
_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)
126-
in two separate manual steps, but starting in [v0.22.0](https://vanniktech.github.io/gradle-maven-publish-plugin/changelog/#0220-2022-09-09)
127-
of the `com.vanniktech:gradle-maven-publish-plugin`, the `publishAllPublicationsToMavenRepository`
128-
now handles the _publish_ step automatically and you only need to perform the _release_ manually.
129-
130125
Once you are sure the release branch is healthy, run the following commands:
131126
132127
```shell
@@ -136,9 +131,10 @@ Once you are sure the release branch is healthy, run the following commands:
136131

137132
Follow [the instructions here](https://central.sonatype.org/pages/releasing-the-deployment.html):
138133

139-
1. Navigate to https://oss.sonatype.org/ and **Log In**, if you haven't already.
140-
1. On the left side click **Staging Repositories** and look for the `com.firebaseui` repo.
141-
1. Click **Release**
134+
1. Navigate to https://central.sonatype.com/ and **Log In**, if you haven't already.
135+
1. Click on [View deployments](https://central.sonatype.com/publishing/deployments) and look for
136+
the `com.firebaseui-firebase-ui-$VERSION` deployment that you started.
137+
1. Wait for the artifacts to be verified, and when ready, click **Publish**.
142138

143139
## 3 - Update issues, milestones, and release notes
144140

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ POM_LICENCE_NAME=The Apache Software License, Version 2.0
2828
POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
2929
POM_DEVELOPER_NAME=FirebaseUI Contributors
3030
POM_DEVELOPER_URL=https://github.com/firebase/FirebaseUI-Android/graphs/contributors
31-
# See https://vanniktech.github.io/gradle-maven-publish-plugin/changelog/#0200-2022-06-02
32-
SONATYPE_HOST=DEFAULT
33-
RELEASE_SIGNING_ENABLED=true
31+
# See https://github.com/vanniktech/gradle-maven-publish-plugin/releases/tag/0.33.0
32+
mavenCentralPublishing=true
33+
signAllPublications=true

0 commit comments

Comments
 (0)