Merge remote-tracking branch 'origin/main' into build/jdk-21

# Conflicts:
#	build-logic/build.gradle.kts
#	buildSrc/build.gradle.kts

Author: markushi

.github/workflows/codeql-analysis.yml

@@ -13,7 +13,7 @@ concurrency:
 jobs:
   analyze:
     name: Analyze
-    runs-on: macos-15
+    runs-on: ["bitrise_pool_name:tahoe"]
 
     env:
       GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}

.github/workflows/format-code.yml

@@ -5,7 +5,7 @@ on:
 jobs:
   format-code:
     name: Format Code
-    runs-on: ubuntu-latest
+    runs-on: ["bitrise_pool_name:tahoe"]
     steps:
       - name: Checkout
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

.github/workflows/generate-javadocs.yml

@@ -6,7 +6,7 @@ on:
 jobs:
   build-and-deploy-javadocs:
     name: Build and deploy Javadocs
-    runs-on: ubuntu-latest
+    runs-on: ["bitrise_pool_name:tahoe"]
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

.github/workflows/integration-tests-macrobenchmark.yml

@@ -12,7 +12,7 @@ concurrency:
 jobs:
   macrobenchmark:
     name: Macrobenchmark
-    runs-on: ubuntu-latest
+    runs-on: ["bitrise_pool_name:tahoe"]
 
     # we copy the secret to the env variable in order to access it in the workflow
     env:

.github/workflows/integration-tests-size.yml

@@ -13,7 +13,7 @@ concurrency:
 jobs:
   build:
     name: Build and Analyze SDK Size
-    runs-on: ubuntu-latest
+    runs-on: ["bitrise_pool_name:tahoe"]
 
     env:
       GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}

.github/workflows/integration-tests-ui-critical.yml

@@ -20,7 +20,9 @@ env:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-latest
+    # Only the APK build runs on Bitrise; the Maestro job below needs KVM for the
+    # x86_64 emulator, which the macOS Bitrise VMs don't provide.
+    runs-on: ["bitrise_pool_name:tahoe"]
 
     env:
       GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}

.github/workflows/integration-tests-ui.yml

@@ -12,7 +12,7 @@ concurrency:
 jobs:
   test:
     name: Ui tests
-    runs-on: ubuntu-latest
+    runs-on: ["bitrise_pool_name:tahoe"]
 
     # we copy the secret to the env variable in order to access it in the workflow
     env:
@@ -81,11 +81,12 @@ jobs:
         # Skip on PRs from forks, which don't have access to the upload secret
         if: ${{ !cancelled() && env.SAUCE_USERNAME != null && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) }}
         run: |
-          shopt -s globstar nullglob
-          pngs=(artifacts/**/*.png)
-          if [ ${#pngs[@]} -gt 0 ]; then
-            mkdir -p replay-snapshots
-            cp "${pngs[@]}" replay-snapshots/
+          # find instead of `shopt -s globstar`, which macOS's bash 3.2 doesn't support
+          mkdir -p replay-snapshots
+          if [ -d artifacts ]; then
+            find artifacts -type f -name '*.png' -exec cp {} replay-snapshots/ \;
+          fi
+          if [ -n "$(ls -A replay-snapshots)" ]; then
             sentry-cli snapshots upload ./replay-snapshots \
               --app-id sentry-android-replay
           else

.github/workflows/release.yml

@@ -23,7 +23,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
+        uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3.3.0
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

CHANGELOG.md

@@ -23,6 +23,7 @@
 ### Internal
 
 - Hold the hostname cache on `SentryOptions` instead of a static singleton ([#6117](https://github.com/getsentry/sentry-java/pull/6117))
+- Measure the hostname cache TTL on the monotonic ticker the options provide, so that a device time change no longer shortens or extends it ([#6100](https://github.com/getsentry/sentry-java/pull/6100))
 
 ### Dependencies
 

build-logic/build.gradle.kts

@@ -2,11 +2,6 @@ plugins {
   `kotlin-dsl`
 }
 
-repositories {
-  gradlePluginPortal()
-  google()
-}
-
 dependencies {
   implementation(libs.animalsniffer.gradle.plugin)
   implementation(libs.spotlessLib)