Skip to content

Commit 6b69699

Browse files
authored
chore: move packages into packages and use melos (#3145)
* melos setup #1: initial set up and start with dart package (#3117) * Add melos setup and check only set up Dart for now * Update * Update * Update] * Update * Update * Update * Fix CHANGELOG * Update gitignore * Fix symlink in CHANGELOG * melos #2: logging package (#3129) * Add melos setup and check only set up Dart for now * Update * Update] * Update] * Update * Update * Update * Fix CHANGELOG * Update gitignore * Fix symlink in CHANGELOG * Add logging to melos * Update * Update * Update * Update * melos #3: dio (#3130) * Add melos setup and check only set up Dart for now * Update * Update] * Update] * Update * Update * Update * Fix CHANGELOG * Update gitignore * Fix symlink in CHANGELOG * Add logging to melos * Update * Update * Update * Update * Add dio to packages * Update workflow * Update * Update * Update * Update * Update * melos #4: hive (#3131) * Add melos setup and check only set up Dart for now * Update * Update] * Update] * Update * Update * Update * Fix CHANGELOG * Update gitignore * Fix symlink in CHANGELOG * Add logging to melos * Update * Update * Update * Update * Add dio to packages * Update workflow * Update * Update * Update * Update * Update * Add hive to packages * Update * melos #5: file (#3132) * Add melos setup and check only set up Dart for now * Update * Update] * Update] * Update * Update * Update * Fix CHANGELOG * Update gitignore * Fix symlink in CHANGELOG * Add logging to melos * Update * Update * Update * Update * Add dio to packages * Update workflow * Update * Update * Update * Update * Update * Add hive to packages * Update * Add file to packages * Update file.yml * melos #6: link (#3133) * Add melos setup and check only set up Dart for now * Update * Update] * Update] * Update * Update * Update * Fix CHANGELOG * Update gitignore * Fix symlink in CHANGELOG * Add logging to melos * Update * Update * Update * Update * Add dio to packages * Update workflow * Update * Update * Update * Update * Update * Add hive to packages * Update * Add file to packages * Add link to packages * Update * melos #7: drift (#3134) * Add melos setup and check only set up Dart for now * Update * Update] * Update] * Update * Update * Update * Fix CHANGELOG * Update gitignore * Fix symlink in CHANGELOG * Add logging to melos * Update * Update * Update * Update * Add dio to packages * Update workflow * Update * Update * Update * Update * Update * Add hive to packages * Update * Add file to packages * Add link to packages * Update * Update * Update * Update * Fix test * Fix test * Fix test * Fix test * Fix test * Update drift.yml * melos #8: flutter (#3135) * Add melos setup and check only set up Dart for now * Update * Update] * Update] * Update * Update * Update * Fix CHANGELOG * Update gitignore * Fix symlink in CHANGELOG * Add logging to melos * Update * Update * Update * Update * Add dio to packages * Update workflow * Update * Update * Update * Update * Update * Add hive to packages * Update * Add file to packages * Add link to packages * Update * Update * Update * Update * Fix test * Fix test * Fix test * Fix test * Fix test * Add flutter to packages * Update * Update * Update * Update * Update * Update * Update * melos #9: isar (#3136) * Add melos setup and check only set up Dart for now * Update * Update] * Update] * Update * Update * Update * Fix CHANGELOG * Update gitignore * Fix symlink in CHANGELOG * Add logging to melos * Update * Update * Update * Update * Add dio to packages * Update workflow * Update * Update * Update * Update * Update * Add hive to packages * Update * Add file to packages * Add link to packages * Update * Update * Update * Update * Fix test * Fix test * Fix test * Fix test * Fix test * Add flutter to packages * Update * Update * Update * Update * Update * Update * Update * Update * Update * melos #10: sqflite (#3137) * Add melos setup and check only set up Dart for now * Update * Update] * Update] * Update * Update * Update * Fix CHANGELOG * Update gitignore * Fix symlink in CHANGELOG * Add logging to melos * Update * Update * Update * Update * Add dio to packages * Update workflow * Update * Update * Update * Update * Update * Add hive to packages * Update * Add file to packages * Add link to packages * Update * Update * Update * Update * Fix test * Fix test * Fix test * Fix test * Fix test * Add flutter to packages * Update * Update * Update * Update * Update * Update * Update * Update * Update * Update * Update * melos #11: firebase remote config (#3139) * Add melos setup and check only set up Dart for now * Update * Update] * Update] * Update * Update * Update * Fix CHANGELOG * Update gitignore * Fix symlink in CHANGELOG * Add logging to melos * Update * Update * Update * Update * Add dio to packages * Update workflow * Update * Update * Update * Update * Update * Add hive to packages * Update * Add file to packages * Add link to packages * Update * Update * Update * Update * Fix test * Fix test * Fix test * Fix test * Fix test * Add flutter to packages * Update * Update * Update * Update * Update * Update * Update * Update * Update * Update * Update * Update * Update * melos #12: general cleanup (#3142) * Add melos setup and check only set up Dart for now * Update * Update] * Update] * Update * Update * Update * Fix CHANGELOG * Update gitignore * Fix symlink in CHANGELOG * Add logging to melos * Update * Update * Update * Update * Add dio to packages * Update workflow * Update * Update * Update * Update * Update * Add hive to packages * Update * Add file to packages * Add link to packages * Update * Update * Update * Update * Fix test * Fix test * Fix test * Fix test * Fix test * Add flutter to packages * Update * Update * Update * Update * Update * Update * Update * Update * Update * Update * Update * Update * Update * Update * Update * Update * Clean up * Updaet * Updaet * Update * update
1 parent e99a798 commit 6b69699

File tree

1,199 files changed

+1471
-1354
lines changed

Some content is hidden

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

1,199 files changed

+1471
-1354
lines changed

.craft.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ targets:
88
# See https://github.com/getsentry/sentry-dart/pull/2113 for more context
99
skipValidation: true
1010
packages:
11-
dart:
12-
flutter:
13-
logging:
14-
dio:
15-
file:
16-
sqflite:
17-
hive:
18-
drift:
19-
isar:
20-
link:
21-
firebase_remote_config:
11+
packages/dart:
12+
packages/flutter:
13+
packages/logging:
14+
packages/dio:
15+
packages/file:
16+
packages/sqflite:
17+
packages/hive:
18+
packages/drift:
19+
packages/isar:
20+
packages/link:
21+
packages/firebase_remote_config:
2222
- name: github
2323
- name: registry
2424
sdks:

.github/actions/flutter-test/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ runs:
3939
env:
4040
INPUT_DIRECTORY: ${{ inputs.directory }}
4141
run: |
42-
if [[ "$INPUT_DIRECTORY" == 'isar' ]]; then
42+
if [[ "$INPUT_DIRECTORY" == 'packages/isar' ]]; then
4343
testCmd="flutter test -j 1 --test-randomize-ordering-seed=random"
4444
else
4545
testCmd="flutter test --test-randomize-ordering-seed=random"
4646
fi
4747
4848
if ${{ (matrix.target == 'linux' && matrix.sdk == 'stable' && 'true') || 'false' }} ; then
4949
$testCmd --coverage
50-
if [[ "$INPUT_DIRECTORY" == 'flutter' ]] ; then
50+
if [[ "$INPUT_DIRECTORY" == 'packages/flutter' ]]; then
5151
dart run remove_from_coverage -f coverage/lcov.info -r 'binding.dart'
5252
fi
5353
else

.github/file-filters.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# This is used by the action https://github.com/dorny/paths-filter
22

33
high_risk_code: &high_risk_code
4-
- "flutter/lib/src/span_frame_metrics_collector.dart"
5-
- "flutter/lib/src/integrations/native_app_start_integration.dart"
6-
- "flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt"
7-
- "flutter/ios/Classes/SentryFlutterPluginApple.swift"
8-
- "flutter/lib/src/screenshot/recorder.dart"
9-
- "flutter/lib/src/screenshot/widget_filter.dart"
10-
- "flutter/lib/src/native/java/android_replay_recorder.dart"
4+
- "packages/flutter/lib/src/span_frame_metrics_collector.dart"
5+
- "packages/flutter/lib/src/integrations/native_app_start_integration.dart"
6+
- "packages/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt"
7+
- "packages/flutter/ios/Classes/SentryFlutterPluginApple.swift"
8+
- "packages/flutter/lib/src/screenshot/recorder.dart"
9+
- "packages/flutter/lib/src/screenshot/widget_filter.dart"
10+
- "packages/flutter/lib/src/native/java/android_replay_recorder.dart"

.github/workflows/analyze.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
- run: flutter pub get
4747
if: ${{ inputs.package == 'flutter' }}
48-
working-directory: flutter/microbenchmarks
48+
working-directory: packages/flutter/microbenchmarks
4949

5050
- run: dart format --set-exit-if-changed ./
5151

@@ -73,7 +73,7 @@ jobs:
7373
if: ${{ inputs.package == 'flutter' }}
7474
working-directory: ${{ inputs.package }}
7575
run: |
76-
sed -i.bak 's|sentry:.*|sentry:\n path: /github/workspace/dart|g' pubspec.yaml
76+
sed -i.bak 's|sentry:.*|sentry:\n path: /github/workspace/packages/dart|g' pubspec.yaml
7777
- uses: axel-op/dart-package-analyzer@56afb7e6737bd2b7cee05382ae7f0e8111138080 # pin@v3
7878
id: analysis
7979
with:

.github/workflows/dart.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
- '.github/workflows/analyze.yml'
1313
- '.github/actions/dart-test/**'
1414
- '.github/actions/coverage/**'
15-
- 'dart/**'
15+
- 'packages/dart/**'
1616

1717
jobs:
1818
cancel-previous-workflow:
@@ -45,24 +45,24 @@ jobs:
4545

4646
- uses: ./.github/actions/dart-test
4747
with:
48-
directory: dart
48+
directory: packages/dart
4949

5050
- uses: ./.github/actions/coverage
5151
if: runner.os == 'Linux' && matrix.sdk == 'stable'
5252
with:
5353
token: ${{ secrets.CODECOV_TOKEN }}
54-
directory: dart
54+
directory: packages/dart
5555
coverage: sentry
5656
min-coverage: 85
5757

5858
- name: Build example
59-
working-directory: dart/example
59+
working-directory: packages/dart/example
6060
run: |
6161
dart pub get
6262
dart compile aot-snapshot bin/example.dart
6363
6464
analyze:
6565
uses: ./.github/workflows/analyze.yml
6666
with:
67-
package: dart
67+
package: packages/dart
6868
panaThreshold: 87

.github/workflows/dio.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ on:
1212
- '.github/workflows/analyze.yml'
1313
- '.github/actions/dart-test/**'
1414
- '.github/actions/coverage/**'
15-
- 'dart/**'
16-
- 'dio/**'
15+
- 'packages/dart/**'
16+
- 'packages/dio/**'
1717

1818
jobs:
1919
cancel-previous-workflow:
@@ -39,17 +39,17 @@ jobs:
3939

4040
- uses: ./.github/actions/dart-test
4141
with:
42-
directory: dio
42+
directory: packages/dio
4343

4444
- uses: ./.github/actions/coverage
4545
if: runner.os == 'Linux' && matrix.sdk == 'stable'
4646
with:
4747
token: ${{ secrets.CODECOV_TOKEN }}
48-
directory: dio
48+
directory: packages/dio
4949
coverage: sentry_dio
5050
min-coverage: 81
5151

5252
analyze:
5353
uses: ./.github/workflows/analyze.yml
5454
with:
55-
package: dio
55+
package: packages/dio

.github/workflows/drift.yml

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ on:
1010
- '!**/class-diagram.svg'
1111
- '.github/workflows/drift.yml'
1212
- '.github/workflows/analyze.yml'
13-
- '.github/actions/flutter-test/**'
13+
- '.github/actions/dart-test/**'
1414
- '.github/actions/coverage/**'
15-
- 'dart/**'
16-
- 'drift/**'
15+
- 'packages/dart/**'
16+
- 'packages/drift/**'
1717

1818
jobs:
1919
cancel-previous-workflow:
@@ -25,36 +25,47 @@ jobs:
2525
access_token: ${{ github.token }}
2626

2727
build:
28-
name: '${{ matrix.target }} | ${{ matrix.sdk }}'
29-
runs-on: ${{ matrix.target == 'linux' && 'ubuntu' || matrix.target }}-latest
28+
name: '${{ matrix.os }} | ${{ matrix.sdk }}'
29+
runs-on: ${{ matrix.os }}-latest
3030
timeout-minutes: 30
3131
strategy:
3232
fail-fast: false
3333
matrix:
34-
target: [macos, linux, windows]
34+
os: [ubuntu, macos, windows]
3535
sdk: [stable, beta]
3636

3737
steps:
3838
- uses: actions/checkout@v4
3939

40-
- name: Install libsqlite3
41-
if: matrix.target == 'linux'
40+
- name: Install libsqlite3 (Ubuntu)
41+
if: matrix.os == 'ubuntu'
4242
run: sudo apt-get -y install libsqlite3-dev
4343

44-
- uses: ./.github/actions/flutter-test
44+
- name: Install SQLite (macOS)
45+
if: matrix.os == 'macos'
46+
run: brew install sqlite3
47+
48+
- name: Install SQLite (Windows)
49+
if: matrix.os == 'windows'
50+
shell: powershell
51+
run: |
52+
choco install sqlite -y
53+
echo "C:/ProgramData/chocolatey/lib/sqlite/tools" >> $GITHUB_PATH
54+
55+
- uses: ./.github/actions/dart-test
4556
with:
46-
directory: drift
57+
directory: packages/drift
58+
web: 'false'
4759

4860
- uses: ./.github/actions/coverage
49-
if: matrix.target == 'linux' && matrix.sdk == 'stable'
61+
if: matrix.os == 'ubuntu' && matrix.sdk == 'stable'
5062
with:
5163
token: ${{ secrets.CODECOV_TOKEN }}
52-
directory: drift
64+
directory: packages/drift
5365
coverage: sentry_drift
5466
min-coverage: 80
5567

5668
analyze:
5769
uses: ./.github/workflows/analyze.yml
5870
with:
59-
package: drift
60-
sdk: flutter
71+
package: packages/drift

.github/workflows/e2e_dart.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ on:
99
- "!**/*.md"
1010
- "!**/class-diagram.svg"
1111
- ".github/workflows/e2e_dart.yml"
12-
- '.github/workflows/analyze.yml'
13-
- "dart/**"
12+
- ".github/workflows/analyze.yml"
13+
- "packages/dart/**"
1414
- "e2e_test/**"
1515

1616
env:

.github/workflows/file.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ on:
1212
- '.github/workflows/analyze.yml'
1313
- '.github/actions/dart-test/**'
1414
- '.github/actions/coverage/**'
15-
- 'dart/**'
16-
- 'flutter/**'
17-
- 'file/**'
15+
- 'packages/dart/**'
16+
- 'packages/file/**'
1817

1918
jobs:
2019
cancel-previous-workflow:
@@ -40,19 +39,19 @@ jobs:
4039

4140
- uses: ./.github/actions/dart-test
4241
with:
43-
directory: file
42+
directory: packages/file
4443
web: false
4544

4645
- uses: ./.github/actions/coverage
4746
if: runner.os == 'Linux' && matrix.sdk == 'stable'
4847
with:
4948
token: ${{ secrets.CODECOV_TOKEN }}
50-
directory: file
49+
directory: packages/file
5150
coverage: sentry_file
5251
min-coverage: 55
5352

5453
analyze:
5554
uses: ./.github/workflows/analyze.yml
5655
with:
57-
package: file
56+
package: packages/file
5857
panaThreshold: 90

.github/workflows/firebase_remote_config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ on:
1212
- '.github/workflows/analyze.yml'
1313
- '.github/actions/dart-test/**'
1414
- '.github/actions/coverage/**'
15-
- 'dart/**'
16-
- 'flutter/**'
17-
- 'firebase_remote_config/**'
15+
- 'packages/dart/**'
16+
- 'packages/flutter/**'
17+
- 'packages/firebase_remote_config/**'
1818

1919
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
2020
concurrency:
@@ -37,7 +37,7 @@ jobs:
3737

3838
- uses: ./.github/actions/flutter-test
3939
with:
40-
directory: firebase_remote_config
40+
directory: packages/firebase_remote_config
4141
web: false
4242

4343
# TODO: don't set coverage for now to finish publishing it
@@ -52,5 +52,5 @@ jobs:
5252
analyze:
5353
uses: ./.github/workflows/analyze.yml
5454
with:
55-
package: firebase_remote_config
55+
package: packages/firebase_remote_config
5656
sdk: flutter

0 commit comments

Comments
 (0)