Skip to content

Commit

Permalink
Update androidx-master-dev references to new androidx-main branch
Browse files Browse the repository at this point in the history
Bug: 175313425
Test: N/A
Change-Id: I72dab29f3cf7028510bb7aba32930cf94b1644b7
  • Loading branch information
alanv committed Dec 15, 2020
1 parent f7d2d10 commit 053e7e6
Show file tree
Hide file tree
Showing 18 changed files with 33 additions and 33 deletions.
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ androidx
-- work
```

**Note:** For other projects, you will still need to use the Gerrit workflow used by the Android Open Source Project (AOSP). For more information, please look at the [README](https://cs.android.com/androidx/platform/frameworks/support/+/androidx-master-dev:README.md).
**Note:** For other projects, you will still need to use the Gerrit workflow used by the Android Open Source Project (AOSP). For more information, please look at the [README](https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:README.md).

Fork the [androidx/androidx](https://github.com/androidx/androidx) repository.

Expand Down Expand Up @@ -120,7 +120,7 @@ Once your changes look good, you can push them to your fork of the repository. N
./gradlew updateApi
```

If you are adding new APIs, then you might **additionally need to update** [LibraryVersions.kt](https://github.com/androidx/androidx/blob/androidx-master-dev/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt) as well, before running the updateApi task. This is **relevant when the library’s API is frozen** (betas, rc’s and stable versions). For alpha versions, you don’t have to update this file.
If you are adding new APIs, then you might **additionally need to update** [LibraryVersions.kt](https://github.com/androidx/androidx/blob/androidx-main/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt) as well, before running the updateApi task. This is **relevant when the library’s API is frozen** (betas, rc’s and stable versions). For alpha versions, you don’t have to update this file.

This helps the AndroidX project keep track of API changes and avoid inadvertently adding APIs or introduce backwards incompatible changes.

Expand Down Expand Up @@ -153,17 +153,17 @@ Fixes: b/<bugId> if applicable

### The Pull Request Workflow

AndroidX is primarily developed in [AOSP](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev). This flow simply mirrors pull requests from GitHub into Gerrit, For all intents and purposes, AOSP is the **single** **source of truth**, all changes will be merged in Gerrit and mirrored back to GitHub.
AndroidX is primarily developed in [AOSP](https://android.googlesource.com/platform/frameworks/support/+/androidx-main). This flow simply mirrors pull requests from GitHub into Gerrit, For all intents and purposes, AOSP is the **single** **source of truth**, all changes will be merged in Gerrit and mirrored back to GitHub.

Here is what a typical pull request workflow looks like:

1. Create a GitHub pull request from **your forked repository** to the androidx-master-dev branch on GitHub.
1. Create a GitHub pull request from **your forked repository** to the androidx-main branch on GitHub.
2. Sign the Contributor’s License Agreement at https://cla.developers.google.com/ to get @googlebot to give you the `cla: yes` label.
3. Your PR will be reviewed using the GitHub pull request flow. You can address the comments / suggestions in your forked repository and update the pull request as normal.
4. Once the changes look good, a Googler will Approve your pull request on GitHub.
5. Your PR will be **tested using GitHub workflows**. You can monitor these GitHub workflows by using the Actions tab in your forked repository.
6. Once your **pull request has been approved** by a Googler, it will also be **mirrored to AOSP Gerrit**. You can find the link to Gerrit under the status check, `import/copybara` left by `@copybara-service`, by clicking details.
7. Once **all** the checks in **Gerrit and GitHub** pass, your change will get merged in androidx-master-dev in AOSP and mirrored back to androidx-master-dev in GitHub. Congratulations, your change landed in AOSP!
7. Once **all** the checks in **Gerrit and GitHub** pass, your change will get merged in androidx-main in AOSP and mirrored back to androidx-main in GitHub. Congratulations, your change landed in AOSP!
8. Currently, your pull request will not get automatically closed when your changes are merged. So you will have to close the pull request manually. We are working on improving the workflow to address this.

### Running into problems?
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ git config --global user.email "[email protected]"
3. Create a directory for your checkout (it can be any name)

```bash
mkdir androidx-master-dev
cd androidx-master-dev
mkdir androidx-main
cd androidx-main
```

4. Use `repo` command to initialize the repository.

```bash
repo init -u https://android.googlesource.com/platform/manifest -b androidx-master-dev --partial-clone --clone-filter=blob:limit=10M
repo init -u https://android.googlesource.com/platform/manifest -b androidx-main --partial-clone --clone-filter=blob:limit=10M
```

5. Now your repository is set to pull only what you need for building and running AndroidX libraries. Download the code (and grab a coffee while we pull down the files):
Expand Down Expand Up @@ -113,7 +113,7 @@ maven { url '/path/to/checkout/out/androidx/build/support_repo/' }
```

### Continuous integration
[Our continuous integration system](https://ci.android.com/builds/branches/aosp-androidx-master-dev/grid?) builds all in progress (and potentially unstable) libraries as new changes are merged. You can manually download these AARs and JARs for your experimentation.
[Our continuous integration system](https://ci.android.com/builds/branches/aosp-androidx-main/grid?) builds all in progress (and potentially unstable) libraries as new changes are merged. You can manually download these AARs and JARs for your experimentation.

## Running Tests

Expand Down
2 changes: 1 addition & 1 deletion activity/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ that enables composition of higher level components.

[Release notes](https://developer.android.com/jetpack/androidx/releases/activity)

[Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/activity/)
[Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/activity/)

[Reference documentation](https://developer.android.com/reference/androidx/classes.html)

Expand Down
2 changes: 1 addition & 1 deletion annotation/annotation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ library development.

[Release notes](https://developer.android.com/jetpack/androidx/releases/annotation)

[Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/annotation/annotation/)
[Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/annotation/annotation/)

[Reference documentation](https://developer.android.com/reference/androidx/classes.html)

Expand Down
2 changes: 1 addition & 1 deletion appcompat/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[Release notes](https://developer.android.com/jetpack/androidx/releases/appcompat)

[Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/appcompat/)
[Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/appcompat/)

[Reference documentation](https://developer.android.com/reference/androidx/classes.html)

Expand Down
2 changes: 1 addition & 1 deletion browser/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ calling app's task.

[Library Owners](OWNERS)

[Source Code](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/browser/)
[Source Code](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/browser/)

[Release Nodes](https://developer.android.com/jetpack/androidx/releases/browser)

Expand Down
2 changes: 1 addition & 1 deletion camera/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Jetpack's CameraX support library provides an easy to use and feature rich Andro
[Release notes](https://developer.android.com/jetpack/androidx/releases/camera)

[Browse
source](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/camera/)
source](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/camera/)

[Reference
documentation](https://developer.android.com/reference/androidx/classes.html)
Expand Down
2 changes: 1 addition & 1 deletion collection/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ memory usage.

[Release notes](https://developer.android.com/jetpack/androidx/releases/collection)

[Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/collection/)
[Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/collection/)

[Reference documentation](https://developer.android.com/reference/androidx/classes.html)

Expand Down
10 changes: 5 additions & 5 deletions compose/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ Jetpack Compose is a suite of libraries within the AndroidX ecosystem. For more
## Syntax
Jetpack Compose uses composable functions instead of XML layouts to define UI components. You can
see this in action in the demos, like `androidx.compose.material.demos.ButtonDemo.kt`. More
information can be found in the [compiler README](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/compose/compiler/README.md).
information can be found in the [compiler README](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/compose/compiler/README.md).

## Compiler
Composable functions are built using a custom Kotlin compiler plugin. More information about the
compiler plugin is available in [this README](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/compose/compiler/README.md).
compiler plugin is available in [this README](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/compose/compiler/README.md).

## Getting started
To try out Jetpack Compose you need to set up the toolchain for AndroidX development. Follow the process [here](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/README.md) to check out the code.
To try out Jetpack Compose you need to set up the toolchain for AndroidX development. Follow the process [here](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/README.md) to check out the code.

To start the required version of Android Studio, you need to run the `ANDROIDX_PROJECTS=COMPOSE ./gradlew studio`

Expand All @@ -36,11 +36,11 @@ A sample implementation of the [Material Rally app](https://material.io/design/m
Library code for Jetpack Compose lives under the `frameworks/support/compose` directory. Additionally, sample code can be found within each module in the `integration-tests` subdirectories.

## Feedback
To provide feedback or report bugs, please refer to the main [AndroidX contribution guide](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/README.md) and report your bugs [here](https://issuetracker.google.com/issues/new?component=612128)
To provide feedback or report bugs, please refer to the main [AndroidX contribution guide](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/README.md) and report your bugs [here](https://issuetracker.google.com/issues/new?component=612128)

[Release notes](https://developer.android.com/jetpack/androidx/releases/compose)

[Browse source](https://cs.android.com/androidx/platform/frameworks/support/+/androidx-master-dev:compose/)
[Browse source](https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:compose/)

[Existing open bugs](https://issuetracker.google.com/issues?q=componentid:612128%20status:open)

Expand Down
2 changes: 1 addition & 1 deletion core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[Release notes](https://developer.android.com/jetpack/androidx/releases/core)

[Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/core/)
[Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/core/)

[Reference documentation](https://developer.android.com/reference/androidx/classes.html)

Expand Down
2 changes: 1 addition & 1 deletion core/core-role/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Role library contains the name and documentation for roles that might be availab

[Release notes](https://developer.android.com/jetpack/androidx/releases/core)

[Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/core/core-role/)
[Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/core/core-role/)

[Reference documentation](https://developer.android.com/reference/androidx/classes.html)

Expand Down
6 changes: 3 additions & 3 deletions development/build_log_simplifier/VALIDATION_FAILURE.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ If build_log_simplifier failed your build, then your change caused the AndroidX

## Where is the baseline file?

* Exemptions for output that is always/deterministically generated by the build go in [messages.ignore](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/development/build_log_simplifier/messages.ignore)
* Exemptions for output that is always/deterministically generated by the build go in [messages.ignore](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/development/build_log_simplifier/messages.ignore)

* We may periodically garbage collect exemptions in this file via [gc.sh](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/development/build_log_simplifier/gc.sh), so they may be automatically removed after their underlying issue is fixed
* We may periodically garbage collect exemptions in this file via [gc.sh](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/development/build_log_simplifier/gc.sh), so they may be automatically removed after their underlying issue is fixed

* In most cases, this will be the correct file to update

* Exemptions for output that is only sometimes (flakily) generated by the build go in [message-flakes.ignore](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/development/build_log_simplifier/message-flakes.ignore)
* Exemptions for output that is only sometimes (flakily) generated by the build go in [message-flakes.ignore](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/development/build_log_simplifier/message-flakes.ignore)

* These exemptions will not be automatically garbage collected

Expand Down
2 changes: 1 addition & 1 deletion fragment/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Fragments allow you to encapsulate part of your user interface or behavior into

[Release notes](https://developer.android.com/jetpack/androidx/releases/fragment)

[Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/fragment/)
[Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/fragment/)

[Reference documentation](https://developer.android.com/reference/androidx/fragment/app/package-summary)

Expand Down
2 changes: 1 addition & 1 deletion recyclerview/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RecyclerView library provides a flexible View for displaying a limited window in

[Release notes](https://developer.android.com/jetpack/androidx/releases/recyclerview)

[Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/recyclerview/)
[Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/recyclerview/)

[Reference documentation](https://developer.android.com/reference/androidx/classes.html)

Expand Down
2 changes: 1 addition & 1 deletion transition/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Transition API allows you to animate various kinds of layout changes automatical

[Release notes](https://developer.android.com/jetpack/androidx/releases/transition)

[Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/transition/)
[Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/transition/)

[Reference documentation](https://developer.android.com/reference/androidx/transition/package-summary)

Expand Down
4 changes: 2 additions & 2 deletions webkit/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# androidx.webkit

**See this page rendered in [Gitiles
markdown](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/webkit/README.md).**
markdown](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/webkit/README.md).**

The androidx.webkit library is a static library you can add to your Android
application in order to use android.webkit APIs that are not available for older
Expand All @@ -11,7 +11,7 @@ platform versions.

* [Library owners](OWNERS)
* [Release notes](https://developer.android.com/jetpack/androidx/releases/webkit)
* [Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/webkit/)
* [Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/webkit/)
* [Reference docs and guide to import the library](https://developer.android.com/reference/androidx/webkit/package-summary)
* [Existing open bugs](https://issuetracker.google.com/issues?q=componentid:460423%20status:open)
* [File a new bug](https://issuetracker.google.com/issues/new?component=460423)
Expand Down
2 changes: 1 addition & 1 deletion webkit/integration-tests/testapp/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# WebView Demo App

**See this page rendered in [Gitiles
markdown](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/webkit/integration-tests/testapp/README.md).**
markdown](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/webkit/integration-tests/testapp/README.md).**

The WebView/Webkit demo app serves as both a practical demonstration how to use
the latest AndroidX Webkit APIs and as a means to exercise those APIs for manual
Expand Down
4 changes: 2 additions & 2 deletions work/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ WorkManager allows observation of work status and the ability to create complex

[Release notes](https://developer.android.com/jetpack/androidx/releases/work)

[Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/work)
[Browse source](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/work)

[Reference documentation](https://developer.android.com/reference/androidx/work/package-summary)

[Existing open bugs](https://b.corp.google.com/issues?q=componentid:409906%20status:open)

[File a new bug](https://issuetracker.google.com/issues/new?component=409906)

[Contributing from GitHub](https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/CONTRIBUTING.md)
[Contributing from GitHub](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/CONTRIBUTING.md)

0 comments on commit 053e7e6

Please sign in to comment.