Skip to content

Commit 3e12bd3

Browse files
nickdowellnickdowell
authored
Merge pull request #205 from bugsnag/release-v4.8.4
Release v4.8.4
2 parents 6283ea2 + 6ebf9ad commit 3e12bd3

File tree

10 files changed

+91
-48
lines changed

10 files changed

+91
-48
lines changed

‎.travis.yml‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
os: osx
2-
osx_image: xcode9.3
2+
osx_image: xcode11.6
33
before_cache:
44
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
55
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
@@ -16,24 +16,48 @@ env:
1616
- TERM=dumb
1717
- PATH=$HOME/Library/Python/2.7/bin:$PATH
1818
- HOMEBREW_NO_INSTALL_CLEANUP=1
19+
- HOMEBREW_NO_AUTO_UPDATE=1
20+
1921
stages:
2022
- name: test
2123
if: tag IS blank
2224
- name: deploy
2325
if: tag IS present
26+
2427
before_install:
2528
- bundle install
26-
- brew update
29+
- brew update > /dev/null || true
2730
- brew tap homebrew/cask
31+
- brew tap AdoptOpenJDK/openjdk
2832
- pip install --user awscli
2933
- mkdir -p $TRAVIS_BUILD_DIR/build_artifacts
34+
3035
install:
31-
- scripts/travis_build_package.sh || (cat unity.log && exit 1)
36+
- brew cask uninstall java > /dev/null
37+
- brew cask install adoptopenjdk8 > /dev/null
38+
- brew install ninja > /dev/null
39+
- brew cask install https://raw.githubusercontent.com/caskroom/homebrew-cask/59a4123d2dc252d17db3fc9169889c96b23cda15/Casks/mono-mdk.rb > /dev/null
40+
- brew cask install android-sdk > /dev/null
41+
- brew cask install bugsnag/unity/$UNITY_VERSION > /dev/null
42+
- export PATH="$PATH:/Library/Frameworks/Mono.framework/Versions/Current/Commands"
43+
- sdkmanager --list
44+
- yes | sdkmanager "platforms;android-27" > /dev/null
45+
- yes | sdkmanager --licenses > /dev/null
46+
- curl --silent -o ndk.zip https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip
47+
- unzip -qq ndk.zip > /dev/null
48+
- mv android-ndk-r16b $ANDROID_NDK_HOME
49+
- rm ndk.zip
50+
- bundle exec rake travis:export_plugin
51+
- cp Bugsnag.unitypackage $TRAVIS_BUILD_DIR/build_artifacts
52+
- cp Bugsnag-with-android-64bit.unitypackage $TRAVIS_BUILD_DIR/build_artifacts
53+
3254
script:
3355
- bundle exec rake travis:maze_runner
56+
3457
jobs:
3558
include:
3659
- stage: test
60+
osx_image: xcode11.3
3761
env:
3862
- UNITY_VERSION=unity-5-6-7f1
3963
- stage: test

‎CHANGELOG.md‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,44 @@
11
# Changelog
22

3+
## 4.8.4 (2020-10-05)
4+
5+
### Enhancements
6+
7+
* Add device id to error reports on Cocoa platforms
8+
[#203](https://github.com/bugsnag/bugsnag-unity/pull/203)
9+
10+
* Update bugsnag-cocoa to v5.23.5:
11+
12+
* Fix JSON serialisation of strings with control characters
13+
[#739](https://github.com/bugsnag/bugsnag-cocoa/pull/739)
14+
15+
* Removed non-thread safe date formatter
16+
[#758](https://github.com/bugsnag/bugsnag-cocoa/pull/758)
17+
18+
* Avoid dereference null pointer in JSON serialisation
19+
[#637](https://github.com/bugsnag/bugsnag-cocoa/pull/637)
20+
[Naugladur](https://github.com/Naugladur)
21+
22+
* Fixed an issue where an app could deadlock during a crash if unfavourable
23+
timing caused DYLD lock contention.
24+
[#580](https://github.com/bugsnag/bugsnag-cocoa/pull/580)
25+
[#675](https://github.com/bugsnag/bugsnag-cocoa/pull/675)
26+
[#725](https://github.com/bugsnag/bugsnag-cocoa/pull/725)
27+
[#721](https://github.com/bugsnag/bugsnag-cocoa/pull/721)
28+
29+
* Fix possible report corruption when using `notify()` from multiple threads
30+
when configured to skip capturing/reporting background thread contents
31+
(generally only Unity games).
32+
[#442](https://github.com/bugsnag/bugsnag-cocoa/pull/442)
33+
34+
* Added several additional event fields (`codeBundleId`, `osName`,
35+
`modelNumber`, `locale`) that were missing from the OOM reports.
36+
[#444](https://github.com/bugsnag/bugsnag-cocoa/pull/444)
37+
38+
* Bugsnag now correctly records a new session if it is returning to
39+
the foreground after more than 60 seconds in the background.
40+
[#529](https://github.com/bugsnag/bugsnag-cocoa/pull/529)
41+
342
## 4.8.3 (2020-06-10)
443

544
### Bug fixes

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ source 'https://rubygems.org'
33
gem "rake"
44
gem "xcpretty"
55
gem "xcodeproj"
6-
gem "bugsnag-maze-runner", git: "https://github.com/bugsnag/maze-runner"
6+
gem "bugsnag-maze-runner", git: "https://github.com/bugsnag/maze-runner", branch: "v1"

‎Gemfile.lock‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
GIT
22
remote: https://github.com/bugsnag/maze-runner
3-
revision: 6f5af2c98c6fa1cfb07d6466a5cf3eaca5dcbc90
3+
revision: 7377529a77eb7585afc66cd2080fcdc4eea3306a
4+
branch: v1
45
specs:
5-
bugsnag-maze-runner (1.0.0)
6+
bugsnag-maze-runner (1.1.0)
67
cucumber (~> 3.1.0)
78
cucumber-expressions (= 5.0.15)
89
minitest (~> 5.0)
910
os (~> 1.0.0)
1011
rack (~> 2.0.0)
11-
rake (~> 12.3.0)
12+
rake (~> 12.3.3)
1213
test-unit (~> 3.2.0)
1314

1415
GEM
1516
remote: https://rubygems.org/
1617
specs:
1718
CFPropertyList (3.0.0)
1819
atomos (0.1.3)
19-
backports (3.11.4)
20-
builder (3.2.3)
20+
backports (3.18.2)
21+
builder (3.2.4)
2122
claide (1.0.2)
2223
colored2 (3.1.2)
2324
cucumber (3.1.0)
@@ -36,16 +37,16 @@ GEM
3637
cucumber-expressions (5.0.15)
3738
cucumber-tag_expressions (1.1.1)
3839
cucumber-wire (0.0.1)
39-
diff-lcs (1.3)
40+
diff-lcs (1.4.4)
4041
gherkin (5.1.0)
41-
minitest (5.11.3)
42-
multi_json (1.13.1)
42+
minitest (5.14.2)
43+
multi_json (1.15.0)
4344
multi_test (0.1.2)
4445
nanaimo (0.2.6)
45-
os (1.0.0)
46-
power_assert (1.1.3)
47-
rack (2.0.6)
48-
rake (12.3.2)
46+
os (1.0.1)
47+
power_assert (1.2.0)
48+
rack (2.0.9)
49+
rake (12.3.3)
4950
rouge (2.0.7)
5051
test-unit (3.2.9)
5152
power_assert
@@ -68,4 +69,4 @@ DEPENDENCIES
6869
xcpretty
6970

7071
BUNDLED WITH
71-
1.16.2
72+
2.1.4

‎Rakefile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ def unity(*cmd, force_free: true, no_graphics: true)
5656
cmd = cmd.unshift(*cmd_prepend)
5757
sh *cmd do |ok, res|
5858
if !ok
59-
raise "unity error"
59+
puts File.read("unity.log") if File.exists?("unity.log")
60+
61+
raise "unity error: #{res}"
6062
end
6163
end
6264
end
@@ -95,7 +97,7 @@ def assemble_android filter_abis=true
9597
android_core_lib = File.join("bugsnag-android", "bugsnag-android-core", "build", "outputs", "aar", "bugsnag-android-core-release.aar")
9698
anr_lib = File.join("bugsnag-android", "bugsnag-plugin-android-anr", "build", "outputs", "aar", "bugsnag-plugin-android-anr-release.aar")
9799
ndk_lib = File.join("bugsnag-android", "bugsnag-plugin-android-ndk", "build", "outputs", "aar", "bugsnag-plugin-android-ndk-release.aar")
98-
100+
99101
# copy kotlin dependencies required by bugsnag-android. the exact files required for each
100102
# version can be found here:
101103
# https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.61/kotlin-stdlib-1.3.61.pom
@@ -126,7 +128,7 @@ namespace :plugin do
126128
# remove any leftover artifacts from the package generation directory
127129
sh "git", "clean", "-dfx", "unity"
128130
# remove cocoa build area
129-
FileUtils.rm_rf cocoa_build_dir
131+
FileUtils.rm_rf cocoa_build_dir
130132
# remove android build area
131133
cd "bugsnag-android" do
132134
sh "./gradlew", "clean"
@@ -328,7 +330,7 @@ namespace :travis do
328330

329331
task :maze_runner do
330332
with_license do
331-
sh "bundle", "exec", "bugsnag-maze-runner", "--color"
333+
sh "bundle", "exec", "bugsnag-maze-runner", "--color", "--verbose"
332334
end
333335
end
334336
end

‎bugsnag-cocoa‎

Submodule bugsnag-cocoa updated 96 files

‎build.cake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var target = Argument("target", "Default");
55
var solution = File("./BugsnagUnity.sln");
66
var configuration = Argument("configuration", "Release");
77
var project = File("./src/BugsnagUnity/BugsnagUnity.csproj");
8-
var version = "4.8.3";
8+
var version = "4.8.4";
99

1010
Task("Restore-NuGet-Packages")
1111
.Does(() => NuGetRestore(solution));

‎features/scripts/create_unity_project.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pushd "${0%/*}"
2525
-projectPath $project_path \
2626
-executeMethod "Main.CreateScene"
2727

28-
Unity -nographics -quit -batchmode -logFile $log_file \
28+
Unity -nographics -quit -batchmode -logFile - \
2929
-projectPath $project_path \
3030
-buildOSXUniversalPlayer "$(pwd)/Mazerunner.app"
3131
popd

‎scripts/travis_build_package.sh‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎src/BugsnagUnity.mm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ void bugsnag_retrieveDeviceData(const void *deviceData, void (*callback)(const v
283283
sprintf(buff, "%lld", freeMemory);
284284
callback(deviceData, "freeMemory", buff);
285285

286+
callback(deviceData, "id", [sysInfo[@BSG_KSSystemField_DeviceAppHash] UTF8String]);
286287
callback(deviceData, "jailbroken", [[sysInfo[@BSG_KSSystemField_Jailbroken] stringValue] UTF8String]);
287288
callback(deviceData, "locale", [[[NSLocale currentLocale] localeIdentifier] UTF8String]);
288289
callback(deviceData, "manufacturer", "Apple");

0 commit comments

Comments
 (0)