Skip to content

Commit 7f9187c

Browse files
buenaflorbuenaflor
committed
Merge branch 'main' into temp/8.14.2
2 parents 9a204bf + db64b25 commit 7f9187c

File tree

446 files changed

+14324
-8113
lines changed

Some content is hidden

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

446 files changed

+14324
-8113
lines changed

‎.craft.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ targets:
1818
drift:
1919
isar:
2020
link:
21+
firebase_remote_config:
2122
- name: github
2223
- name: registry
2324
sdks:
@@ -31,4 +32,6 @@ targets:
3132
pub:sentry_hive:
3233
pub:sentry_isar:
3334
# TODO: after we published link we need to add it to the registry repo and then uncomment here
34-
# pub:sentry_link:
35+
# pub:sentry_link:
36+
# TODO: after we published firebase we need to add it to the registry repo and then uncomment here
37+
# pub:sentry_firebase_remote_config:

‎.github/actions/coverage/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ runs:
3333
with:
3434
path: './${{ inputs.directory }}/coverage/lcov.info'
3535
min_coverage: ${{ inputs.min-coverage }}
36-
exclude: 'lib/src/native/cocoa/binding.dart'
36+
exclude: 'lib/src/native/**/binding.dart lib/src/native/java/android_replay_recorder.dart'

‎.github/file-filters.yml

+1
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ high_risk_code: &high_risk_code
77
- "flutter/ios/Classes/SentryFlutterPluginApple.swift"
88
- "flutter/lib/src/screenshot/recorder.dart"
99
- "flutter/lib/src/screenshot/widget_filter.dart"
10+
- "flutter/lib/src/native/java/android_replay_recorder.dart"

‎.github/workflows/analyze.yml

+2-7
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- uses: actions/checkout@v4
3535
- uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c # pin@v1
3636
if: ${{ inputs.sdk == 'dart' }}
37-
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # pin@v2.18.0
37+
- uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # pin@v2.19.0
3838
if: ${{ inputs.sdk == 'flutter' }}
3939

4040
- run: ${{ inputs.sdk }} pub get
@@ -54,17 +54,12 @@ jobs:
5454

5555
- run: dart doc --dry-run
5656

57-
- name: Run publish validation
58-
run: |
59-
dart pub get --directory ../scripts/publish_validation
60-
dart run ../scripts/publish_validation/bin/publish_validation.dart --executable ${{ inputs.sdk }}
61-
6257
package-analysis:
6358
# `axel-op/dart-package-analyzer` is using `flutter pub upgrade` instead of `get`,
6459
# which ignores pubspec.yaml `dependency_overrides`. Because of that, all `release/*` branches are failing,
6560
# because the package cannot find the "about to be released" version of our sentry-dart package that it depends on.
6661
if: ${{ !startsWith(github.ref, 'refs/heads/release/') && inputs.panaThreshold > 0 }}
67-
runs-on: ubuntu-20.04
62+
runs-on: ubuntu-latest
6863
timeout-minutes: 20
6964
steps:
7065
- uses: actions/checkout@v4

‎.github/workflows/dart.yml

-7
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,6 @@ jobs:
3232
matrix:
3333
os: [ubuntu]
3434
sdk:
35-
- '2.18'
36-
- '2.19'
37-
- '3.0'
38-
- '3.1'
39-
- '3.2'
40-
- '3.3'
41-
- '3.4'
4235
- '3.5'
4336
- stable
4437
- beta

‎.github/workflows/diagrams.yml

+8
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@ jobs:
5151
working-directory: ./isar
5252
run: lakos . -i "{test/**,example/**}" | dot -Tsvg -o class-diagram.svg
5353

54+
- name: link
55+
working-directory: ./link
56+
run: lakos . -i "{test/**,example/**}" | dot -Tsvg -o class-diagram.svg
57+
58+
- name: firebase_remote_config
59+
working-directory: ./firebase_remote_config
60+
run: lakos . -i "{test/**,example/**}" | dot -Tsvg -o class-diagram.svg
61+
5462
# Source: https://stackoverflow.com/a/58035262
5563
- name: Extract branch name
5664
shell: bash

‎.github/workflows/firebase_remote_config.yml

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: sentry-firebase-remote-config
2+
on:
3+
push:
4+
branches:
5+
- main
6+
- release/**
7+
pull_request:
8+
paths:
9+
- '!**/*.md'
10+
- '!**/class-diagram.svg'
11+
- '.github/workflows/firebase_remote_config.yml'
12+
- '.github/workflows/analyze.yml'
13+
- '.github/actions/dart-test/**'
14+
- '.github/actions/coverage/**'
15+
- 'dart/**'
16+
- 'flutter/**'
17+
- 'firebase_remote_config/**'
18+
19+
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
20+
concurrency:
21+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
22+
cancel-in-progress: true
23+
24+
jobs:
25+
build:
26+
name: '${{ matrix.os }} | ${{ matrix.sdk }}'
27+
runs-on: ${{ matrix.os }}-latest
28+
timeout-minutes: 30
29+
strategy:
30+
fail-fast: false
31+
matrix:
32+
os: [macos, ubuntu, windows]
33+
sdk: [stable, beta]
34+
35+
steps:
36+
- uses: actions/checkout@v4
37+
38+
- uses: ./.github/actions/flutter-test
39+
with:
40+
directory: firebase_remote_config
41+
web: false
42+
43+
# TODO: don't set coverage for now to finish publishing it
44+
# - uses: ./.github/actions/coverage
45+
# if: runner.os == 'Linux' && matrix.sdk == 'stable'
46+
# with:
47+
# token: ${{ secrets.CODECOV_TOKEN }}
48+
# directory: firebase_remote_config
49+
# coverage: sentry_firebase_remote_config
50+
# min-coverage: 55
51+
52+
analyze:
53+
uses: ./.github/workflows/analyze.yml
54+
with:
55+
package: firebase_remote_config
56+
sdk: flutter

‎.github/workflows/flutter.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,17 @@ jobs:
112112

113113
steps:
114114
- uses: actions/checkout@v4
115-
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # [email protected]
115+
116+
- uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # [email protected]
116117
with:
117118
channel: main
118-
- run: flutter upgrade
119+
119120
- run: flutter config --enable-swift-package-manager
121+
120122
- name: Run on iOS
121123
if: matrix.target == 'ios'
122124
run: flutter build ios --no-codesign
125+
123126
- name: Run on macOS
124127
if: matrix.target == 'macos'
125128
run: flutter build macos

‎.github/workflows/flutter_test.yml

+9-12
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
distribution: 'adopt'
5050
java-version: '17'
5151

52-
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # pin@v2.18.0
52+
- uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # pin@v2.19.0
5353
with:
5454
channel: ${{ matrix.sdk }}
5555

@@ -65,7 +65,7 @@ jobs:
6565
run: flutter build apk --debug --target-platform=android-x64
6666

6767
- name: launch android emulator & run android native test
68-
uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d #pin@v2.33.0
68+
uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed #pin@v2.34.0
6969
with:
7070
working-directory: ./flutter/example/android
7171
api-level: 31
@@ -78,7 +78,7 @@ jobs:
7878
script: ./gradlew testDebugUnitTest
7979

8080
- name: launch android emulator & run android integration test
81-
uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d #pin@v2.33.0
81+
uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed #pin@v2.34.0
8282
with:
8383
working-directory: ./flutter/example
8484
api-level: 31
@@ -91,7 +91,7 @@ jobs:
9191
script: flutter test integration_test/all.dart --dart-define SENTRY_AUTH_TOKEN_E2E=$SENTRY_AUTH_TOKEN_E2E --verbose
9292

9393
- name: launch android emulator & run android integration test in profile mode
94-
uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d #pin@v2.33.0
94+
uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed #pin@v2.34.0
9595
with:
9696
working-directory: ./flutter/example
9797
api-level: 31
@@ -119,7 +119,7 @@ jobs:
119119
- name: checkout
120120
uses: actions/checkout@v4
121121

122-
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # pin@v2.18.0
122+
- uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # pin@v2.19.0
123123
with:
124124
channel: ${{ matrix.sdk }}
125125

@@ -178,13 +178,10 @@ jobs:
178178
chrome-version: stable
179179
- run: chrome --version
180180

181-
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # pin@v2.18.0
181+
- uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # pin@v2.19.0
182182
with:
183183
channel: ${{ matrix.sdk }}
184184

185-
- name: flutter upgrade
186-
run: flutter upgrade
187-
188185
- name: flutter pub get
189186
run: flutter pub get
190187

@@ -204,15 +201,15 @@ jobs:
204201
# Start Xvfb with specific screen settings
205202
Xvfb -ac :99 -screen 0 1280x1024x16 &
206203
export DISPLAY=:99
207-
204+
208205
# Start ChromeDriver
209206
chromedriver --port=4444 &
210-
207+
211208
# Wait for services to start
212209
sleep 5
213210
214211
# Run the tests
215212
flutter drive \
216213
--driver=integration_test/test_driver/driver.dart \
217214
--target=integration_test/web_sdk_test.dart \
218-
-d chrome
215+
-d chrome

‎.github/workflows/format-and-fix.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- uses: actions/checkout@v4
3333
- uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c # pin@v1
3434
if: ${{ matrix.package.sdk == 'dart' }}
35-
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # pin@v2.18.0
35+
- uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # pin@v2.19.0
3636
if: ${{ matrix.package.sdk == 'flutter' }}
3737

3838
- run: ${{ matrix.package.sdk }} pub get

‎.github/workflows/metrics.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
echo "flutter=$version" >> "$GITHUB_OUTPUT"
5454
5555
- name: Install Flutter v${{ steps.conf.outputs.flutter }}
56-
uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # pin@v2.18.0
56+
uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # pin@v2.19.0
5757
with:
5858
flutter-version: ${{ steps.conf.outputs.flutter }}
5959

@@ -97,7 +97,7 @@ jobs:
9797
runs-on: ubuntu-latest
9898
steps:
9999
- uses: actions/checkout@v4
100-
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # pin@v2.18.0
100+
- uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # pin@v2.19.0
101101

102102
- name: create dart sample apps
103103
working-directory: ./metrics

‎.github/workflows/min_version_test.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ jobs:
3232
- uses: actions/setup-java@v4
3333
with:
3434
distribution: "adopt"
35-
java-version: "11"
35+
java-version: "17"
3636

37-
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # pin@v2.18.0
37+
- uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # pin@v2.19.0
3838
with:
39-
flutter-version: "3.0.0"
39+
flutter-version: "3.24.0"
4040

4141
- name: Build Android
4242
run: |
@@ -51,11 +51,11 @@ jobs:
5151
steps:
5252
- uses: actions/checkout@v4
5353

54-
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # pin@v2.18.0
54+
- uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # pin@v2.19.0
5555
with:
56-
flutter-version: "3.0.0"
56+
flutter-version: "3.24.0"
5757

58-
- uses: ruby/setup-ruby@277ba2a127aba66d45bad0fa2dc56f80dbfedffa # pin@v1.222.0
58+
- uses: ruby/setup-ruby@ca041f971d66735f3e5ff1e21cc13e2d51e7e535 # pin@v1.233.0
5959
with:
6060
ruby-version: '3.1.2' # https://github.com/flutter/flutter/issues/109385#issuecomment-1212614125
6161

@@ -82,9 +82,9 @@ jobs:
8282
steps:
8383
- uses: actions/checkout@v4
8484

85-
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # pin@v2.18.0
85+
- uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # pin@v2.19.0
8686
with:
87-
flutter-version: "3.0.0"
87+
flutter-version: "3.24.0"
8888

8989
- name: Build web
9090
run: |

‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- name: Get auth token
2121
id: token
22-
uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
22+
uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
2323
with:
2424
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2525
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

‎.github/workflows/testflight.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
runs-on: macos-13
1515
steps:
1616
- uses: actions/checkout@v4
17-
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # pin@v2.18.0
17+
- uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # pin@v2.19.0
1818
- run: xcodes select 15.0.1
19-
- uses: ruby/setup-ruby@277ba2a127aba66d45bad0fa2dc56f80dbfedffa # pin@v1.222.0
19+
- uses: ruby/setup-ruby@ca041f971d66735f3e5ff1e21cc13e2d51e7e535 # pin@v1.233.0
2020
with:
2121
ruby-version: '2.7.5'
2222
bundler-cache: true

‎.github/workflows/web-example-ghpages.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- uses: actions/checkout@v4
17-
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff # pin@v2.18.0
17+
- uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # pin@v2.19.0
1818
- uses: bluefireteam/flutter-gh-pages@cf4a9312849577dbfd9df8f3d63d12ef6b09898e # pin@v9
1919
with:
2020
workingDir: flutter/example

0 commit comments

Comments
 (0)