Skip to content

Commit 789acd7

Browse files
denrasedenrase
committed
Merge branch 'main' into feat/app-context-screen
2 parents 1818545 + d312548 commit 789acd7

31 files changed

+1104
-329
lines changed

‎.github/workflows/analyze.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
if: env.GITHUB_HEAD_REF != null
5252

5353
- name: dart analyze
54-
uses: invertase/github-action-dart-analyzer@cdd8652b05bf7ed08ffce30f425436780f869f13 # pin@v1
54+
uses: invertase/github-action-dart-analyzer@1cda5922c6369263b1c7e2fbe281f69704f4d63e # pin@v2.0.0
5555
with:
5656
annotate: true
5757
fatal-infos: true

‎.github/workflows/dart.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ on:
66
- release/**
77
pull_request:
88
paths-ignore:
9-
- 'logging/**'
10-
- 'dio/**'
11-
- 'file/**'
12-
- 'sqflite/**'
9+
- "logging/**"
10+
- "dio/**"
11+
- "file/**"
12+
- "sqflite/**"
1313

1414
jobs:
1515
cancel-previous-workflow:
@@ -74,10 +74,10 @@ jobs:
7474
name: sentry
7575
files: ./dart/coverage/lcov.info
7676

77-
- uses: VeryGoodOpenSource/very_good_coverage@84e5b54ab888644554e5573dca87d7f76dec9fb3 # pin@v2.0.0
77+
- uses: VeryGoodOpenSource/very_good_coverage@e5c91bc7ce9843e87c800b3bcafdfb86fbe28491 # pin@v2.1.0
7878
if: runner.os == 'Linux' && matrix.sdk == 'stable'
7979
with:
80-
path: './dart/coverage/lcov.info'
80+
path: "./dart/coverage/lcov.info"
8181
min_coverage: 85
8282

8383
analyze:

‎.github/workflows/dio.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ on:
66
- release/**
77
pull_request:
88
paths-ignore:
9-
- 'logging/**'
10-
- 'flutter/**'
11-
- 'file/**'
12-
- 'sqflite/**'
9+
- "logging/**"
10+
- "flutter/**"
11+
- "file/**"
12+
- "sqflite/**"
1313

1414
jobs:
1515
cancel-previous-workflow:
@@ -34,7 +34,7 @@ jobs:
3434
os: [ubuntu-latest, windows-latest, macos-latest]
3535
sdk: [stable, beta]
3636
exclude:
37-
- os: windows-latest
37+
- os: windows-latest
3838
sdk: beta
3939
- os: macos-latest
4040
sdk: beta
@@ -57,10 +57,10 @@ jobs:
5757
name: sentry_dio
5858
files: ./dio/coverage/lcov.info
5959

60-
- uses: VeryGoodOpenSource/very_good_coverage@84e5b54ab888644554e5573dca87d7f76dec9fb3 # pin@v2.0.0
60+
- uses: VeryGoodOpenSource/very_good_coverage@e5c91bc7ce9843e87c800b3bcafdfb86fbe28491 # pin@v2.1.0
6161
if: runner.os == 'Linux' && matrix.sdk == 'stable'
6262
with:
63-
path: './dio/coverage/lcov.info'
63+
path: "./dio/coverage/lcov.info"
6464
min_coverage: 81
6565

6666
analyze:

‎.github/workflows/file.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ on:
66
- release/**
77
pull_request:
88
paths-ignore:
9-
- 'logging/**'
10-
- 'flutter/**'
11-
- 'dio/**'
12-
- 'sqflite/**'
9+
- "logging/**"
10+
- "flutter/**"
11+
- "dio/**"
12+
- "sqflite/**"
1313

1414
jobs:
1515
cancel-previous-workflow:
@@ -34,7 +34,7 @@ jobs:
3434
os: [ubuntu-latest, windows-latest, macos-latest]
3535
sdk: [stable, beta]
3636
exclude:
37-
- os: windows-latest
37+
- os: windows-latest
3838
sdk: beta
3939
- os: macos-latest
4040
sdk: beta
@@ -56,10 +56,10 @@ jobs:
5656
name: sentry_file
5757
files: ./file/coverage/lcov.info
5858

59-
- uses: VeryGoodOpenSource/very_good_coverage@84e5b54ab888644554e5573dca87d7f76dec9fb3 # pin@v2.0.0
59+
- uses: VeryGoodOpenSource/very_good_coverage@e5c91bc7ce9843e87c800b3bcafdfb86fbe28491 # pin@v2.1.0
6060
if: runner.os == 'Linux' && matrix.sdk == 'stable'
6161
with:
62-
path: './file/coverage/lcov.info'
62+
path: "./file/coverage/lcov.info"
6363
min_coverage: 55
6464

6565
analyze:

‎.github/workflows/flutter.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ on:
66
- release/**
77
pull_request:
88
paths-ignore:
9-
- 'logging/**'
10-
- 'dio/**'
11-
- 'file/**'
12-
- 'sqflite/**'
9+
- "logging/**"
10+
- "dio/**"
11+
- "file/**"
12+
- "sqflite/**"
1313

1414
jobs:
1515
cancel-previous-workflow:
@@ -31,8 +31,8 @@ jobs:
3131
fail-fast: false
3232
matrix:
3333
os: [ubuntu-latest, windows-latest, macos-latest]
34-
target: ['ios', 'android', 'web', 'macos', 'linux', 'windows']
35-
sdk: ['stable', 'beta']
34+
target: ["ios", "android", "web", "macos", "linux", "windows"]
35+
sdk: ["stable", "beta"]
3636
exclude:
3737
- os: ubuntu-latest
3838
target: ios
@@ -69,11 +69,11 @@ jobs:
6969
- uses: actions/setup-java@v3
7070
if: ${{ matrix.target == 'android' }}
7171
with:
72-
java-version: '11'
73-
distribution: 'adopt'
72+
java-version: "11"
73+
distribution: "adopt"
7474

7575
# Install required dependencies for Flutter on Linux on Ubuntu
76-
- name: 'Setup Linux'
76+
- name: "Setup Linux"
7777
run: |
7878
sudo apt update
7979
sudo apt install -y cmake dbus libblkid-dev libgtk-3-dev liblzma-dev ninja-build pkg-config xvfb
@@ -108,12 +108,12 @@ jobs:
108108
with:
109109
name: sentry_flutter
110110
file: ./flutter/coverage/lcov.info
111-
functionalities: 'search' # remove after https://github.com/codecov/codecov-action/issues/600
111+
functionalities: "search" # remove after https://github.com/codecov/codecov-action/issues/600
112112

113-
- uses: VeryGoodOpenSource/very_good_coverage@84e5b54ab888644554e5573dca87d7f76dec9fb3 # pin@v2.0.0
113+
- uses: VeryGoodOpenSource/very_good_coverage@e5c91bc7ce9843e87c800b3bcafdfb86fbe28491 # pin@v2.1.0
114114
if: runner.os == 'Linux' && matrix.sdk == 'stable' && matrix.target == 'linux'
115115
with:
116-
path: './flutter/coverage/lcov.info'
116+
path: "./flutter/coverage/lcov.info"
117117
min_coverage: 90
118118

119119
- name: Build ${{ matrix.target }}

‎.github/workflows/flutter_integration_test.yml renamed to ‎.github/workflows/flutter_test.yml

+45-12
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
name: flutter integration tests
1+
name: flutter native & integration test
22
on:
3-
# Currently broken, enable after fixing
4-
workflow_dispatch
5-
# push:
6-
# branches:
7-
# - main
8-
# - release/**
9-
# pull_request:
10-
# paths-ignore:
11-
# - 'file/**'
3+
push:
4+
branches:
5+
- main
6+
- release/**
7+
pull_request:
8+
paths-ignore:
9+
- 'file/**'
10+
11+
env:
12+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
1213

1314
jobs:
1415
cancel-previous-workflow:
@@ -73,6 +74,22 @@ jobs:
7374
profile: Nexus 6
7475
script: echo 'Generated AVD snapshot for caching.'
7576

77+
- name: build apk
78+
working-directory: ./flutter/example/android
79+
run: flutter build apk --debug
80+
81+
- name: launch android emulator & run android native test
82+
uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b #[email protected]
83+
with:
84+
working-directory: ./flutter/example/android
85+
api-level: 21
86+
force-avd-creation: false
87+
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
88+
disable-animations: true
89+
arch: x86_64
90+
profile: Nexus 6
91+
script: ./gradlew testDebugUnitTest
92+
7693
- name: launch android emulator & run android integration test
7794
uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b #[email protected]
7895
with:
@@ -110,10 +127,26 @@ jobs:
110127
- name: flutter pub get
111128
run: flutter pub get
112129

130+
- name: pod install
131+
working-directory: ./flutter/example/ios
132+
run: pod install
133+
113134
- name: launch ios simulator
135+
id: sim
114136
run: |
115137
simulator_id=$(xcrun simctl create sentryPhone com.apple.CoreSimulator.SimDeviceType.iPhone-14 com.apple.CoreSimulator.SimRuntime.iOS-16-2)
138+
echo "SIMULATOR_ID=${simulator_id}" >> "$GITHUB_OUTPUT"
116139
xcrun simctl boot ${simulator_id}
140+
# Disable flutter integration tests because of flaky execution
141+
# - name: run ios integration test
142+
# env:
143+
# SIMULATOR_ID: ${{ steps.sim.outputs.SIMULATOR_ID }}
144+
# run: flutter test -d "$SIMULATOR_ID" integration_test/integration_test.dart --verbose
145+
146+
- name: run ios native test
147+
working-directory: ./flutter/example/ios
148+
env:
149+
SIMULATOR_ID: ${{ steps.sim.outputs.SIMULATOR_ID }}
150+
run: xcodebuild test -workspace Runner.xcworkspace -scheme Runner -configuration Debug -destination "platform=iOS Simulator,id=$SIMULATOR_ID" -allowProvisioningUpdates CODE_SIGNING_ALLOWED=NO
151+
117152

118-
- name: run ios integration test
119-
run: flutter test integration_test/integration_test.dart --verbose

‎.github/workflows/logging.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ on:
66
- release/**
77
pull_request:
88
paths-ignore:
9-
- 'dio/**'
10-
- 'flutter/**'
11-
- 'file/**'
12-
- 'sqflite/**'
9+
- "dio/**"
10+
- "flutter/**"
11+
- "file/**"
12+
- "sqflite/**"
1313

1414
jobs:
1515
cancel-previous-workflow:
@@ -34,7 +34,7 @@ jobs:
3434
os: [ubuntu-latest, windows-latest, macos-latest]
3535
sdk: [stable, beta]
3636
exclude:
37-
- os: windows-latest
37+
- os: windows-latest
3838
sdk: beta
3939
- os: macos-latest
4040
sdk: beta
@@ -57,9 +57,9 @@ jobs:
5757
name: sentry_logging
5858
files: ./logging/coverage/lcov.info
5959

60-
- uses: VeryGoodOpenSource/very_good_coverage@84e5b54ab888644554e5573dca87d7f76dec9fb3 # pin@v2.0.0 if: runner.os == 'Linux' && matrix.sdk == 'stable'
60+
- uses: VeryGoodOpenSource/very_good_coverage@e5c91bc7ce9843e87c800b3bcafdfb86fbe28491 # pin@v2.1.0 if: runner.os == 'Linux' && matrix.sdk == 'stable'
6161
with:
62-
path: './logging/coverage/lcov.info'
62+
path: "./logging/coverage/lcov.info"
6363
min_coverage: 90
6464

6565
analyze:

‎.github/workflows/sqflite.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ on:
66
- release/**
77
pull_request:
88
paths-ignore:
9-
- 'logging/**'
10-
- 'flutter/**'
11-
- 'dio/**'
12-
- 'file/**'
9+
- "logging/**"
10+
- "flutter/**"
11+
- "dio/**"
12+
- "file/**"
1313

1414
jobs:
1515
cancel-previous-workflow:
@@ -31,8 +31,8 @@ jobs:
3131
fail-fast: false
3232
matrix:
3333
os: [ubuntu-latest, windows-latest, macos-latest]
34-
target: ['ios', 'android', 'macos', 'linux', 'windows']
35-
sdk: ['stable', 'beta']
34+
target: ["ios", "android", "macos", "linux", "windows"]
35+
sdk: ["stable", "beta"]
3636
exclude:
3737
- os: ubuntu-latest
3838
target: ios
@@ -65,11 +65,11 @@ jobs:
6565
- uses: actions/setup-java@v3
6666
if: ${{ matrix.target == 'android' }}
6767
with:
68-
java-version: '11'
69-
distribution: 'adopt'
68+
java-version: "11"
69+
distribution: "adopt"
7070

7171
# Install required dependencies for Flutter on Linux on Ubuntu
72-
- name: 'Setup Linux'
72+
- name: "Setup Linux"
7373
run: |
7474
sudo apt update
7575
sudo apt install -y cmake dbus libblkid-dev libgtk-3-dev liblzma-dev ninja-build pkg-config xvfb
@@ -97,12 +97,12 @@ jobs:
9797
with:
9898
name: sentry_sqflite
9999
file: ./sqflite/coverage/lcov.info
100-
functionalities: 'search' # remove after https://github.com/codecov/codecov-action/issues/600
100+
functionalities: "search" # remove after https://github.com/codecov/codecov-action/issues/600
101101

102-
- uses: VeryGoodOpenSource/very_good_coverage@84e5b54ab888644554e5573dca87d7f76dec9fb3 # pin@v2.0.0
102+
- uses: VeryGoodOpenSource/very_good_coverage@e5c91bc7ce9843e87c800b3bcafdfb86fbe28491 # pin@v2.1.0
103103
if: runner.os == 'Linux' && matrix.sdk == 'stable' && matrix.target == 'linux'
104104
with:
105-
path: './sqflite/coverage/lcov.info'
105+
path: "./sqflite/coverage/lcov.info"
106106
min_coverage: 80
107107

108108
analyze:

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
### Fixes
1010

11+
- Normalize data properties of `SentryUser` and `Breadcrumb` before sending over method channel ([#1591](https://github.com/getsentry/sentry-dart/pull/1591))
1112
- Fixing memory leak issue in SentryFlutterPlugin (Android Plugin) ([#1588](https://github.com/getsentry/sentry-dart/pull/1588))
1213

1314
### Dependencies

‎flutter/android/build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,7 @@ android {
6262
dependencies {
6363
api 'io.sentry:sentry-android:6.28.0'
6464
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
65+
66+
// Required -- JUnit 4 framework
67+
testImplementation "junit:junit:4.13.2"
6568
}

0 commit comments

Comments
 (0)