Merge pull request #192 from bugsnag/release-v1.5.1

Release v1.5.1

.buildkite/pipeline.yml

@@ -43,10 +43,11 @@ steps:
 
  - label: 'Build Plugin - 4.27 Win'
  agents:
- queue: opensource-windows-unreal-4.27
+ queue: windows-general-wsl
  env:
  UE_VERSION: "4.27"
- command: build.bat
+ UE_HOME: F:\unreal
+ command: features/scripts/build-plugin-wsl.sh
  artifact_paths: [Bugsnag-*.zip]
  timeout_in_minutes: 60
 

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+## 1.5.1 (2022-10-27)
+
+* Updates the bugsnag-cocoa dependency from v6.19.0 to [v6.25.0](https://github.com/bugsnag/bugsnag-cocoa/blob/master/CHANGELOG.md#6240-2022-10-05)
+* Updates the bugsnag-android dependency from v5.24.0 to [v5.28.1](https://github.com/bugsnag/bugsnag-android/blob/master/CHANGELOG.md#5281-2022-10-19)
+
 ## 1.5.0 (2022-07-06)
 
 * Adds the `Telemetry` configuration property.

Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v6.9.3'
+gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v6.23.0'

Gemfile.lock

@@ -1,9 +1,9 @@
 GIT
  remote: https://github.com/bugsnag/maze-runner
- revision: 3230db9009a6f5ee9d8beac07deb0d87658521ea
- tag: v6.9.3
+ revision: a792850d1845604917f0a5332b3fd8a7e481123d
+ tag: v6.23.0
  specs:
- bugsnag-maze-runner (6.9.3)
+ bugsnag-maze-runner (6.23.0)
  appium_lib (~> 11.2.0)
  bugsnag (~> 6.24)
  cucumber (~> 7.1)
@@ -31,7 +31,7 @@ GEM
  concurrent-ruby (~> 1.0)
  builder (3.2.4)
  childprocess (3.0.0)
- concurrent-ruby (1.1.9)
+ concurrent-ruby (1.1.10)
  cucumber (7.1.0)
  builder (~> 3.2, >= 3.2.4)
  cucumber-core (~> 10.1, >= 10.1.0)
@@ -75,7 +75,7 @@ GEM
  mime-types-data (3.2022.0105)
  mini_portile2 (2.8.0)
  multi_test (0.1.2)
- nokogiri (1.13.3)
+ nokogiri (1.13.8)
  mini_portile2 (~> 2.8.0)
  racc (~> 1.4)
  optimist (3.0.1)

Plugins/Bugsnag/Bugsnag.uplugin

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

Plugins/Bugsnag/Source/Bugsnag/Bugsnag_UPL.xml

@@ -73,8 +73,8 @@
  <insertValue value="repository $S(PluginDir)/../ThirdParty/Android/lib"/>
  <insertNewline/>
  <insert>
- com.bugsnag,bugsnag-plugin-android-unreal,1.5.0
- com.bugsnag,bugsnag-android,5.24.0
+ com.bugsnag,bugsnag-plugin-android-unreal,1.5.1
+ com.bugsnag,bugsnag-android,5.28.1
  </insert>
  <insertNewline/>
  </AARImports>

Plugins/Bugsnag/Source/Bugsnag/Private/Apple/ApplePlatformBugsnag.cpp

@@ -12,24 +12,12 @@
 
 #include "HAL/PlatformStackWalk.h"
 
-#import <Bugsnag/Bugsnag.h>
-#import <BugsnagPrivate/BSG_KSSystemInfo.h>
-#import <BugsnagPrivate/Bugsnag+Private.h>
-#import <BugsnagPrivate/BugsnagBreadcrumbs.h>
-#import <BugsnagPrivate/BugsnagClient+Private.h>
-#import <BugsnagPrivate/BugsnagError+Private.h>
-#import <BugsnagPrivate/BugsnagEvent+Private.h>
-#import <BugsnagPrivate/BugsnagHandledState.h>
-#import <BugsnagPrivate/BugsnagStackframe+Private.h>
-#import <BugsnagPrivate/BugsnagThread+Private.h>
+#import <BugsnagPrivate/BugsnagInternals.h>
 
 DEFINE_PLATFORM_BUGSNAG(FApplePlatformBugsnag);
 
 #if UE_EDITOR
 
-#import <Bugsnag/BSG_KSCrashReportWriter.h>
-#import <BugsnagPrivate/BugsnagConfiguration+Private.h>
-
 #define IS_PIE_WORLD_KEY "isPlayInEditorWorld"
 #define UNREAL_ENGINE_KEY "unrealEngine"
 
@@ -84,7 +72,7 @@ void FApplePlatformBugsnag::Notify(
 {
  BugsnagClient* Client = Bugsnag.client;
 
- NSDictionary* SystemInfo = [BSG_KSSystemInfo systemInfo];
+ NSDictionary* SystemInfo = BSGGetSystemInfo();
 
  NSMutableArray<NSNumber*>* Addresses = [NSMutableArray arrayWithCapacity:StackTrace.Num()];
  for (uint64 Address : StackTrace)
@@ -108,8 +96,8 @@ void FApplePlatformBugsnag::Notify(
  device:[Client generateDeviceWithState:SystemInfo]
  handledState:HandledState
  user:Client.user
- metadata:[Client.metadata deepCopy]
- breadcrumbs:Client.breadcrumbs.breadcrumbs ?: @[]
+ metadata:[Client.metadata copy]
+ breadcrumbs:[Client breadcrumbs]
  errors:@[Error]
  threads:Threads
  session:nil /* set by -[BugsnagClient notifyInternal:block:] */];

Plugins/Bugsnag/Source/Bugsnag/Private/Apple/ApplePlatformConfiguration.cpp

@@ -8,12 +8,7 @@
 #include "AppleSession.h"
 #include "Version.h"
 
-#import <Bugsnag/BugsnagConfiguration.h>
-#import <Bugsnag/BugsnagEndpointConfiguration.h>
-#import <Bugsnag/BugsnagErrorTypes.h>
-
-#import <BugsnagPrivate/BugsnagConfiguration+Private.h>
-#import <BugsnagPrivate/BugsnagNotifier.h>
+#import <BugsnagPrivate/BugsnagInternals.h>
 
 static BSGTelemetryOptions GetTelemetryTypes(EBugsnagTelemetryTypes Value)
 {

Plugins/Bugsnag/Source/Bugsnag/Private/Apple/Specs/AppleError.spec.cpp

@@ -4,8 +4,7 @@
 
 #include "../AppleError.h"
 
-#import <BugsnagPrivate/BugsnagError+Private.h>
-#import <BugsnagPrivate/BugsnagStackframe+Private.h>
+#import <BugsnagPrivate/BugsnagInternals.h>
 
 BEGIN_DEFINE_SPEC(FAppleErrorSpec, "Bugsnag.FAppleErrorSpec",
  EAutomationTestFlags::ProductFilter | EAutomationTestFlags::ApplicationContextMask)

Plugins/Bugsnag/Source/Bugsnag/Private/Apple/Specs/AppleEvent.spec.cpp

@@ -4,9 +4,7 @@
 
 #include "../AppleEvent.h"
 
-#import <Bugsnag/Bugsnag.h>
-#import <BugsnagPrivate/BugsnagEvent+Private.h>
-#import <BugsnagPrivate/BugsnagHandledState.h>
+#import <BugsnagPrivate/BugsnagInternals.h>
 
 BEGIN_DEFINE_SPEC(FAppleEventSpec, "Bugsnag.FAppleEventSpec",
  EAutomationTestFlags::ProductFilter | EAutomationTestFlags::ApplicationContextMask)

Plugins/Bugsnag/Source/Bugsnag/Private/Apple/Specs/ApplePlatformConfiguration.spec.cpp

@@ -5,14 +5,7 @@
 #include "../ApplePlatformConfiguration.h"
 #include "BugsnagConfiguration.h"
 
-#import <Bugsnag/BugsnagConfiguration.h>
-#import <Bugsnag/BugsnagEndpointConfiguration.h>
-#import <Bugsnag/BugsnagErrorTypes.h>
-#import <Bugsnag/BugsnagEvent.h>
-#import <Bugsnag/BugsnagSession.h>
-#import <Bugsnag/BugsnagUser.h>
-
-#import <BugsnagPrivate/BugsnagConfiguration+Private.h>
+#import <BugsnagPrivate/BugsnagInternals.h>
 
 //
 // This is an example of an Automation Spec, a newer type of test that follows BDD methodology.

Plugins/Bugsnag/Source/Bugsnag/Private/Apple/Specs/AppleStackframe.spec.cpp

@@ -4,8 +4,7 @@
 
 #include "../AppleStackframe.h"
 
-#import <Bugsnag/Bugsnag.h>
-#import <BugsnagPrivate/BugsnagStackframe+Private.h>
+#import <BugsnagPrivate/BugsnagInternals.h>
 
 BEGIN_DEFINE_SPEC(FAppleStackframeSpec, "Bugsnag.FAppleStackframeSpec",
  EAutomationTestFlags::ProductFilter | EAutomationTestFlags::ApplicationContextMask)

Plugins/Bugsnag/Source/Bugsnag/Private/Apple/Specs/AppleThread.spec.cpp

@@ -4,8 +4,7 @@
 
 #include "../AppleThread.h"
 
-#import <Bugsnag/Bugsnag.h>
-#import <BugsnagPrivate/BugsnagThread+Private.h>
+#import <BugsnagPrivate/BugsnagInternals.h>
 
 BEGIN_DEFINE_SPEC(FAppleThreadSpec, "Bugsnag.FAppleThreadSpec",
  EAutomationTestFlags::ProductFilter | EAutomationTestFlags::ApplicationContextMask)

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.5.0"
+#define BUGSNAG_UNREAL_VERSION_STRING "1.5.1"

VERSION

@@ -1 +1 @@
-1.5.0
+1.5.1

deps/bugsnag-plugin-android-unreal/build.gradle

@@ -28,7 +28,7 @@ android {
 }
 
 dependencies {
- api "com.bugsnag:bugsnag-android-core:5.24.0"
+ api "com.bugsnag:bugsnag-android-core:5.28.1"
  androidTestImplementation 'androidx.test:runner:1.4.0'
  androidTestImplementation 'androidx.test:rules:1.4.0'
  androidTestImplementation 'junit:junit:4.12'
@@ -40,7 +40,7 @@ task generatePom {
  pom {
  project {
  groupId 'com.bugsnag'
- version '1.5.0'
+ version '1.5.1'
  packaging 'aar'
  }
  }.writeTo("$buildDir/outputs/aar/bugsnag-plugin-android-unreal-release.pom")

features/scripts/build-plugin-wsl.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -Eeuo pipefail
+
+UE_VERSION="${UE_VERSION:-4.27}"
+
+UE_HOME="${UE_HOME:-C:\Program Files\Epic Games}"\\UE_$UE_VERSION
+
+UE_RUNUAT="$UE_HOME\Engine\Build\BatchFiles\RunUAT.bat"
+
+SCRIPT_DIR=$(pwd)
+
+/mnt/c/windows/system32/cmd.exe /C "$UE_RUNUAT" BuildPlugin -Plugin="$(wslpath -w .)/plugins/Bugsnag/Bugsnag.uplugin" -Package="$(wslpath -w .)/Build/Plugin/Bugsnag" -TargetPlatforms=Win32+Win64
+
+cd "$SCRIPT_DIR/Build/Plugin"
+
+zip -r "$SCRIPT_DIR/Bugsnag-UE$UE_VERSION-Windows.zip" Bugsnag

features/steps/unreal_steps.rb

@@ -17,6 +17,7 @@
 end
 
 When('I run {string} and restart the crashed app for {string}') do |scenario_1, scenario_2|
+ Maze.config.captured_invalid_requests.delete(:sessions)
  run_fixture(:run_scenario, scenario_1, wait_for_crash: true)
  run_fixture(:start_bugsnag, scenario_2)
 end

features/support/env.rb

@@ -3,6 +3,9 @@
 end
 
 Before do |_scenario|
+ # Reset to defaults in case previous scenario changed them
+ Maze.config.captured_invalid_requests = Set[:errors, :sessions, :builds, :uploads, :sourcemaps]
+
  # Wait long enough for Unreal Engine to finish loading the UI.
  # Appium appears to wait for the activity to be ready, but Unreal
  # does its own loading on a background thread.