Skip to content

Commit 147d219

Browse files
committed
Update main refs
1 parent 855da3e commit 147d219

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ jobs:
6464
run: ./gradlew --stop && jps|grep -E 'KotlinCompileDaemon|GradleDaemon'| awk '{print $1}'| xargs kill -9
6565
- name: Final checks
6666
run: ./gradlew check --stacktrace
67-
- name: Upload snapshot (master only)
67+
- name: Upload snapshot (main only)
6868
run: ./gradlew uploadArchives
6969
env:
7070
SONATYPE_NEXUS_USERNAME: ${{ secrets.SonatypeUsername }}
7171
SONATYPE_NEXUS_PASSWORD: ${{ secrets.SonatypePassword }}
72-
if: success() && github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && matrix.java_version == '1.8'
72+
if: success() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && matrix.java_version == '1.8'

MAINTAINING_WEBSITE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ The [documentation website](https://uber.github.io/AutoDispose/) is built using
44

55
## Overview
66

7-
The main configuration of the website happens through the [mkdocs.yml](https://github.com/uber/AutoDispose/blob/master/mkdocs.yml) file. This defines various things like extra css, favicons, icons as well as the main navigation of the website.
7+
The main configuration of the website happens through the [mkdocs.yml](https://github.com/uber/AutoDispose/blob/main/mkdocs.yml) file. This defines various things like extra css, favicons, icons as well as the main navigation of the website.
88

99
## Adding a Page
1010

11-
All of the main pages exist in [docs](https://github.com/uber/AutoDispose/tree/master/docs) directory. To add a new page, simply add a new markdown file to the docs directory. Once that's done, simply add the title of the page and the name of the file in the `nav` section of mkdocs.yml like so:
11+
All of the main pages exist in [docs](https://github.com/uber/AutoDispose/tree/main/docs) directory. To add a new page, simply add a new markdown file to the docs directory. Once that's done, simply add the title of the page and the name of the file in the `nav` section of mkdocs.yml like so:
1212
```yml
1313
nav:
1414
- 'New Page': new_page.md
@@ -23,7 +23,7 @@ You can then find that file in the `docs` directory. After you've made changes t
2323

2424
## Adding Custom CSS
2525

26-
You can add your own CSS in the [app.css](https://github.com/uber/AutoDispose/blob/master/docs/css/app.css) file.
26+
You can add your own CSS in the [app.css](https://github.com/uber/AutoDispose/blob/main/docs/css/app.css) file.
2727

2828
## Deploying the website
2929

deploy_website.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if ! [ $local ]; then
3131
# Generate the 1.x docs
3232
./gradlew dokka
3333

34-
git checkout master
34+
git checkout main
3535
# Generate the API docs for 2.x
3636
./gradlew dokka
3737
fi

docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
AutoDispose
22
===========
33

4-
[![Build Status](https://travis-ci.com/uber/AutoDispose.svg?branch=master)](https://travis-ci.org/uber/AutoDispose)
4+
![](https://github.com/uber/AutoDispose/workflows/ci.yml/badge.svg?branch=master)
55

66
**AutoDispose** is an RxJava 2+ tool for automatically binding the execution of RxJava streams to a
77
provided scope via disposal/cancellation.

0 commit comments

Comments
 (0)