Merge pull request #498 from androidx/release-1.1.0

Release 1.1.0

.github/ISSUE_TEMPLATE/bug.yml

@@ -17,10 +17,10 @@ body:
           tracker: https://github.com/google/ExoPlayer/issues?q=is%3Aissue
   - type: dropdown
     attributes:
-      label: Media3 Version
+      label: Version
       description: What version of Media3 (or ExoPlayer) are you using?
       options:
-        - Media3 1.1.0-alpha01
+        - Media3 1.1.0
         - Media3 1.0.2
         - Media3 1.0.1
         - Media3 1.0.0
@@ -33,6 +33,8 @@ body:
         - Media3 1.0.0-alpha02
         - Media3 1.0.0-alpha01
         - Media3 `main` branch
+        - Media3 pre-release (alpha, beta or RC not in this list)
+        - ExoPlayer 2.19.0
         - ExoPlayer 2.18.7
         - ExoPlayer 2.18.6
         - ExoPlayer 2.18.5
@@ -54,6 +56,12 @@ body:
         - Older (unsupported)
     validations:
       required: true
+  - type: textarea
+    attributes:
+      label: More version details
+      description: |
+        Required if you selected `main` or `dev-v2` (please provide an exact commit SHA),
+        or 'pre-release' or 'older' (please provide the version).
   - type: textarea
     attributes:
       label: Devices that reproduce the issue
@@ -114,7 +122,7 @@ body:
         * Attach a file here
         * Include a media URL
         * Refer to a piece of media from the demo app (e.g. `Misc > Dizzy (MP4)`)
-        * If you don't want to post media publicly please email the info to dev.exoplayer@gmail.com with subject 'Issue #\<issuenumber\>' after filing this issue, and note that you will do this here.
+        * If you don't want to post media publicly please email the info to android-media-github@google.com with subject 'Issue #\<issuenumber\>' after filing this issue, and note that you will do this here.
         * If you are certain the issue does not depend on the media being played, enter "Not applicable" here.
 
         For DRM-protected media please also include the scheme and license server URL.

.github/ISSUE_TEMPLATE/question.md

@@ -39,6 +39,6 @@ Don't forget to check ExoPlayer's supported formats and devices, if applicable
 (https://developer.android.com/guide/topics/media/exoplayer/supported-formats).
 
 If there's something you don't want to post publicly, please submit the issue,
-then email the link/bug report to dev.exoplayer@gmail.com using a subject in the
-format "Issue #1234", where #1234 is your issue number (we don't reply to
-emails).
+then email the link/bug report to android-media-github@google.com using a
+subject in the format "Issue #1234", where #1234 is your issue number (we don't
+reply to emails).

CONTRIBUTING.md

@@ -38,6 +38,24 @@ you made on top of `main` using
 $ git diff -U0 main... | google-java-format-diff.py -p1 -i
 ```
 
+### Push access to PR branches
+
+Please ensure maintainers of this repository have push access to your PR branch
+by ticking the `Allow edits from maintainers` checkbox when creating the PR (or
+after it's created). See the
+[GitHub docs](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork)
+for more info. This allows us to make changes and fixes to the PR while it goes
+through internal review, and ensures we don't create an
+['evil' merge](https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefevilmergeaevilmerge)
+when it gets merged.
+
+This checkbox only appears on PRs from individual-owned forks
+(https://github.com/orgs/community/discussions/5634). If you open a PR from an
+organization-owned fork we will ask you to open a new one from an
+individual-owned fork. If this isn't possible we can still merge the PR, but it
+will result in an 'evil' merge because the changes and fixes we make during
+internal review will be part of the merge commit.
+
 ## Contributor license agreement
 
 Contributions to any Google project must be accompanied by a Contributor