Merge pull request #153 from bugsnag/release-v1.3.1

Release v1.3.1

.buildkite/pipeline.full.yml

@@ -39,13 +39,13 @@ steps:
  timeout_in_minutes: 30
  key: plugin_4_26
 
- # UE 5.0EA
- - label: 'Build Plugin - 5.0EA Mac'
+ # UE 5.0
+ - label: 'Build Plugin - 5.0 Mac'
  agents:
- queue: opensource-mac-cocoa-10.15
+ queue: opensource-arm-mac-cocoa-12
  env:
- UE_VERSION: "5.0EA"
- DEVELOPER_DIR: "/Applications/Xcode12.app"
+ UE_VERSION: "5.0"
+ DEVELOPER_DIR: "/Applications/Xcode13.app"
  commands:
  - rm -rf "/Users/administrator/Library/Logs/Unreal Engine/LocalBuildLogs/*"
  - make package
@@ -55,71 +55,71 @@ steps:
  - "/Users/administrator/Library/Logs/Unreal Engine/LocalBuildLogs/*"
  artifact_paths: [Build/Plugin/*.zip]
  timeout_in_minutes: 30
- key: plugin_5_0ea
+ key: plugin_5_0
 
  #
  # Build Test Fixtures
  #
 
  # UE 5.0EA
- - name: ':android: Build E2E - 5.0EA Android'
- depends_on: plugin_5_0ea
+ - name: ':android: Build E2E - 5.0 Android'
+ depends_on: plugin_5_0
  agents:
- queue: opensource-mac-cocoa-10.15
+ queue: opensource-arm-mac-cocoa-12
  env:
- UE_VERSION: "5.0EA"
- DEVELOPER_DIR: "/Applications/Xcode12.app"
+ UE_VERSION: "5.0"
+ DEVELOPER_DIR: "/Applications/Xcode13.app"
  plugins:
  artifacts#v1.5.0:
- download: Build/Plugin/Bugsnag-*-UE_5.0EA-macOS.zip
+ download: Build/Plugin/Bugsnag-*-UE_5.0-macOS.zip
  upload:
- - build/TestFixture-Android-Shipping-5.0EA-arm64.apk
- - build/TestFixture-Android-Shipping-5.0EA-armv7.apk
+ - build/TestFixture-Android-Shipping-5.0-arm64.apk
+ - build/TestFixture-Android-Shipping-5.0-armv7.apk
  - "/Users/administrator/Library/Logs/Unreal Engine/LocalBuildLogs/*"
  commands:
  - rm -rf "/Users/administrator/Library/Logs/Unreal Engine/LocalBuildLogs/*"
  - features/scripts/build-fixture.sh Android
  timeout_in_minutes: 60
- key: android_fixture_5_0ea
+ key: android_fixture_5_0
 
- - name: ':ios: Build E2E - 5.0EA iOS'
- depends_on: plugin_5_0ea
+ - name: ':ios: Build E2E - 5.0 iOS'
+ depends_on: plugin_5_0
  agents:
- queue: opensource-mac-cocoa-10.15
+ queue: opensource-arm-mac-cocoa-12
  env:
- UE_VERSION: "5.0EA"
- DEVELOPER_DIR: "/Applications/Xcode12.app"
+ UE_VERSION: "5.0"
+ DEVELOPER_DIR: "/Applications/Xcode13.app"
  plugins:
  artifacts#v1.5.0:
- download: Build/Plugin/Bugsnag-*-UE_5.0EA-macOS.zip
+ download: Build/Plugin/Bugsnag-*-UE_5.0-macOS.zip
  upload:
- - build/TestFixture-IOS-Shipping-5.0EA.dSYM
- - build/TestFixture-IOS-Shipping-5.0EA.ipa
+ - build/TestFixture-IOS-Shipping-5.0.dSYM
+ - build/TestFixture-IOS-Shipping-5.0.ipa
  - "/Users/administrator/Library/Logs/Unreal Engine/LocalBuildLogs/*"
  commands:
  - rm -rf "/Users/administrator/Library/Logs/Unreal Engine/LocalBuildLogs/*"
  - features/scripts/build-fixture.sh IOS
  timeout_in_minutes: 60
- key: ios_fixture_5_0ea
+ key: ios_fixture_5_0
 
- - name: ':mac: Build E2E - 5.0EA Mac'
- depends_on: plugin_5_0ea
+ - name: ':mac: Build E2E - 5.0 Mac'
+ depends_on: plugin_5_0
  agents:
- queue: opensource-mac-cocoa-10.15
+ queue: opensource-arm-mac-cocoa-12
  env:
- UE_VERSION: "5.0EA"
- DEVELOPER_DIR: "/Applications/Xcode12.app"
+ UE_VERSION: "5.0"
+ DEVELOPER_DIR: "/Applications/Xcode13.app"
  plugins:
  artifacts#v1.5.0:
- download: Build/Plugin/Bugsnag-*-UE_5.0EA-macOS.zip
+ download: Build/Plugin/Bugsnag-*-UE_5.0-macOS.zip
  upload:
- - TestFixture-macOS-5.0EA.zip
+ - TestFixture-macOS-5.0.zip
  - "/Users/administrator/Library/Logs/Unreal Engine/LocalBuildLogs/*"
  commands:
  - rm -rf "/Users/administrator/Library/Logs/Unreal Engine/LocalBuildLogs/*"
  - features/scripts/build-fixture.sh Mac
  timeout_in_minutes: 90
- key: mac_fixture_5_0ea
+ key: mac_fixture_5_0
 
  #
  # E2E Tests
@@ -152,21 +152,21 @@ steps:
  - exit_status: -1 # Agent was lost
  limit: 2
 
- # UE 5.0EA
- - label: 'E2E Tests - 5.0EA Android 11'
- depends_on: android_fixture_5_0ea
+ # UE 5.0
+ - label: 'E2E Tests - 5.0 Android 11'
+ depends_on: android_fixture_5_0
  timeout_in_minutes: 30
  agents:
  queue: opensource
  plugins:
  artifacts#v1.3.0:
  download:
- - build/TestFixture-Android-Shipping-5.0EA-arm64.apk
+ - build/TestFixture-Android-Shipping-5.0-arm64.apk
  upload: ["maze_output/failed/**/*"]
  docker-compose#v3.3.0:
  run: maze-runner
  command:
- - "--app=/app/build/TestFixture-Android-Shipping-5.0EA-arm64.apk"
+ - "--app=/app/build/TestFixture-Android-Shipping-5.0-arm64.apk"
  - "--appium-version=1.17.0"
  - "--device=ANDROID_11_0"
  - "--farm=bs"
@@ -179,47 +179,46 @@ steps:
  - exit_status: -1 # Agent was lost
  limit: 2
 
-# TODO: PLAT-8147
-# - label: 'E2E Tests - 5.0EA iOS 13'
-# depends_on: ios_fixture_5_0ea
-# timeout_in_minutes: 30
-# agents:
-# queue: opensource
-# plugins:
-# artifacts#v1.3.0:
-# download:
-# - build/TestFixture-IOS-Shipping-5.0EA.ipa
-# - build/TestFixture-IOS-Shipping-5.0EA.dSYM
-# upload: ["maze_output/failed/**/*"]
-# docker-compose#v3.3.0:
-# run: maze-runner
-# command:
-# - "--app=/app/build/TestFixture-IOS-Shipping-5.0EA.ipa"
-# - "--appium-version=1.17.0"
-# - "--device=IOS_13"
-# - "--farm=bs"
-# - "--order=random"
-# concurrency: 9
-# concurrency_group: browserstack-app
-# concurrency_method: eager
-# retry:
-# automatic:
-# - exit_status: -1 # Agent was lost
-# limit: 2
+ - label: 'E2E Tests - 5.0 iOS 14'
+ depends_on: ios_fixture_5_0
+ timeout_in_minutes: 30
+ agents:
+ queue: opensource
+ plugins:
+ artifacts#v1.3.0:
+ download:
+ - build/TestFixture-IOS-Shipping-5.0.ipa
+ - build/TestFixture-IOS-Shipping-5.0.dSYM
+ upload: ["maze_output/failed/**/*"]
+ docker-compose#v3.3.0:
+ run: maze-runner
+ command:
+ - "--app=/app/build/TestFixture-IOS-Shipping-5.0.ipa"
+ - "--appium-version=1.17.0"
+ - "--device=IOS_14"
+ - "--farm=bs"
+ - "--order=random"
+ concurrency: 9
+ concurrency_group: browserstack-app
+ concurrency_method: eager
+ retry:
+ automatic:
+ - exit_status: -1 # Agent was lost
+ limit: 2
 
- - label: 'E2E Tests - 5.0EA macOS 10.15'
- depends_on: mac_fixture_5_0ea
+ - label: 'E2E Tests - 5.0 macOS 12'
+ depends_on: mac_fixture_5_0
  timeout_in_minutes: 10
  agents:
- queue: opensource-mac-cocoa-10.15
+ queue: opensource-arm-mac-cocoa-12
  plugins:
  artifacts#v1.5.0:
  download:
- - TestFixture-macOS-5.0EA.zip
+ - TestFixture-macOS-5.0.zip
  upload: ["maze_output/failed/**/*"]
  commands:
  - echo '--- Extracting test fixture'
- - unzip TestFixture-macOS-5.0EA.zip
+ - unzip TestFixture-macOS-5.0.zip
  - echo '--- Installing dependencies'
  - bundle install
  - echo '--- Running tests'

.buildkite/pipeline.yml

@@ -57,10 +57,10 @@ steps:
  - name: ':android: Build E2E - 4.27 Android'
  depends_on: plugin_4_27
  agents:
- queue: opensource-arm-mac-cocoa-12
+ queue: opensource-mac-cocoa-10.15
  env:
  UE_VERSION: "4.27"
- DEVELOPER_DIR: "/Applications/Xcode13.app"
+ DEVELOPER_DIR: "/Applications/Xcode12.app"
  plugins:
  artifacts#v1.5.0:
  download: Build/Plugin/Bugsnag-*-UE_4.27-macOS.zip

.buildkite/pipeline_trigger.sh

@@ -2,9 +2,9 @@
 
 if [[ "$BUILDKITE_MESSAGE" == *"[full ci]"* ||
  "$BUILDKITE_BRANCH" == "next" ||
- "$BUILDKITE_BRANCH" == "master" ||
+ "$BUILDKITE_BRANCH" == "main" ||
  ! -z "$FULL_SCHEDULED_BUILD" ||
- "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" == "master" ]]; then
+ "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" == "main" ]]; then
  echo "Running full build"
  buildkite-agent pipeline upload .buildkite/pipeline.full.yml
 fi

.gitignore

@@ -52,13 +52,12 @@ Binaries/*
 Plugins/*/Binaries/*
 
 # Builds
-[Bb]uild/
 ArchivedBuilds/
-
-# Whitelist PakBlacklist-<BuildConfiguration>.txt files
-!Build/*/
-Build/*/**
+!Build/
+Build/*/*
 !Build/*/PakBlacklist*.txt
+!Build/Android/keystore.jks
+!Build/Android/project.properties
 
 # Don't ignore icon files in Build
 !Build/**/*.ico
@@ -80,7 +79,7 @@ DerivedDataCache/*
 
 # Bugsnag specific
 Plugins/Bugsnag/Source/ThirdParty/BugsnagCocoa/include
-appium_server.log
+deps/bugsnag-plugin-android-unreal/build
 maze_output/*
-TestFixture-Mac-Shipping.log
-TestFixture-macOS.zip
+*.log
+*.zip

Build/Android/project.properties

@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-19

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+## 1.3.1 (2022-04-26)
+
+* Fixes `java.lang.ClassNotFoundException` in minified Android builds.
+ [#151](https://github.com/bugsnag/bugsnag-unreal/pull/151)
+
 ## 1.3.0 (2022-04-11)
 
 * Adds the `MaxReportedThreads` configuration property (Android only.)

Config/DefaultEngine.ini

@@ -10,6 +10,24 @@ Orientation=Portrait
 PackageName=com.bugsnag.unreal.BugsnagExample
 bBuildForArm64=True
 bPackageDataInsideApk=True
+KeyStore=keystore.jks
+KeyAlias=release
+KeyStorePassword=secret
+KeyPassword=secret
+
+[/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings]
+bEnablePlugin=False
+bAllowNetworkConnection=True
+SecurityToken=B3F70FED254B219B6CB12C82EB99F741
+bIncludeInShipping=False
+bAllowExternalStartInShipping=False
+bCompileAFSProject=False
+bUseCompression=False
+bLogFiles=False
+bReportStats=False
+ConnectionType=USBOnly
+bUseManualIPAddress=False
+ManualIPAddress=
 
 [/Script/IOSRuntimeSettings.IOSRuntimeSettings]
 BundleDisplayName=BugsnagExample

Config/DefaultGame.ini

@@ -8,3 +8,6 @@ Homepage="https://www.bugsnag.com"
 SupportContact="https://www.bugsnag.com/contact"
 CopyrightNotice=Copyright 2022 Bugsnag. All Rights Reserved.
 
+[/Script/UnrealEd.ProjectPackagingSettings]
+ForDistribution=True
+

Makefile

@@ -9,7 +9,7 @@ UE_RUNUAT=$(UE_HOME)/Engine/Build/BatchFiles/RunUAT.sh
 UE_EDITOR=$(UE_HOME)/Engine/Binaries/Mac/UE4Editor.app/Contents/MacOS/UE4Editor
 UE_BUILDCOOK_ARGS=BuildCookRun -nocompileeditor -nop4 -stage -package \
  -clientconfig=Shipping -compressed -pak -prereqs \
- -build -utf8output -cook
+ -build -utf8output -cook -distribution
 
 UPROJECT=$(PWD)/BugsnagExample.uproject
 EXAMPLE_MAC_LIB=Binaries/Mac/UE4Editor-BugsnagExample.dylib

Plugins/Bugsnag/Bugsnag.uplugin

@@ -1,7 +1,7 @@
 {
  "FileVersion": 3,
- "Version": 6,
- "VersionName": "1.3.0",
+ "Version": 7,
+ "VersionName": "1.3.1",
  "FriendlyName": "Bugsnag",
  "Description": "Bugsnag is an error monitoring and application stability management solution.",
  "Category": "Developer",

Plugins/Bugsnag/Source/Bugsnag/Bugsnag_UPL.xml

@@ -73,7 +73,7 @@
  <insertValue value="repository $S(PluginDir)/../ThirdParty/Android/lib"/>
  <insertNewline/>
  <insert>
- com.bugsnag,bugsnag-plugin-android-unreal,1.3.0
+ com.bugsnag,bugsnag-plugin-android-unreal,1.3.1
  com.bugsnag,bugsnag-android,5.22.0
  </insert>
  <insertNewline/>
@@ -132,6 +132,13 @@ bugsnag {
  </insert>
  </gradleProperties>
 
+ <proguardAdditions>
+ <insert>
+ <!-- Bugsnag needs to be able to find its Java classes by name from JNI -->
+ -keep class com.bugsnag.** { *; }
+ </insert>
+ </proguardAdditions>
+
  <!-- optional libraries to load in GameActivity.java before libUE4.so -->
  <soLoadLibrary>
  <!-- need this if plugin enabled and supported architecture, even if not packaged for GearVR -->

Plugins/Bugsnag/Source/Bugsnag/Private/Version.h

@@ -4,4 +4,4 @@
 
 #define BUGSNAG_UNREAL_NAME "Unreal Bugsnag Notifier"
 #define BUGSNAG_UNREAL_URL "https://github.com/bugsnag/bugsnag-unreal"
-#define BUGSNAG_UNREAL_VERSION_STRING "1.3.0"
+#define BUGSNAG_UNREAL_VERSION_STRING "1.3.1"

VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1