Merge branch 'main' into markushi/fix/stretched-dialogs-sr

Author: markushi

.gitattributes

@@ -1,3 +1,6 @@
 * text eol=lf
 *.png binary
 *.jpg binary
+
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf

.github/ISSUE_TEMPLATE/bug_report_android.yml

@@ -1,7 +1,6 @@
 name: 🐞 Bug Report - Android
 description: Tell us about something that's not working the way we (probably) intend.
-labels: ["Platform: Android", "Type: Bug"]
-type: Bug
+labels: ["Android", "Bug"]
 body:
   - type: dropdown
     id: integration

.github/ISSUE_TEMPLATE/bug_report_java.yml

@@ -1,7 +1,6 @@
 name: 🐞 Bug Report - Java
 description: Tell us about something that's not working the way we (probably) intend.
-labels: ["Platform: Java", "Type: Bug"]
-type: Bug
+labels: ["Java", "Bug"]
 body:
   - type: dropdown
     id: integration

.github/ISSUE_TEMPLATE/feature_android.yml

@@ -1,7 +1,6 @@
 name: 💡 Feature Request - Android
 description: Tell us about a problem our SDK could solve but doesn't.
-labels: ["Platform: Android", "Type: Feature Request"]
-type: Feature
+labels: ["Android", "Feature"]
 body:
   - type: textarea
     id: problem

.github/ISSUE_TEMPLATE/feature_java.yml

@@ -1,7 +1,6 @@
 name: 💡 Feature Request - Java
 description: Tell us about a problem our SDK could solve but doesn't.
-labels: ["Platform: Java", "Type: Feature Request"]
-type: Feature
+labels: ["Java", "Feature"]
 body:
   - type: textarea
     id: problem

.github/ISSUE_TEMPLATE/maintainer-blank.yml

@@ -1,6 +1,6 @@
 name: Blank Issue
 description: Blank Issue. Reserved for maintainers.
-labels: ["Platform: Java"]
+labels: ["Java"]
 body:
   - type: textarea
     id: description

.github/workflows/agp-matrix.yml

@@ -39,9 +39,8 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
+        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
         with:
-          gradle-home-cache-cleanup: true
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Setup KVM

.github/workflows/build.yml

@@ -37,16 +37,15 @@ jobs:
           key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
+        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
         with:
-          gradle-home-cache-cleanup: true
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Run Tests with coverage and Lint
         run: make preMerge
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # pin@v4
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # pin@v4
         with:
           name: sentry-java
           fail_ci_if_error: false

.github/workflows/codeql-analysis.yml

@@ -3,9 +3,6 @@ name: 'CodeQL'
 on:
   push:
     branches: [main]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [main]
   schedule:
     - cron: '17 23 * * 3'
 
@@ -34,19 +31,18 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
+        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
         with:
-          gradle-home-cache-cleanup: true
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # pin@v2
+        uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # pin@v2
         with:
           languages: 'java'
 
       - name: Build Java
         run: |
-          ./gradlew buildForCodeQL
+          ./gradlew buildForCodeQL --no-build-cache
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # pin@v2
+        uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # pin@v2

.github/workflows/enforce-license-compliance.yml

@@ -11,9 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
-        with:
-          gradle-home-cache-cleanup: true
+        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
 
       - name: Set up Java
         uses: actions/setup-java@v4