Skip to content

Commit c6ce01e

Browse files
rich-bugsnagrich-bugsnag
authored
Merge pull request #529 from bugsnag/next
Release v6.3.0
2 parents f9fa410 + ae36dec commit c6ce01e

File tree

81 files changed

+5202
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+5202
-87
lines changed

‎.buildkite/pipeline.full.yml‎

Lines changed: 15 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ steps:
2323
- features/fixtures/maze_runner/build/WebGL-2018.4.36f1.zip
2424
retry:
2525
automatic:
26-
- exit_status: -1 # Agent was lost
27-
limit: 1
28-
- exit_status: 255 # Forced agent shutdown (e.g. timeout)
26+
- exit_status: "*"
2927
limit: 1
3028

3129
- label: Build Unity 2019 MacOS and WebGL test fixtures
@@ -46,9 +44,7 @@ steps:
4644
- features/fixtures/maze_runner/build/WebGL-2019.4.35f1.zip
4745
retry:
4846
automatic:
49-
- exit_status: -1 # Agent was lost
50-
limit: 1
51-
- exit_status: 255 # Forced agent shutdown (e.g. timeout)
47+
- exit_status: "*"
5248
limit: 1
5349

5450
- label: Build Unity 2021 MacOS and WebGL test fixtures
@@ -69,9 +65,7 @@ steps:
6965
- features/fixtures/maze_runner/build/WebGL-2021.2.11f1.zip
7066
retry:
7167
automatic:
72-
- exit_status: -1 # Agent was lost
73-
limit: 1
74-
- exit_status: 255 # Forced agent shutdown (e.g. timeout)
68+
- exit_status: "*"
7569
limit: 1
7670

7771
#
@@ -198,9 +192,7 @@ steps:
198192
- rake test:android:build
199193
retry:
200194
automatic:
201-
- exit_status: -1 # Agent was lost
202-
limit: 1
203-
- exit_status: 255 # Forced agent shutdown (e.g. timeout)
195+
- exit_status: "*"
204196
limit: 1
205197

206198
- label: ':android: Build Android test fixture for Unity 2019'
@@ -220,9 +212,7 @@ steps:
220212
- rake test:android:build
221213
retry:
222214
automatic:
223-
- exit_status: -1 # Agent was lost
224-
limit: 1
225-
- exit_status: 255 # Forced agent shutdown (e.g. timeout)
215+
- exit_status: "*"
226216
limit: 1
227217

228218
- label: ':android: Build Android test fixture for Unity 2021'
@@ -242,9 +232,7 @@ steps:
242232
- rake test:android:build
243233
retry:
244234
automatic:
245-
- exit_status: -1 # Agent was lost
246-
limit: 1
247-
- exit_status: 255 # Forced agent shutdown (e.g. timeout)
235+
- exit_status: "*"
248236
limit: 1
249237

250238
#
@@ -342,9 +330,7 @@ steps:
342330
- tar -zvcf project_2018.tgz features/fixtures/maze_runner/mazerunner_xcode
343331
retry:
344332
automatic:
345-
- exit_status: -1 # Agent was lost
346-
limit: 1
347-
- exit_status: 255 # Forced agent shutdown (e.g. timeout)
333+
- exit_status: "*"
348334
limit: 1
349335

350336
- label: ':ios: Build iOS test fixture for Unity 2018'
@@ -366,9 +352,7 @@ steps:
366352
- rake test:ios:build_xcode
367353
retry:
368354
automatic:
369-
- exit_status: -1 # Agent was lost
370-
limit: 1
371-
- exit_status: 255 # Forced agent shutdown (e.g. timeout)
355+
- exit_status: "*"
372356
limit: 1
373357

374358
- label: ':ios: Generate Xcode project - Unity 2019'
@@ -389,9 +373,7 @@ steps:
389373
- tar -zvcf project_2019.tgz features/fixtures/maze_runner/mazerunner_xcode
390374
retry:
391375
automatic:
392-
- exit_status: -1 # Agent was lost
393-
limit: 1
394-
- exit_status: 255 # Forced agent shutdown (e.g. timeout)
376+
- exit_status: "*"
395377
limit: 1
396378

397379
- label: ':ios: Build iOS test fixture for Unity 2019'
@@ -413,9 +395,7 @@ steps:
413395
- rake test:ios:build_xcode
414396
retry:
415397
automatic:
416-
- exit_status: -1 # Agent was lost
417-
limit: 1
418-
- exit_status: 255 # Forced agent shutdown (e.g. timeout)
398+
- exit_status: "*"
419399
limit: 1
420400

421401
- label: ':ios: Generate Xcode project - Unity 2021'
@@ -436,9 +416,7 @@ steps:
436416
- tar -zvcf project_2021.tgz features/fixtures/maze_runner/mazerunner_xcode
437417
retry:
438418
automatic:
439-
- exit_status: -1 # Agent was lost
440-
limit: 1
441-
- exit_status: 255 # Forced agent shutdown (e.g. timeout)
419+
- exit_status: "*"
442420
limit: 1
443421

444422
- label: ':ios: Build iOS test fixture for Unity 2021'
@@ -460,9 +438,7 @@ steps:
460438
- rake test:ios:build_xcode
461439
retry:
462440
automatic:
463-
- exit_status: -1 # Agent was lost
464-
limit: 1
465-
- exit_status: 255 # Forced agent shutdown (e.g. timeout)
441+
- exit_status: "*"
466442
limit: 1
467443

468444
#
@@ -558,9 +534,7 @@ steps:
558534
- features/fixtures/maze_runner/build/Windows-2018.4.36f1.zip
559535
retry:
560536
automatic:
561-
- exit_status: -1 # Agent was lost
562-
limit: 1
563-
- exit_status: 255 # Forced agent shutdown (e.g. timeout)
537+
- exit_status: "*"
564538
limit: 1
565539

566540
- label: Build Unity 2019 Windows test fixture
@@ -578,9 +552,7 @@ steps:
578552
- features/fixtures/maze_runner/build/Windows-2019.4.35f1.zip
579553
retry:
580554
automatic:
581-
- exit_status: -1 # Agent was lost
582-
limit: 1
583-
- exit_status: 255 # Forced agent shutdown (e.g. timeout)
555+
- exit_status: "*"
584556
limit: 1
585557

586558
- label: Build Unity 2021 Windows test fixture
@@ -598,9 +570,7 @@ steps:
598570
- features/fixtures/maze_runner/build/Windows-2021.2.11f1.zip
599571
retry:
600572
automatic:
601-
- exit_status: -1 # Agent was lost
602-
limit: 1
603-
- exit_status: 255 # Forced agent shutdown (e.g. timeout)
573+
- exit_status: "*"
604574
limit: 1
605575

606576
#

‎.buildkite/pipeline.yml‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ steps:
1616
- bundle exec rake plugin:export
1717
artifact_paths:
1818
- Bugsnag.unitypackage
19+
retry:
20+
automatic:
21+
- exit_status: "*"
22+
limit: 1
1923

2024
#
2125
# Build MacOS and WebGL test fixtures
@@ -38,10 +42,9 @@ steps:
3842
- features/fixtures/maze_runner/build/WebGL-2020.3.28f1.zip
3943
retry:
4044
automatic:
41-
- exit_status: -1 # Agent was lost
42-
limit: 1
43-
- exit_status: 255 # Forced agent shutdown (e.g. timeout)
45+
- exit_status: "*"
4446
limit: 1
47+
4548
#
4649
# Run desktop tests
4750
#
@@ -102,9 +105,7 @@ steps:
102105
- rake test:android:build
103106
retry:
104107
automatic:
105-
- exit_status: -1 # Agent was lost
106-
limit: 1
107-
- exit_status: 255 # Forced agent shutdown (e.g. timeout)
108+
- exit_status: "*"
108109
limit: 1
109110

110111
#
@@ -156,9 +157,7 @@ steps:
156157
- tar -zvcf project_2020.tgz features/fixtures/maze_runner/mazerunner_xcode
157158
retry:
158159
automatic:
159-
- exit_status: -1 # Agent was lost
160-
limit: 1
161-
- exit_status: 255 # Forced agent shutdown (e.g. timeout)
160+
- exit_status: "*"
162161
limit: 1
163162

164163
- label: ':ios: Build iOS test fixture for Unity 2020'
@@ -180,9 +179,7 @@ steps:
180179
- rake test:ios:build_xcode
181180
retry:
182181
automatic:
183-
- exit_status: -1 # Agent was lost
184-
limit: 1
185-
- exit_status: 255 # Forced agent shutdown (e.g. timeout)
182+
- exit_status: "*"
186183
limit: 1
187184

188185
#
@@ -230,9 +227,7 @@ steps:
230227
- features/fixtures/maze_runner/build/Windows-2020.3.28f1.zip
231228
retry:
232229
automatic:
233-
- exit_status: -1 # Agent was lost
234-
limit: 1
235-
- exit_status: 255 # Forced agent shutdown (e.g. timeout)
230+
- exit_status: "*"
236231
limit: 1
237232

238233
#

‎CHANGELOG.md‎

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

3+
## 6.3.0 (2022-03-23)
4+
5+
### Enhancements
6+
7+
* Added Android support for [EDM4U](https://github.com/googlesamples/unity-jar-resolver). See the new menu item at Window/Bugsnag/Enable EDM Support. [#528](https://github.com/bugsnag/bugsnag-unity/pull/528)
8+
9+
* Update bugsnag-android to v5.21.0
10+
* Fix inconsistencies in stack trace quality for C/C++ events. Resolves a few
11+
cases where file and line number information was not resolving to the correct
12+
locations. This change may result in grouping changes to more correctly
13+
highlight the root cause of an event.
14+
[#1605](https://github.com/bugsnag/bugsnag-android/pull/1605)
15+
[#1606](https://github.com/bugsnag/bugsnag-android/pull/1606)
16+
* Fixed an issue where an uncaught exception on the main thread could in rare cases trigger an ANR.
17+
[#1624](https://github.com/bugsnag/bugsnag-android/pull/1624)
18+
319
## 6.2.0 (2022-03-16)
420

521
### Enhancements

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ gem 'xcpretty'
55
gem 'xcodeproj'
66

77
# Use official Maze Runner release
8-
gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v6.9.3'
8+
gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v6.9.4'
99

1010
# Use a specific Maze Runner branch
1111
#gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', branch: 'master'

‎Gemfile.lock‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
GIT
22
remote: https://github.com/bugsnag/maze-runner
3-
revision: fe12189f83aad154f54221ee0fcd41b483d3c0d1
4-
tag: v6.8.0
3+
revision: 971b390f5617825c18186a35f3f66ffdfcddd315
4+
tag: v6.9.4
55
specs:
6-
bugsnag-maze-runner (6.8.0)
6+
bugsnag-maze-runner (6.9.4)
77
appium_lib (~> 11.2.0)
88
bugsnag (~> 6.24)
99
cucumber (~> 7.1)
@@ -20,7 +20,7 @@ GIT
2020
GEM
2121
remote: https://rubygems.org/
2222
specs:
23-
CFPropertyList (3.0.4)
23+
CFPropertyList (3.0.5)
2424
rexml
2525
appium_lib (11.2.0)
2626
appium_lib_core (~> 4.1)
@@ -30,11 +30,11 @@ GEM
3030
faye-websocket (~> 0.11.0)
3131
selenium-webdriver (~> 3.14, >= 3.14.1)
3232
atomos (0.1.3)
33-
bugsnag (6.24.1)
33+
bugsnag (6.24.2)
3434
concurrent-ruby (~> 1.0)
3535
builder (3.2.4)
3636
childprocess (3.0.0)
37-
claide (1.0.3)
37+
claide (1.1.0)
3838
colored2 (3.1.2)
3939
concurrent-ruby (1.1.9)
4040
cucumber (7.1.0)
@@ -50,10 +50,10 @@ GEM
5050
mime-types (~> 3.3, >= 3.3.1)
5151
multi_test (~> 0.1, >= 0.1.2)
5252
sys-uname (~> 1.2, >= 1.2.2)
53-
cucumber-core (10.1.0)
53+
cucumber-core (10.1.1)
5454
cucumber-gherkin (~> 22.0, >= 22.0.0)
5555
cucumber-messages (~> 17.1, >= 17.1.1)
56-
cucumber-tag-expressions (~> 4.0, >= 4.0.2)
56+
cucumber-tag-expressions (~> 4.1, >= 4.1.0)
5757
cucumber-create-meta (6.0.4)
5858
cucumber-messages (~> 17.1, >= 17.1.1)
5959
sys-uname (~> 1.2, >= 1.2.2)
@@ -65,23 +65,22 @@ GEM
6565
cucumber-messages (~> 17.1, >= 17.1.0)
6666
cucumber-messages (17.1.1)
6767
cucumber-tag-expressions (4.1.0)
68-
cucumber-wire (6.2.0)
68+
cucumber-wire (6.2.1)
6969
cucumber-core (~> 10.1, >= 10.1.0)
7070
cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
71-
cucumber-messages (~> 17.1, >= 17.1.1)
7271
curb (0.9.11)
73-
diff-lcs (1.4.4)
72+
diff-lcs (1.5.0)
7473
eventmachine (1.2.7)
7574
faye-websocket (0.11.1)
7675
eventmachine (>= 0.12.0)
7776
websocket-driver (>= 0.5.1)
78-
ffi (1.15.4)
77+
ffi (1.15.5)
7978
mime-types (3.4.1)
8079
mime-types-data (~> 3.2015)
81-
mime-types-data (3.2021.1115)
80+
mime-types-data (3.2022.0105)
8281
multi_test (0.1.2)
8382
nanaimo (0.3.0)
84-
nokogiri (1.12.5-x86_64-darwin)
83+
nokogiri (1.13.3-x86_64-darwin)
8584
racc (~> 1.4)
8685
optimist (3.0.1)
8786
os (1.0.1)
@@ -115,6 +114,7 @@ GEM
115114

116115
PLATFORMS
117116
x86_64-darwin-19
117+
x86_64-darwin-20
118118

119119
DEPENDENCIES
120120
bugsnag-maze-runner!
@@ -123,4 +123,4 @@ DEPENDENCIES
123123
xcpretty
124124

125125
BUNDLED WITH
126-
2.2.20
126+
2.3.8

‎Rakefile‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,12 @@ def assemble_android filter_abis=true
123123

124124
# copy kotlin dependencies required by bugsnag-android. the exact files required for each
125125
# version can be found here:
126-
# https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kotlin-stdlib-1.3.72.pom
127-
kotlin_stdlib = File.join("android-libs", "kotlin-stdlib-1.3.72.jar")
128-
kotlin_stdlib_common = File.join("android-libs", "kotlin-stdlib-common-1.3.72.jar")
129-
kotlin_annotations = File.join("android-libs", "annotations-13.0.jar")
126+
# https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4.32/kotlin-stdlib-1.4.32.pom
127+
# The exact version number here should match the version in the EDM manifest in the BugsnagEditor.cs script.
128+
# Both should be informed by what the android notifier is using
129+
kotlin_stdlib = File.join("android-libs", "org.jetbrains.kotlin.kotlin-stdlib-1.4.32.jar")
130+
kotlin_stdlib_common = File.join("android-libs", "org.jetbrains.kotlin.kotlin-stdlib-common-1.4.32.jar")
131+
kotlin_annotations = File.join("android-libs", "org.jetbrains.annotations-13.0.jar")
130132

131133
# copy unity lib
132134
unity_lib = File.join("bugsnag-android-unity", "build", "outputs", "aar", "bugsnag-android-unity-release.aar")
@@ -135,9 +137,10 @@ def assemble_android filter_abis=true
135137
cp ndk_lib, File.join(android_dir, "bugsnag-android-ndk-release.aar")
136138
cp anr_lib, File.join(android_dir, "bugsnag-plugin-android-anr-release.aar")
137139
cp unity_lib, File.join(android_dir, "bugsnag-android-unity-release.aar")
138-
cp kotlin_stdlib, File.join(android_dir, "kotlin-stdlib.jar")
139-
cp kotlin_stdlib_common, File.join(android_dir, "kotlin-stdlib-common.jar")
140-
cp kotlin_annotations, File.join(android_dir, "kotlin-annotations.jar")
140+
mkdir File.join(android_dir, "Kotlin")
141+
cp kotlin_stdlib, File.join(android_dir, "Kotlin/kotlin-stdlib.jar")
142+
cp kotlin_stdlib_common, File.join(android_dir, "Kotlin/kotlin-stdlib-common.jar")
143+
cp kotlin_annotations, File.join(android_dir, "Kotlin/kotlin-annotations.jar")
141144
end
142145

143146
namespace :plugin do

‎android-libs/kotlin-stdlib-1.3.72.jar‎

-1.32 MB
Binary file not shown.

‎android-libs/kotlin-stdlib-common-1.3.72.jar‎

-175 KB
Binary file not shown.

‎android-libs/annotations-13.0.jar‎ renamed to ‎android-libs/org.jetbrains.annotations-13.0.jar‎

File renamed without changes.

‎android-libs/org.jetbrains.kotlin.kotlin-stdlib-1.4.32.jar‎

1.43 MB
Binary file not shown.

0 commit comments

Comments
 (0)