Fix Gradle version compatibility issues for Android

.github/workflows/test-android.yml

@@ -150,25 +150,43 @@ jobs:
             mkdir -p ~/.config/Unreal\ Engine/UnrealBuildTool ;
             cp /workspace/checkout/.github/BuildConfiguration.xml ~/.config/Unreal\ Engine/UnrealBuildTool/ "
 
-      - name: Build Android package
-        id: build-android
+      - name: Build Android package (Development)
+        id: build-android-dev
+        run: |
+          docker exec -w /workspace/checkout/sample \
+            -e TMPDIR=/home/gh/.cache/tmp \
+            unreal /home/ue4/UnrealEngine/Engine/Build/BatchFiles/RunUAT.sh BuildCookRun \
+            -project=/workspace/checkout/sample/SentryPlayground.uproject \
+            -archivedirectory=/workspace/checkout/sample/Builds \
+            -platform=Android \
+            -clientconfig=Development \
+            -nop4 \
+            -cook \
+            -iterate \
+            -build \
+            -stage \
+            -prereqs \
+            -package \
+            -archive
+
+      - name: Build Android package (Shipping)
+        id: build-android-shipping
         env:
-          SENTRY_UPLOAD_SYMBOLS_AUTOMATICALLY: true
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
           SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
         run: |
           docker exec -w /workspace/checkout/sample \
             -e TMPDIR=/home/gh/.cache/tmp \
-            -e SENTRY_UPLOAD_SYMBOLS_AUTOMATICALLY="$SENTRY_UPLOAD_SYMBOLS_AUTOMATICALLY" \
             -e SENTRY_AUTH_TOKEN="$SENTRY_AUTH_TOKEN" \
             -e SENTRY_ORG="$SENTRY_ORG" \
             -e SENTRY_PROJECT="$SENTRY_PROJECT" \
             unreal /home/ue4/UnrealEngine/Engine/Build/BatchFiles/RunUAT.sh BuildCookRun \
             -project=/workspace/checkout/sample/SentryPlayground.uproject \
             -archivedirectory=/workspace/checkout/sample/Builds \
             -platform=Android \
-            -clientconfig=Development \
+            -distribution \
+            -clientconfig=Shipping \
             -nop4 \
             -cook \
             -iterate \
@@ -186,15 +204,15 @@ jobs:
           key: ${{ steps.ddc-cache-key.outputs.key }}
 
       - name: Collect build logs on failure
-        if: ${{ always() && steps.build-android.outcome == 'failure' }}
+        if: ${{ always() && (steps.build-android-dev.outcome == 'failure' || steps.build-android-shipping.outcome == 'failure') }}
         uses: actions/upload-artifact@v4
         with:
           name: UE ${{ inputs.unreal-version }} Android build logs
           path: |
             checkout/sample/Saved/Logs
 
       - name: Upload Android build
-        if: ${{ success() && steps.build-android.outcome == 'success' }}
+        if: ${{ success() && (steps.build-android-dev.outcome == 'success' && steps.build-android-shipping.outcome == 'success') }}
         uses: actions/upload-artifact@v4
         with:
           name: UE ${{ inputs.unreal-version }} sample build (Android)

.github/workflows/test-linux.yml

@@ -145,13 +145,11 @@ jobs:
         id: run-tests
         env:
           EDITOR_BINARY: ${{ inputs.unreal-version == '4.27' && 'UE4Editor' || 'UnrealEditor' }}
-          SENTRY_UPLOAD_SYMBOLS_AUTOMATICALLY: true
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
           SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
         run: |
           docker exec -w /workspace/checkout/sample \
-            -e SENTRY_UPLOAD_SYMBOLS_AUTOMATICALLY="$SENTRY_UPLOAD_SYMBOLS_AUTOMATICALLY" \
             -e SENTRY_AUTH_TOKEN="$SENTRY_AUTH_TOKEN" \
             -e SENTRY_ORG="$SENTRY_ORG" \
             -e SENTRY_PROJECT="$SENTRY_PROJECT" \

.github/workflows/test-windows.yml

@@ -82,13 +82,11 @@ jobs:
         id: run-tests
         env:
           EDITOR_BINARY: ${{ inputs.unreal-version == '4.27' && 'UE4Editor.exe' || 'UnrealEditor.exe' }}
-          SENTRY_UPLOAD_SYMBOLS_AUTOMATICALLY: true
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
           SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
         run: |
           docker exec `
-            -e SENTRY_UPLOAD_SYMBOLS_AUTOMATICALLY="$env:SENTRY_UPLOAD_SYMBOLS_AUTOMATICALLY" `
             -e SENTRY_AUTH_TOKEN="$env:SENTRY_AUTH_TOKEN" `
             -e SENTRY_ORG="$env:SENTRY_ORG" `
             -e SENTRY_PROJECT="$env:SENTRY_PROJECT" `

plugin-dev/Gradle/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip

plugin-dev/Source/Sentry/Sentry_Android_UPL.xml

@@ -22,21 +22,6 @@
                 <setBool result="bUploadSymbols" value="$B(bUploadSymbolsAutomatically)"/>
             </false>
         </if>
-
-        <setBoolIsEqual result="bEngineMajorVersionEqual5" arg1="$I(EngineMajorVersion)" arg2="5" />
-        <setBoolIsGreaterEqual result="bEngineMinorVersionGreaterEqual5" arg1="$I(EngineMinorVersion)" arg2="5" />
-
-        <!-- In UE 5.5 and newer there's no need to bump the default Gradle version (8.7+) as it's compatible with Sentry gradle plugin anyway -->
-        <setBoolAnd result="bHasModernGradle" arg1="$B(bEngineMajorVersionEqual5)" arg2="$B(bEngineMinorVersionGreaterEqual5)"/>
-
-        <if condition="bHasModernGradle">
-            <true>
-                <log text="In UE 5.5 and newer using legacy Sentry gradle plugin in not supported."/>
-                <setBool result="bUseLegacyGradlePlugin" value="false"/>
-            </true>
-        </if>
-
-        <setBoolOr result="bSkipGradleOverride" arg1="$B(bUseLegacyGradlePlugin)" arg2="$B(bHasModernGradle)"/>
     </init>
 
     <prebuildCopies>
@@ -49,7 +34,7 @@
             <true>
                 <copyFile src="$S(ProjectDir)/sentry.properties" dst="$S(BuildDir)/gradle/sentry.properties" />
                 <copyFile src="$S(ProjectDir)/sentry.properties" dst="$S(BuildDir)/gradle/AFSProject/app/sentry.properties" />
-                <if condition="bSkipGradleOverride">
+                <if condition="bUseLegacyGradlePlugin">
                     <false>
                         <log text="Modifying engine's Gradle version used by replacing gradle-wrapper.properties"/>
                         <copyFile src="$S(PluginDir)/../../Gradle/gradle-wrapper.properties" dst="$S(BuildDir)/gradle/gradle/wrapper/gradle-wrapper.properties" />
@@ -127,6 +112,7 @@
 
             dependencies {
                 implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'])
+                implementation "com.google.protobuf:protobuf-javalite:3.25.8"
             }
 
             repositories {

sample/Config/DefaultEngine.ini

@@ -233,6 +233,7 @@ bGeneratedSYMBundle=True
 CrashReporterUrl="https://o447951.ingest.sentry.io/api/6253052/unreal/93c7a68867db43539980de54f09b139a/"
 Dsn="https://93c7a68867db43539980de54f09b139a@o447951.ingest.sentry.io/6253052"
 IncludeSources=True
+UploadSymbolsAutomatically=True
 
 [/Script/MacTargetPlatform.XcodeProjectSettings]
 BundleIdentifier=io.sentry.unreal.sample