Merge branch 'next' into 5004-oom-kv-store

Bugsnag.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "Bugsnag",
-  "version": "6.1.3",
+  "version": "6.1.4",
   "summary": "The Bugsnag crash reporting framework for Apple platforms.",
   "homepage": "https://bugsnag.com",
   "license": "MIT",
@@ -9,7 +9,7 @@
   },
   "source": {
     "git": "https://github.com/bugsnag/bugsnag-cocoa.git",
-    "tag": "v6.1.3"
+    "tag": "v6.1.4"
   },
   "frameworks": [
     "Foundation",

Bugsnag/Payload/BugsnagNotifier.m

@@ -23,7 +23,7 @@ - (instancetype)init {
 #else
         self.name = @"Bugsnag Objective-C";
 #endif
-        self.version = @"6.1.3";
+        self.version = @"6.1.4";
         self.url = @"https://github.com/bugsnag/bugsnag-cocoa";
         self.dependencies = [NSMutableArray new];
     }

CHANGELOG.md

@@ -5,6 +5,13 @@ Changelog
 
 ### Bug fixes
 
+* Refactor OOM handler to use new K-V store.
+  [804](https://github.com/bugsnag/bugsnag-cocoa/pull/804)
+
+## 6.1.4 (2020-09-11)
+
+### Bug fixes
+
 * Copy the metadata observer list rather than mutating it directly.
   [796](https://github.com/bugsnag/bugsnag-cocoa/pull/796)
 

CONTRIBUTING.md

@@ -80,15 +80,17 @@ test` on the command-line. To specify a specific iOS SDK, run with the SDK name:
 
     make SDK=iphonesimulator11.3 test
 
+(The specified SDK must be installed in Xcode > Preferences > Components)
 Or test on macOS:
 
-    make BUILD_OSX=1 test
+    make PLATFORM=macOS test
 
 Or to test on tvOS:
 
-    make BUILD_TV=1 appletvsimulator11.2 test
+    make PLATFORM=tvOS test
 
-Run the integration tests using `make e2e` (end-to-end)
+Run the integration tests using `make e2e` (end-to-end). For more information
+see [TESTING.md](TESTING.md#end-to-end-tests).
 
 ## Releasing
 
@@ -110,20 +112,19 @@ Run the integration tests using `make e2e` (end-to-end)
 * Check the `master` and `next` branches for what changes are intended to be
   released. If any changes on `next` should go out, check out that branch before
   the subsequent steps.
-* Add any missing entries to the CHANGELOG. Update the README.md if appropriate.
+* Add any missing entries to the CHANGELOG. Update the README if appropriate.
 * Create a pull request for a new version by running `make VERSION=[number] 
   prerelease`. Pull request generation depends on [`hub`](https://hub.github.com) 
   (`brew install hub`)
 * Perform preflight checks:
-  - [ ] Have the changelog and README been updated?
+  - [ ] Have the CHANGELOG and README been updated?
   - [ ] Are there pull requests for installation changes on the 
         [dashboard](https://github.com/bugsnag/dashboard-js)?
   - [ ] Are there pull requests for new features/behavior on the 
         [docs site](https://github.com/bugsnag/docs.bugsnag.com)?
-  - [ ] Run `./Tests/prerelease/run_prerelease_checks.sh`
+  - [ ] Run pre-release checks - see [instructions](./Tests/prerelease/README.md)
 
-* The following checks are optional.  Use your judgement to decide if the scope 
-  of the release merits performing any or all of them.
+* Consider the following, additional checks based on changes in the release:
 
   - [ ] Has all new functionality been manually tested on a release build?
   - [ ] Do the [installation instructions](https://docs.bugsnag.com/platforms/ios/#installation) 

TESTING.md

@@ -9,11 +9,11 @@ test` on the command-line. To specify a specific iOS SDK, run with the SDK name:
 
 Or test on macOS:
 
-    make BUILD_OSX=1 test
+    make PLATFORM=macOS test
 
 Or to test on tvOS:
 
-    make BUILD_TV=1 appletvsimulator11.2 test
+    make PLATFORM=tvOS test
 
 ## End-to-end tests
 

Tests/prerelease/README.md

@@ -0,0 +1,13 @@
+# Pre-release Checks
+
+This section is intended for tests that cannot be performed in the current automated test infrastructure.
+
+## Siri interrupts
+
+1. Open a test app;
+1. Trigger Siri;
+1. Close and open the test app;
+1. Ensure no OOM event is sent.
+
+This was previously automated using the `out_of_memory.feature` in this directory, but it requires work
+for it to run following the introduction of BrowserStack to MazeRunner (ref. PLAT-5040).

VERSION

@@ -1 +1 @@
-6.1.3
+6.1.4