chore: bump to unity 6.6 and pin java 17

.github/workflows/build.yml

@@ -22,7 +22,7 @@ defaults:
 jobs:
   build:
     name: Build - ${{ inputs.unity-version }}
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     permissions:
       actions: read
       checks: write

.github/workflows/create-unity-matrix.yml

@@ -19,9 +19,9 @@ on:
 
 env:
   # Unity versions used in PRs
-  PR_UNITY_VERSIONS: '["2021.3", "6000.5"]'
+  PR_UNITY_VERSIONS: '["2021.3", "6000.6"]'
   # Unity versions used on main branch
-  FULL_UNITY_VERSIONS: '["2021.3", "2022.3", "6000.0", "6000.3", "6000.5"]'
+  FULL_UNITY_VERSIONS: '["2021.3", "2022.3", "6000.0", "6000.3", "6000.6"]'
 
 jobs:
   create-unity-matrix:

.github/workflows/sdk.yml

@@ -86,6 +86,14 @@ jobs:
       - name: Restore .NET Workload
         if: ${{ steps.cache.outputs.cache-hit != 'true' }}
         run: dotnet workload restore
+
+      # javac 25 (default on ubuntu-26.04) warns on generated sources and sentry-native's ndk builds with -Werror.
+      - name: Setup Java
+        if: ${{ env.TARGET == 'Android' && steps.cache.outputs.cache-hit != 'true' }}
+        uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
+        with:
+          distribution: temurin
+          java-version: '17'
 
       - name: Build
         if: steps.cache.outputs.cache-hit != 'true'

.github/workflows/test-build-macos.yml

@@ -29,24 +29,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - name: Load env
-        id: env
-        run: |
-          $u = (Get-Content scripts/unity-versions.json -Raw | ConvertFrom-Json).'${{ env.UNITY_VERSION }}'
-          "unityVersion=$($u.version)"     >> $env:GITHUB_OUTPUT
-          "unityChangeset=$($u.changeset)" >> $env:GITHUB_OUTPUT
-
       - name: Setup Unity
-        uses: getsentry/setup-unity@61c0c0944851685b6c1225e940d1b1ab349e3aa3
-        with:
-          unity-version: ${{ steps.env.outputs.unityVersion }}
-          unity-version-changeset: ${{ steps.env.outputs.unityChangeset }}
-          unity-modules: mac-il2cpp
-
-      - name: Create Unity license config
-        run: |
-          sudo mkdir -p "/Library/Application Support/Unity/config"
-          echo "$env:UNITY_LICENSE_SERVER_CONFIG" | sudo tee "/Library/Application Support/Unity/config/services-config.json" > /dev/null
+        run: ./scripts/setup-unity.ps1 -UnityVersion "${{ inputs.unity-version }}" -Modules mac-il2cpp
         env:
           UNITY_LICENSE_SERVER_CONFIG: ${{ secrets.UNITY_LICENSE_SERVER_CONFIG }}
 

.github/workflows/test-build-windows-mono.yml

@@ -29,24 +29,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - name: Load env
-        id: env
-        run: |
-          $u = (Get-Content scripts/unity-versions.json -Raw | ConvertFrom-Json).'${{ env.UNITY_VERSION }}'
-          "unityVersion=$($u.version)"     >> $env:GITHUB_OUTPUT
-          "unityChangeset=$($u.changeset)" >> $env:GITHUB_OUTPUT
-
       - name: Setup Unity
-        uses: getsentry/setup-unity@61c0c0944851685b6c1225e940d1b1ab349e3aa3
-        with:
-          unity-version: ${{ steps.env.outputs.unityVersion }}
-          unity-version-changeset: ${{ steps.env.outputs.unityChangeset }}
-          unity-modules: windows-il2cpp
-
-      - name: Create Unity license config
-        run: |
-          New-Item -Path "C:/ProgramData/Unity/config/" -ItemType Directory -Force
-          Set-Content -Path "C:/ProgramData/Unity/config/services-config.json" -Value "$env:UNITY_LICENSE_SERVER_CONFIG"
+        run: ./scripts/setup-unity.ps1 -UnityVersion "${{ inputs.unity-version }}" -Modules windows-il2cpp
         env:
           UNITY_LICENSE_SERVER_CONFIG: ${{ secrets.UNITY_LICENSE_SERVER_CONFIG }}
 

.github/workflows/test-build-windows-x86.yml

@@ -29,24 +29,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - name: Load env
-        id: env
-        run: |
-          $u = (Get-Content scripts/unity-versions.json -Raw | ConvertFrom-Json).'${{ env.UNITY_VERSION }}'
-          "unityVersion=$($u.version)"     >> $env:GITHUB_OUTPUT
-          "unityChangeset=$($u.changeset)" >> $env:GITHUB_OUTPUT
-
       - name: Setup Unity
-        uses: getsentry/setup-unity@61c0c0944851685b6c1225e940d1b1ab349e3aa3
-        with:
-          unity-version: ${{ steps.env.outputs.unityVersion }}
-          unity-version-changeset: ${{ steps.env.outputs.unityChangeset }}
-          unity-modules: windows-il2cpp
-
-      - name: Create Unity license config
-        run: |
-          New-Item -Path "C:/ProgramData/Unity/config/" -ItemType Directory -Force
-          Set-Content -Path "C:/ProgramData/Unity/config/services-config.json" -Value "$env:UNITY_LICENSE_SERVER_CONFIG"
+        run: ./scripts/setup-unity.ps1 -UnityVersion "${{ inputs.unity-version }}" -Modules windows-il2cpp
         env:
           UNITY_LICENSE_SERVER_CONFIG: ${{ secrets.UNITY_LICENSE_SERVER_CONFIG }}
 

.github/workflows/test-build-windows.yml

@@ -29,24 +29,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - name: Load env
-        id: env
-        run: |
-          $u = (Get-Content scripts/unity-versions.json -Raw | ConvertFrom-Json).'${{ env.UNITY_VERSION }}'
-          "unityVersion=$($u.version)"     >> $env:GITHUB_OUTPUT
-          "unityChangeset=$($u.changeset)" >> $env:GITHUB_OUTPUT
-
       - name: Setup Unity
-        uses: getsentry/setup-unity@61c0c0944851685b6c1225e940d1b1ab349e3aa3
-        with:
-          unity-version: ${{ steps.env.outputs.unityVersion }}
-          unity-version-changeset: ${{ steps.env.outputs.unityChangeset }}
-          unity-modules: windows-il2cpp
-
-      - name: Create Unity license config
-        run: |
-          New-Item -Path "C:/ProgramData/Unity/config/" -ItemType Directory -Force
-          Set-Content -Path "C:/ProgramData/Unity/config/services-config.json" -Value "$env:UNITY_LICENSE_SERVER_CONFIG"
+        run: ./scripts/setup-unity.ps1 -UnityVersion "${{ inputs.unity-version }}" -Modules windows-il2cpp
         env:
           UNITY_LICENSE_SERVER_CONFIG: ${{ secrets.UNITY_LICENSE_SERVER_CONFIG }}
 

.github/workflows/test-run-android.yml

@@ -122,7 +122,14 @@ jobs:
           $PSNativeCommandUseErrorActionPreference = $true
           $kernel = uname -r
           sudo apt-get update
-          sudo apt-get install -y adb aapt "linux-modules-extra-$kernel"
+          sudo apt-get install -y adb aapt
+          # Kernels before 7.0 ship binder in linux-modules-extra; 7.0 ships it in linux-modules.
+          $PSNativeCommandUseErrorActionPreference = $false
+          modinfo binder_linux *> $null
+          $PSNativeCommandUseErrorActionPreference = $true
+          if ($LASTEXITCODE -ne 0) {
+            sudo apt-get install -y "linux-modules-extra-$kernel"
+          }
           sudo modprobe binder_linux devices="binder,hwbinder,vndbinder"
           $PSNativeCommandUseErrorActionPreference = $false
           sudo modprobe ashmem_linux  # built into the kernel on newer releases; ignore if absent

.github/workflows/validate-pr.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   validate-pr:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     permissions:
       pull-requests: write
     steps:

CONTRIBUTING.md

@@ -119,7 +119,7 @@ Run integration tests locally using the same scripts as CI:
 
 ```pwsh
 pwsh ./test/Scripts.Integration.Test/dev-integration-test.ps1 `
-  -UnityVersion "6000.5.0f1" `
+  -UnityVersion "6000.6.6f1" `
   -Platform "MacOS" `
   -Repack
 ```

bootstrap.ps1

@@ -144,11 +144,11 @@ else {
 }
 
 $localAssets = Join-Path $repoRoot "samples/unity-of-bugs-local/Assets"
-if ((Test-Path $localAssets) -and (Get-Item $localAssets).LinkType -eq "SymbolicLink") {
-    Add-Result -Status "PASS" -Name "Local sample assets" -Detail "Assets symlink is available."
+if ((Test-Path (Join-Path $localAssets "Scripts")) -and (Get-Item (Join-Path $localAssets "Scripts")).LinkType -eq "SymbolicLink") {
+    Add-Result -Status "PASS" -Name "Local sample assets" -Detail "Assets symlinks are available."
 }
 else {
-    Add-Result -Status "WARN" -Name "Local sample assets" -Detail "Assets symlink is unavailable." -Fix "Enable Git symlink support and restore samples/unity-of-bugs-local/Assets."
+    Add-Result -Status "WARN" -Name "Local sample assets" -Detail "Assets symlinks are unavailable." -Fix "Enable Git symlink support and restore samples/unity-of-bugs-local/Assets."
 }
 
 Write-Host ""

docs/agent-guides/ci.md

@@ -11,8 +11,8 @@
 
 | Trigger | Integration Unity versions |
 | --- | --- |
-| Pull request | `2021.3`, `6000.5` |
-| Main or non-PR | `2021.3`, `2022.3`, `6000.0`, `6000.3`, `6000.5` |
+| Pull request | `2021.3`, `6000.6` |
+| Main or non-PR | `2021.3`, `2022.3`, `6000.0`, `6000.3`, `6000.6` |
 | `chore/unity-<major.minor>.*` PR | Matching version only |
 
 Exact Unity editor versions and changesets live in `scripts/unity-versions.json`. The package build itself currently uses Unity `2021.3`.

docs/agent-guides/testing.md

@@ -37,7 +37,7 @@ dotnet msbuild /t:UnityEditModeTest test/Sentry.Unity.Editor.Tests
 
 ```pwsh
 pwsh ./test/Scripts.Integration.Test/dev-integration-test.ps1 `
-  -UnityVersion "6000.5.0f1" `
+  -UnityVersion "6000.6.6f1" `
   -Platform "MacOS" `
   -Repack
 ```

samples/unity-of-bugs-local/Assets/Editor

@@ -0,0 +1 @@
+../../unity-of-bugs/Assets/Editor

samples/unity-of-bugs-local/Assets/Editor.meta

@@ -0,0 +1 @@
+../../unity-of-bugs/Assets/Editor.meta

samples/unity-of-bugs-local/Assets/Plugins

@@ -0,0 +1 @@
+../../unity-of-bugs/Assets/Plugins

samples/unity-of-bugs-local/Assets/Plugins.meta

@@ -0,0 +1 @@
+../../unity-of-bugs/Assets/Plugins.meta

samples/unity-of-bugs-local/Assets/Resources

@@ -0,0 +1 @@
+../../unity-of-bugs/Assets/Resources

samples/unity-of-bugs-local/Assets/Resources.meta

@@ -0,0 +1 @@
+../../unity-of-bugs/Assets/Resources.meta

samples/unity-of-bugs-local/Assets/Scenes

@@ -0,0 +1 @@
+../../unity-of-bugs/Assets/Scenes

samples/unity-of-bugs-local/Assets/Scenes.meta

@@ -0,0 +1 @@
+../../unity-of-bugs/Assets/Scenes.meta

samples/unity-of-bugs-local/Assets/Scripts

@@ -0,0 +1 @@
+../../unity-of-bugs/Assets/Scripts

samples/unity-of-bugs-local/Assets/Scripts.meta

@@ -0,0 +1 @@
+../../unity-of-bugs/Assets/Scripts.meta

samples/unity-of-bugs-local/Packages/manifest.json

@@ -2,14 +2,14 @@
   "dependencies": {
     "com.unity.ai.navigation": "2.0.13",
     "com.unity.burst": "2.0.0",
-    "com.unity.collab-proxy": "2.12.4",
+    "com.unity.collab-proxy": "2.13.6",
     "com.unity.feature.development": "1.0.2",
     "com.unity.ide.rider": "3.0.40",
     "com.unity.ide.visualstudio": "2.0.26",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.mobile.android-logcat": "1.4.7",
     "com.unity.multiplayer.center": "2.0.1",
-    "com.unity.pipeline": "0.4.0-exp.1",
+    "com.unity.pipeline": "0.9.0-exp.1",
     "com.unity.test-framework": "1.8.0",
     "com.unity.timeline": "6.6.0",
     "com.unity.ugui": "2.6.0",

samples/unity-of-bugs-local/Packages/packages-lock.json

@@ -16,7 +16,7 @@
       "dependencies": {}
     },
     "com.unity.collab-proxy": {
-      "version": "2.12.4",
+      "version": "2.13.6",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
@@ -109,7 +109,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.pipeline": {
-      "version": "0.4.0-exp.1",
+      "version": "0.9.0-exp.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {

samples/unity-of-bugs-local/ProjectSettings/ProjectAuditorSettings.asset

@@ -0,0 +1,36 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 53
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 0}
+  m_Name: 
+  m_EditorClassIdentifier: UnityEditor.ProjectAuditorModule:Unity.ProjectAuditor.Editor:ProjectAuditorSettings
+  Rules:
+    rules: []
+  DiagnosticParams:
+    paramsStack:
+    - PlatformGroup:
+        m_String: Unknown
+      m_SerializedParams:
+      - Key: StreamingClipThresholdBytes
+        Value: 218294
+      - Key: LongDecompressedClipThresholdBytes
+        Value: 204800
+      - Key: LongCompressedMobileClipThresholdBytes
+        Value: 204800
+      - Key: LoadInBackGroundClipSizeThresholdBytes
+        Value: 204800
+      - Key: TextureStreamingMipmapsSizeLimit
+        Value: 4000
+      - Key: SpriteAtlasEmptySpaceLimit
+        Value: 50
+      - Key: StreamingAssetsFolderSizeLimit
+        Value: 50
+    CurrentParamsIndex: 0

samples/unity-of-bugs-local/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 6000.6.0b5
-m_EditorVersionWithRevision: 6000.6.0b5 (b5238eaafb35)
+m_EditorVersion: 6000.6.6f1
+m_EditorVersionWithRevision: 6000.6.6f1 (d20c9ac777da)

samples/unity-of-bugs-local/README.md

@@ -1,8 +1,10 @@
 # Unity of Bugs (Local)
 
-Unity 6 development project. Its `Assets` directory is a relative symlink to
-`../unity-of-bugs/Assets`, so sample scenes and scripts stay shared with the
-Unity 2021 compatibility project.
+Unity 6 development project. The entries in its `Assets` directory are relative
+symlinks into `../unity-of-bugs/Assets`, so sample scenes and scripts stay shared
+with the Unity 2021 compatibility project. `Assets` itself is a real directory
+because Unity Hub rejects projects whose `Assets` is a symlink. Add a symlink here
+when adding a top-level folder to `unity-of-bugs/Assets`.
 
 `Packages` and `ProjectSettings` are local to this project. Unity can upgrade
 them without changing `unity-of-bugs`.

scripts/build-sample.ps1

@@ -48,7 +48,7 @@ function Wait-ForUnityPipelineBuild([string] $projectPath, [int] $timeoutSeconds
 
     while ((Get-Date) -lt $deadline) {
         try {
-            $status = Invoke-UnityPipelineCommand -ProjectPath $projectPath -Command "build_status"
+            $status = Invoke-UnityPipelineCommand -ProjectPath $projectPath -Command "build status"
         }
         catch {
             $lastError = $_
@@ -88,7 +88,7 @@ function Wait-ForUnityPipelineBuild([string] $projectPath, [int] $timeoutSeconds
 $executionMode = Get-UnityExecutionMode -ProjectPath $projectPath
 if ($executionMode -eq "Pipeline") {
     Prepare-UnityPipelineEditor -ProjectPath $projectPath -TimeoutSeconds $timeoutSeconds
-    $started = Invoke-UnityPipelineCommand -ProjectPath $projectPath -Command "build" -CommandArguments @("--target", $Target, "--outputPath", $outputPath, "--confirm", "true")
+    $started = Invoke-UnityPipelineCommand -ProjectPath $projectPath -Command "build run" -CommandArguments @("--target", $Target, "--outputPath", $outputPath, "--confirm", "true")
     if ($started.status -ne "queued") {
         $errorsProperty = $started.PSObject.Properties["validationErrors"]
         $errors = if ($errorsProperty) { @($errorsProperty.Value) } else { @() }

scripts/ci-docker.sh

@@ -36,6 +36,7 @@ set -x
 docker run -td --name $container \
     --hostname $uniqueHostname \
     --user $uid:$gid \
+    --shm-size=2g \
     -v "$cwd":/sentry-unity \
     -v $ANDROID_HOME:$ANDROID_HOME \
     -v $JAVA_HOME_11_X64:$JAVA_HOME_11_X64 \