master branch has been renamed to main

Also in project vector-im/jitsi_libre_maven
This commit is contained in:
Benoit Marty 2021-04-29 12:14:55 +02:00
parent 264eb3b0a2
commit 55f1f56fec
3 changed files with 12 additions and 4 deletions

View file

@ -29,6 +29,14 @@ Test:
Other changes:
- New store descriptions
- `master` branch has been renamed to `main`. To apply change to your dev environment, run:
```sh
git branch -m master main
git fetch origin
git branch -u origin/main main
# And optionally
git remote prune origin
```
Changes in Element 1.1.6 (2021-04-16)
===================================================

View file

@ -59,7 +59,7 @@ allprojects {
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
// Jitsi repo
maven {
url "https://github.com/vector-im/jitsi_libre_maven/raw/master/android-sdk-3.1.0"
url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-3.1.0"
// Note: to test Jitsi release you can use a local file like this:
// url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-3.1.0"
}

View file

@ -64,9 +64,9 @@ static def gitBranchName() {
}
}
// For Google Play build, build on any other branch than master will have a "-dev" suffix
// For Google Play build, build on any other branch than main will have a "-dev" suffix
static def getGplayVersionSuffix() {
if (gitBranchName() == "master") {
if (gitBranchName() == "main") {
return ""
} else {
return "-dev"
@ -119,7 +119,7 @@ android {
renderscriptSupportModeEnabled true
// `develop` branch will have version code from timestamp, to ensure each build from CI has a incremented versionCode.
// Other branches (master, features, etc.) will have version code based on application version.
// Other branches (main, features, etc.) will have version code based on application version.
versionCode project.getVersionCode()
// Required for sonar analysis