Skip to content

Commit

Permalink
PLAT-10301 remove the bugsnag android gradle plugin (#220)
Browse files Browse the repository at this point in the history
* remove bagp

* changelog

* changelog edit

* url edit
  • Loading branch information
richardelms authored Sep 20, 2023
1 parent ea356f9 commit 838643c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 105 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
Changelog
=========

## TBD

* Removed the bugsnag android gradle plugin due to incompatibility with UE 5.1+. Symbols can now be uploaded via the [BugSnag CLI](https://docs.bugsnag.com/platforms/unreal-engine/showing-full-stacktraces/#android-proguard-and-ndk-mappings)[#220](https://github.com/bugsnag/bugsnag-unreal/pull/220)

## 1.8.0 (2023-08-28)

Expand Down
103 changes: 3 additions & 100 deletions Plugins/Bugsnag/Source/Bugsnag/Bugsnag_UPL.xml
Original file line number Diff line number Diff line change
@@ -1,74 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- API: https://docs.unrealengine.com/4.26/en-US/SharingAndReleasing/Mobile/UnrealPluginLanguage/ -->
<root xmlns:android="http://schemas.android.com/apk/res/android">
<init>
<setStringFromProperty
result="sAPIKey"
ini="Engine"
section="/Script/Bugsnag.BugsnagSettings"
property="ApiKey"
default=""/>
<setBoolFromProperty
result="bShouldUploadBuildMetadata"
ini="Engine"
section="/Script/Bugsnag.BugsnagSettings"
property="bAutoUploadSymbolFiles"
default="true"/>
<setBoolIsEqual result="bIsShipping" arg1="$S(Configuration)" arg2="Shipping"/>
<setBoolIsEqual result="bMissingApiKey" arg1="$S(sAPIKey)" arg2=""/>
<setBoolNot result="bHasApiKey" source="$B(bMissingApiKey)"/>
<setBoolOr result="bIsShippingOrDist" arg1="$B(bIsShipping)" arg2="$B(Distribution)"/>
<setBoolAnd result="bShouldUploadBuildMetadata" arg1="$B(bShouldUploadBuildMetadata)" arg2="$B(bHasApiKey)"/>
<setBoolAnd result="bShouldUploadBuildMetadata" arg1="$B(bShouldUploadBuildMetadata)" arg2="$B(bIsShippingOrDist)"/>

<setStringFromProperty
result="sReleasesEndpoint"
ini="Engine"
section="/Script/Bugsnag.BugsnagSettings"
property="ReleasesEndpoint"
default=""/>
<setStringFromProperty
result="sSymbolUploadEndpoint"
ini="Engine"
section="/Script/Bugsnag.BugsnagSettings"
property="SymbolUploadEndpoint"
default=""/>
<setBoolIsEqual result="bMissingReleasesEndpoint" arg1="$S(sReleasesEndpoint)" arg2=""/>
<setBoolIsEqual result="bMissingSymbolUploadEndpoint" arg1="$S(sSymbolUploadEndpoint)" arg2=""/>
<setBoolNot result="bHasReleasesEndpoint" source="$B(bMissingReleasesEndpoint)"/>
<setBoolNot result="bHasSymbolUploadEndpoint" source="$B(bMissingSymbolUploadEndpoint)"/>
<!-- must be both set or neither -->
<setBoolIsEqual result="bHasValidEndpoints" arg1="$B(bHasSymbolUploadEndpoint)" arg2="$B(bHasReleasesEndpoint)"/>
<!-- disable mapping upload if endpoint configuration is invalid -->
<setBoolAnd result="bShouldUploadBuildMetadata" arg1="$B(bShouldUploadBuildMetadata)" arg2="$B(bHasValidEndpoints)"/>
<if condition="bHasValidEndpoints">
<false>
<log text="WARNING: Bugsnag endpoints configuration is invalid - all endpoints must be configured or none. ReleasesEndpoint='$S(sReleasesEndpoint)' SymbolUploadEndpoint='$S(sSymbolUploadEndpoint)'"/>
</false>
</if>
<setBoolAnd result="bShouldSetEndpoints" arg1="$B(bHasSymbolUploadEndpoint)" arg2="$B(bHasReleasesEndpoint)"/>
</init>

<init></init>
<androidManifestUpdates>
<addPermission android:name="android.permission.INTERNET" />
<if condition="bShouldUploadBuildMetadata">
<true>
<addElements tag="application">
<meta-data android:name="com.bugsnag.android.API_KEY"/>
</addElements>
<loopElements tag="meta-data">
<setStringFromAttribute result="metadataName" tag="$" name="android:name"/>
<setBoolIsEqual result="bMatchingTag" arg1="$S(metadataName)" arg2="com.bugsnag.android.API_KEY"/>
<if condition="bMatchingTag">
<true>
<addAttribute tag="$" name="android:value" value="$S(sAPIKey)"/>
</true>
</if>
</loopElements>
</true>
</if>
</androidManifestUpdates>

<AARImports>
<insertValue value="repository $S(PluginDir)/../ThirdParty/Android/lib"/>
<insertNewline/>
Expand All @@ -78,43 +14,10 @@
</insert>
<insertNewline/>
</AARImports>

<!-- optional base build.gradle buildscript additions -->
<buildscriptGradleAdditions>
<insert>
dependencies {
classpath "com.bugsnag:bugsnag-android-gradle-plugin:5.+"
}
</insert>
</buildscriptGradleAdditions>
<buildscriptGradleAdditions></buildscriptGradleAdditions>
<!-- optional app build.gradle additions -->
<buildGradleAdditions>
<if condition="bShouldUploadBuildMetadata">
<true>
<insert>apply plugin: "com.bugsnag.android.gradle"
bugsnag {
enabled = true
uploadJvmMappings = true
uploadNdkMappings = true
reportBuilds = true
sharedObjectPaths = [new File("</insert><insertValue value="$S(BuildDir)/jni/$S(Architecture)"/><insert>")]
variantFilter {}
</insert>
<if condition="bShouldSetEndpoints">
<true>
<insert>
endpoint = "</insert><insertValue value="$S(sSymbolUploadEndpoint)"/><insert>"
releasesEndpoint = "</insert><insertValue value="$S(sReleasesEndpoint)"/><insert>"
</insert>
</true>
</if>
<insert>
}
</insert>
</true>
</if>
</buildGradleAdditions>

<buildGradleAdditions></buildGradleAdditions>
<!-- optional additions to the GameActivity imports in GameActivity.java -->
<gameActivityImportAdditions> </gameActivityImportAdditions>
<!-- optional additions to the GameActivity class implements in GameActivity.java (end each line with a comma) -->
Expand Down
4 changes: 0 additions & 4 deletions Plugins/Bugsnag/Source/Bugsnag/Public/BugsnagSettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,6 @@ class BUGSNAG_API UBugsnagSettings : public UObject
UPROPERTY(GlobalConfig, EditAnywhere, Category = "Advanced Configuration")
bool bAutoTrackSessions = true;

// Whether symbol mapping files for showing file paths and line numbers in errors should be automatically uploaded. (Android only)
UPROPERTY(GlobalConfig, EditAnywhere, Category = "Advanced Configuration", DisplayName = "Auto Upload Symbol Files (Android only)")
bool bAutoUploadSymbolFiles = true;

// A general summary of what was occurring in the application.
UPROPERTY(GlobalConfig, EditAnywhere, Category = "Advanced Configuration")
FString Context;
Expand Down
1 change: 0 additions & 1 deletion features/fixtures/generic/Config/DefaultEngine.ini
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,4 @@ bShipForBitcode=False
bDisableHTTPS=True

[/Script/Bugsnag.BugsnagSettings]
bAutoUploadSymbolFiles=False
bStartAutomaticallyAtLaunch=False

0 comments on commit 838643c

Please sign in to comment.