Skip to content

Commit 281af4a

Browse files
committed
Merge branch 'main' into chore/android-tests
2 parents 3bc3f33 + 659ddee commit 281af4a

17 files changed

+414
-110
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ jobs:
144144
matrix:
145145
# Note: these versions must match scripts/packaging/engine-versions.txt
146146
# Note: Currently 5.0 is not supported due to ue4-docker issue https://github.com/adamrehn/ue4-docker/issues/373
147-
unreal: ['4.27', '5.1', '5.2', '5.3', '5.4', '5.5', '5.6']
147+
unreal: ['4.27', '5.1', '5.2', '5.3', '5.4', '5.5', '5.6', '5.7']
148148
uses: ./.github/workflows/test-linux.yml
149149
with:
150150
unreal-version: ${{ matrix.unreal }}
@@ -169,7 +169,7 @@ jobs:
169169
strategy:
170170
fail-fast: false
171171
matrix:
172-
unreal: ['4.27', '5.1', '5.2', '5.3', '5.4', '5.5', '5.6']
172+
unreal: ['4.27', '5.1', '5.2', '5.3', '5.4', '5.5', '5.6', '5.7']
173173
uses: ./.github/workflows/test-android.yml
174174
with:
175175
unreal-version: ${{ matrix.unreal }}
@@ -181,7 +181,7 @@ jobs:
181181
strategy:
182182
fail-fast: false
183183
matrix:
184-
unreal: ['4.27', '5.1', '5.2', '5.3', '5.4', '5.5', '5.6']
184+
unreal: ['4.27', '5.1', '5.2', '5.3', '5.4', '5.5', '5.6', '5.7']
185185
uses: ./.github/workflows/integration-test-linux.yml
186186
with:
187187
unreal-version: ${{ matrix.unreal }}

.github/workflows/test-android.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ jobs:
9393
mkdir -p /home/ue4/UnrealEngine/Epic/UnrealEngine && chown -R $uid /home/ue4/UnrealEngine/Epic ;
9494
mkdir -p /home/ue4/UnrealEngine/Engine/Source/Epic/UnrealEngine && chown -R $uid /home/ue4/UnrealEngine/Engine/Source/Epic ;
9595
mkdir -p /home/ue4/UnrealEngine/Engine/Intermediate/Build/BuildCookRun && chown -R $uid /home/ue4/UnrealEngine/Engine/Intermediate/Build/BuildCookRun ;
96+
mkdir -p /home/ue4/UnrealEngine/Engine/Intermediate/Build/Android/a/UnrealGame/Development/BuildSettings/Gen && chown -R $uid /home/ue4/UnrealEngine/Engine/Intermediate/Build/Android/a/UnrealGame/Development/BuildSettings/Gen ;
9697
mkdir -p /home/ue4/.config/Epic/UnrealEngine && chown -R $uid /home/ue4/.config ;
9798
mkdir -p /home/ue4/UnrealEngine/UnrealTrace && chown -R $uid /home/ue4/UnrealEngine/UnrealTrace ;
9899
mkdir -p /home/ue4/.gradle && chown -R $uid /home/ue4/.gradle ;

.github/workflows/test-linux.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ jobs:
8383
run: |
8484
uid=$(id -u) # the GH action user ID
8585
docker exec --user root unreal bash -c "
86+
chown -R $uid /home/ue4/.config/Epic/UnrealEngine/XmlConfigCache-+home+ue4+UnrealEngine.bin ;
8687
chown -R $uid /home/ue4/UnrealEngine/Engine/Binaries/ThirdParty/Mono/Linux ;
8788
chown -R $uid /home/ue4/UnrealEngine/Engine/\"$ENGINE_PATH\" ;
8889
chown -R $uid /home/ue4/UnrealEngine/Engine/Binaries/ThirdParty/USD/UsdResources/Linux ;

.github/workflows/ue-docker-android.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ on:
1515
- 5.4
1616
- 5.5
1717
- 5.6
18+
- 5.7
1819
ue_repo:
1920
description: Set Unreal Engine repository
2021
required: true

.github/workflows/ue-docker-linux.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ on:
1515
- 5.4
1616
- 5.5
1717
- 5.6
18+
- 5.7
1819
ue_repo:
1920
description: Set Unreal Engine repository
2021
required: true
@@ -97,7 +98,8 @@ jobs:
9798
--target minimal \
9899
--exclude debug \
99100
--exclude templates \
100-
--exclude ddc
101+
--exclude ddc \
102+
--opt buildgraph_args="-set:WithClient=false -set:WithServer=false"
101103
102104
- name: Log in to GitHub package registry
103105
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a

.github/workflows/ue-docker-windows.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ on:
1616
- 5.4
1717
- 5.5
1818
- 5.6
19+
- 5.7
1920
ue_repo:
2021
description: Set Unreal Engine repository
2122
required: true

CHANGELOG.md

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Unreleased
44

5+
### Fixes
6+
7+
- No more warnings in UE 5.7 caused by deprecated API usage ([#1152](https://github.com/getsentry/sentry-unreal/pull/1152))
8+
59
### Dependencies
610

711
- Bump Native SDK from v0.12.0 to v0.12.1 ([#1136](https://github.com/getsentry/sentry-unreal/pull/1136))
@@ -10,12 +14,15 @@
1014
- Bump Android Gradle Plugin from v5.12.1 to v5.12.2 ([#1135](https://github.com/getsentry/sentry-unreal/pull/1135))
1115
- [changelog](https://github.com/getsentry/sentry-android-gradle-plugin/blob/main/CHANGELOG.md#5122)
1216
- [diff](https://github.com/getsentry/sentry-android-gradle-plugin/compare/5.12.1...5.12.2)
13-
- Bump Cocoa SDK (iOS and Mac) from v8.57.0 to v8.57.2 ([#1133](https://github.com/getsentry/sentry-unreal/pull/1133), [#1143](https://github.com/getsentry/sentry-unreal/pull/1143))
14-
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8572)
15-
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.57.0...8.57.2)
16-
- Bump CLI from v2.57.0 to v2.58.0 ([#1142](https://github.com/getsentry/sentry-unreal/pull/1142))
17-
- [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2580)
18-
- [diff](https://github.com/getsentry/sentry-cli/compare/2.57.0...2.58.0)
17+
- Bump Cocoa SDK (iOS and Mac) from v8.57.0 to v8.57.3 ([#1133](https://github.com/getsentry/sentry-unreal/pull/1133), [#1143](https://github.com/getsentry/sentry-unreal/pull/1143), [#1150](https://github.com/getsentry/sentry-unreal/pull/1150))
18+
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8573)
19+
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.57.0...8.57.3)
20+
- Bump CLI from v2.57.0 to v2.58.2 ([#1142](https://github.com/getsentry/sentry-unreal/pull/1142), [#1145](https://github.com/getsentry/sentry-unreal/pull/1145), [#1148](https://github.com/getsentry/sentry-unreal/pull/1148))
21+
- [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2582)
22+
- [diff](https://github.com/getsentry/sentry-cli/compare/2.57.0...2.58.2)
23+
- Bump Java SDK (Android) from v8.25.0 to v8.26.0 ([#1147](https://github.com/getsentry/sentry-unreal/pull/1147))
24+
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8260)
25+
- [diff](https://github.com/getsentry/sentry-java/compare/8.25.0...8.26.0)
1926

2027
## 1.2.1
2128

CONTRIBUTING.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,41 @@ This script links the checked out version of the plugin (the [plugin-dev](./plug
3333
3434
After that, you can generate project files for SentryPlayground.uproject to open it in your IDE and make changes to the SDK as you would with any other Unreal project.
3535

36+
### Building Plugin Dependencies Locally
37+
38+
By default, the initialization scripts download pre-built SDK dependencies from CI. If you need to build platform dependencies locally (e.g., for development or debugging) you can use the `build-deps.ps1` script.
39+
40+
The plugin uses the following platform-specific SDKs:
41+
- **[sentry-native](https://github.com/getsentry/sentry-native.git)** - Windows support (requires Windows)
42+
- **[sentry-cocoa](https://github.com/getsentry/sentry-cocoa.git)** - Mac and iOS support (requires macOS)
43+
- **[sentry-java](https://github.com/getsentry/sentry-java.git)** - Android support (any platform)
44+
45+
To build dependencies locally, first obtain the SDK source code, configure environment variables (optional) and run the build script:
46+
47+
```pwsh
48+
# One-time: Set environment variables
49+
$env:SENTRY_NATIVE_PATH = "D:\projects\sentry-native"
50+
$env:SENTRY_COCOA_PATH = "D:\projects\sentry-cocoa"
51+
$env:SENTRY_JAVA_PATH = "D:\projects\sentry-java"
52+
53+
# Option 1: Build all SDKs for current platform (uses environment variables)
54+
./scripts/build-deps.ps1 -All
55+
56+
# Option 2: Build specific SDKs
57+
./scripts/build-deps.ps1 -Native -Java
58+
./scripts/build-deps.ps1 -Cocoa
59+
60+
# Option 3: Build with custom paths (without setting environment variables)
61+
./scripts/build-deps.ps1 -Native -NativePath "D:\projects\sentry-native"
62+
./scripts/build-deps.ps1 -All -CocoaPath "D:\custom\sentry-cocoa"
63+
```
64+
65+
The script pre-builds the SDK binaries and copies them to `plugin-dev/Source/ThirdParty` directory, replacing any existing binaries.
66+
67+
> [!NOTE]
68+
> - **Windows**: `-All` builds Native + Java (Cocoa requires macOS)
69+
> - **macOS**: `-All` builds Cocoa + Java (Native requires Windows)
70+
3671
### Modifying Plugin Content
3772

3873
All files that belong to the plugin are listed in the snapshot file:

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Sentry SDK for Unreal Engine
1010
===========
1111

12-
This project is an SDK for Unreal Engine that wraps different Sentry's SDKs for both desktop and mobile. Also, it [has a stable support for the Unreal Engine crash reporter](https://docs.sentry.io/platforms/unreal/setup-crashreport/).
12+
This project is an SDK for Unreal Engine that wraps different Sentry's SDKs for both desktop, mobile and consoles. Also, it [has a stable support for the Unreal Engine crash reporter](https://docs.sentry.io/platforms/unreal/setup-crashreport/).
1313

1414
## Downloads
1515

@@ -36,6 +36,7 @@ The SDK compiles with three latest engine versions.
3636

3737
Blog posts:
3838
* [Building the Sentry Unreal Engine SDK with GitHub Actions](https://blog.sentry.io/building-the-sentry-unreal-engine-sdk-with-github-actions/)
39+
* [Game Console Support GA](https://blog.sentry.io/error-monitoring-and-crash-reporting-for-gaming-consoles/)
3940

4041
## Known Limitations
4142

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
ARG NAMESPACE
2+
ARG PREREQS_TAG
3+
FROM ${NAMESPACE}/ue4-base-build-prerequisites:${PREREQS_TAG}
4+
5+
# Switch to root to install additional packages
6+
USER root
7+
8+
# Install Java 21 (required for UE 5.7 Android builds)
9+
RUN apt-get update && apt-get install -y --no-install-recommends \
10+
openjdk-21-jdk \
11+
wget \
12+
unzip && \
13+
rm -rf /var/lib/apt/lists/*
14+
15+
# Set up environment variables for Android SDK/NDK
16+
# Unreal Engine checks multiple environment variable names, so we set all of them
17+
ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
18+
ENV ANDROID_HOME=/home/ue4/android-sdk
19+
ENV ANDROID_SDK_ROOT=/home/ue4/android-sdk
20+
ENV ANDROID_NDK=/home/ue4/android-sdk/ndk/27.2.12479018
21+
ENV ANDROID_NDK_ROOT=/home/ue4/android-sdk/ndk/27.2.12479018
22+
ENV NDKROOT=/home/ue4/android-sdk/ndk/27.2.12479018
23+
ENV NDK_ROOT=/home/ue4/android-sdk/ndk/27.2.12479018
24+
ENV PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools
25+
26+
# Switch to ue4 user for SDK installation (to ensure correct permissions)
27+
USER ue4
28+
29+
# Download and install Android command-line tools
30+
RUN mkdir -p ${ANDROID_HOME}/cmdline-tools && \
31+
cd ${ANDROID_HOME}/cmdline-tools && \
32+
wget -q https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip && \
33+
unzip -q commandlinetools-linux-9477386_latest.zip && \
34+
rm commandlinetools-linux-9477386_latest.zip && \
35+
mv cmdline-tools latest
36+
37+
# Accept licenses and install Android SDK components
38+
# UE 5.7 requires: API Level 34, Build Tools 35.0.1, NDK r27c (27.2.12479018)
39+
RUN yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --licenses && \
40+
${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager \
41+
"platform-tools" \
42+
"platforms;android-34" \
43+
"build-tools;35.0.1" \
44+
"ndk;27.2.12479018"

0 commit comments

Comments
 (0)