Merge branch 'main' into feat/timber-and-fragment-auto-install

.github/CODEOWNERS

@@ -1 +1 @@
-*       @marandaneto @romtsn @maciejwalkowiak
+*       @marandaneto @romtsn

.github/ISSUE_TEMPLATE/bug_report_android.yml

@@ -0,0 +1,94 @@
+name: 🐞 Bug Report - Android
+description: Tell us about something that's not working the way we (probably) intend.
+labels: ["Platform: Android", "Type: Bug"]
+body:
+  - type: dropdown
+    id: integration
+    attributes:
+      description: Integration
+      label: Integration
+      options:
+        - sentry-android
+        - sentry-android-ndk
+        - sentry-android-okhttp
+        - sentry-android-timber
+        - sentry-android-fragment
+        - sentry-apollo
+        - other
+    validations:
+      required: true
+
+  - type: dropdown
+    id: build_system
+    attributes:
+      description: Build system
+      label: Build System
+      options:
+        - Gradle
+        - Buck
+        - Bazel
+        - Other
+    validations:
+      required: true
+
+  - type: input
+    id: agp_version
+    attributes:
+      description: Android Gradle Plugin Version
+      placeholder: 7.0.0 ← should look like this
+      label: AGP Version
+    validations:
+      required: true
+
+  - type: dropdown
+    id: proguard
+    attributes:
+      description: Proguard/R8
+      label: Proguard
+      options:
+        - Enabled
+        - Disabled
+    validations:
+      required: true
+
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: Sentry SDK Version
+      placeholder: 6.0.0 ← should look like this
+    validations:
+      required: true
+
+  - type: textarea
+    id: repro
+    attributes:
+      label: Steps to Reproduce
+      description: How can we see what you're seeing? Specific is terrific.
+      placeholder: |-
+        1. foo
+        2. bar
+        3. baz
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected Result
+    validations:
+      required: true
+
+  - type: textarea
+    id: actual
+    attributes:
+      label: Actual Result
+      description: Logs? Screenshots? Yes, please.
+    validations:
+      required: true
+
+  - type: markdown
+    attributes:
+      value: |-
+        ## Thanks 🙏
+        Check our [triage docs](https://open.sentry.io/triage/) for what to expect next.

.github/ISSUE_TEMPLATE/bug_report_java.yml

@@ -0,0 +1,77 @@
+name: 🐞 Bug Report - Java
+description: Tell us about something that's not working the way we (probably) intend.
+labels: ["Platform: Java", "Type: Bug"]
+body:
+  - type: dropdown
+    id: integration
+    attributes:
+      description: Integration
+      label: Integration
+      options:
+        - sentry
+        - sentry-jul
+        - sentry-jdbc
+        - sentry-apollo
+        - sentry-kotlin-extensions
+        - sentry-servlet
+        - sentry-spring-boot-starter
+        - sentry-spring
+        - sentry-logback
+        - sentry-log4j2
+        - sentry-graphql
+        - sentry-openfeign
+        - sentry-apache-http-client-5
+        - other
+    validations:
+      required: true
+
+  - type: input
+    id: java_version
+    attributes:
+      description: Java Version
+      placeholder: 8 ← should look like this
+      label: Java Version
+    validations:
+      required: true
+
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: Sentry SDK Version
+      placeholder: 6.0.0 ← should look like this
+    validations:
+      required: true
+
+  - type: textarea
+    id: repro
+    attributes:
+      label: Steps to Reproduce
+      description: How can we see what you're seeing? Specific is terrific.
+      placeholder: |-
+        1. foo
+        2. bar
+        3. baz
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected Result
+    validations:
+      required: true
+
+  - type: textarea
+    id: actual
+    attributes:
+      label: Actual Result
+      description: Logs? Screenshots? Yes, please.
+    validations:
+      required: true
+
+  - type: markdown
+    attributes:
+      value: |-
+        ## Thanks 🙏
+        Check our [triage docs](https://open.sentry.io/triage/) for what to expect next.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Join Sentry Discord
+    url: https://discord.com/invite/sentry
+    about: A place to talk about SDK development and other Sentry related topics. It's not meant as a support channel.

.github/ISSUE_TEMPLATE/feature_android.yml

@@ -0,0 +1,29 @@
+name: 💡 Feature Request - Android
+description: Tell us about a problem our SDK could solve but doesn't.
+labels: ["Platform: Android", "Type: Feature Request"]
+body:
+  - type: textarea
+    id: problem
+    attributes:
+      label: Problem Statement
+      description: What problem could Sentry solve that it doesn't?
+      placeholder: |-
+        I want to make whirled peas, but Sentry doesn't blend.
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Solution Brainstorm
+      description: We know you have bright ideas to share ... share away, friend.
+      placeholder: |-
+        Add a blender to Sentry.
+    validations:
+      required: false
+
+  - type: markdown
+    attributes:
+      value: |-
+        ## Thanks 🙏
+        Check our [triage docs](https://open.sentry.io/triage/) for what to expect next.

.github/ISSUE_TEMPLATE/feature_java.yml

@@ -0,0 +1,29 @@
+name: 💡 Feature Request - Java
+description: Tell us about a problem our SDK could solve but doesn't.
+labels: ["Platform: Java", "Type: Feature Request"]
+body:
+  - type: textarea
+    id: problem
+    attributes:
+      label: Problem Statement
+      description: What problem could Sentry solve that it doesn't?
+      placeholder: |-
+        I want to make whirled peas, but Sentry doesn't blend.
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Solution Brainstorm
+      description: We know you have bright ideas to share ... share away, friend.
+      placeholder: |-
+        Add a blender to Sentry.
+    validations:
+      required: false
+
+  - type: markdown
+    attributes:
+      value: |-
+        ## Thanks 🙏
+        Check our [triage docs](https://open.sentry.io/triage/) for what to expect next.

.github/ISSUE_TEMPLATE/maintainer-blank.yml

@@ -0,0 +1,17 @@
+name: Blank Issue
+description: Blank Issue. Reserved for maintainers.
+labels: ["Platform: Java"]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Please describe the issue.
+    validations:
+      required: true
+
+  - type: markdown
+    attributes:
+      value: |-
+        ## Thanks 🙏
+        Check our [triage docs](https://open.sentry.io/triage/) for what to expect next.

CHANGELOG.md

@@ -3,7 +3,11 @@
 ## Unreleased
 
 * Feat: Automatically enable `Timber` and `Fragment` integrations if they are present on the classpath (#1936)
+
+## 5.6.3
+
 * Fix: If transaction or span is finished, do not allow to mutate (#1940)
+* Fix: Keep used AndroidX classes from obfuscation (Fixes UI breadcrumbs and Slow/Frozen frames) (#1942)
 
 ## 5.6.2
 

gradle.properties

@@ -7,7 +7,7 @@ org.gradle.parallel=true
 android.useAndroidX=true
 
 # Release information
-versionName=5.6.3-SNAPSHOT
+versionName=5.6.4-SNAPSHOT
 
 # disable renderscript, it's enabled by default
 android.defaults.buildfeatures.renderscript=false

sentry-android-core/proguard-rules.pro

@@ -1,3 +1,9 @@
+##---------------Begin: proguard configuration for androidx.core  ----------
+-keep class androidx.core.view.GestureDetectorCompat { <init>(...); }
+-keep class androidx.core.app.FrameMetricsAggregator { <init>(...); }
+-keep interface androidx.core.view.ScrollingView { *; }
+##---------------End: proguard configuration for androidx.core  ----------
+
 ##---------------Begin: proguard configuration for Gson  ----------
 # Gson uses generic type information stored in a class file when working with fields. Proguard
 # removes such information by default, so configure it to keep all of it.