diff --git a/.craft.yml b/.craft.yml index de509f4f7b..388710aa6e 100644 --- a/.craft.yml +++ b/.craft.yml @@ -8,17 +8,17 @@ targets: # See https://github.com/getsentry/sentry-dart/pull/2113 for more context skipValidation: true packages: - dart: - flutter: - logging: - dio: - file: - sqflite: - hive: - drift: - isar: - link: - firebase_remote_config: + packages/dart: + packages/flutter: + packages/logging: + packages/dio: + packages/file: + packages/sqflite: + packages/hive: + packages/drift: + packages/isar: + packages/link: + packages/firebase_remote_config: - name: github - name: registry sdks: diff --git a/.github/actions/flutter-test/action.yml b/.github/actions/flutter-test/action.yml index f32b21efe2..b3f10b0ba8 100644 --- a/.github/actions/flutter-test/action.yml +++ b/.github/actions/flutter-test/action.yml @@ -39,7 +39,7 @@ runs: env: INPUT_DIRECTORY: ${{ inputs.directory }} run: | - if [[ "$INPUT_DIRECTORY" == 'isar' ]]; then + if [[ "$INPUT_DIRECTORY" == 'packages/isar' ]]; then testCmd="flutter test -j 1 --test-randomize-ordering-seed=random" else testCmd="flutter test --test-randomize-ordering-seed=random" @@ -47,7 +47,7 @@ runs: if ${{ (matrix.target == 'linux' && matrix.sdk == 'stable' && 'true') || 'false' }} ; then $testCmd --coverage - if [[ "$INPUT_DIRECTORY" == 'flutter' ]] ; then + if [[ "$INPUT_DIRECTORY" == 'packages/flutter' ]]; then dart run remove_from_coverage -f coverage/lcov.info -r 'binding.dart' fi else diff --git a/.github/file-filters.yml b/.github/file-filters.yml index 7280ac9201..911be318c1 100644 --- a/.github/file-filters.yml +++ b/.github/file-filters.yml @@ -1,10 +1,10 @@ # This is used by the action https://github.com/dorny/paths-filter high_risk_code: &high_risk_code - - "flutter/lib/src/span_frame_metrics_collector.dart" - - "flutter/lib/src/integrations/native_app_start_integration.dart" - - "flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt" - - "flutter/ios/Classes/SentryFlutterPluginApple.swift" - - "flutter/lib/src/screenshot/recorder.dart" - - "flutter/lib/src/screenshot/widget_filter.dart" - - "flutter/lib/src/native/java/android_replay_recorder.dart" + - "packages/flutter/lib/src/span_frame_metrics_collector.dart" + - "packages/flutter/lib/src/integrations/native_app_start_integration.dart" + - "packages/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt" + - "packages/flutter/ios/Classes/SentryFlutterPluginApple.swift" + - "packages/flutter/lib/src/screenshot/recorder.dart" + - "packages/flutter/lib/src/screenshot/widget_filter.dart" + - "packages/flutter/lib/src/native/java/android_replay_recorder.dart" diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml index 139bd091bc..f5115f52fc 100644 --- a/.github/workflows/analyze.yml +++ b/.github/workflows/analyze.yml @@ -45,7 +45,7 @@ jobs: - run: flutter pub get if: ${{ inputs.package == 'flutter' }} - working-directory: flutter/microbenchmarks + working-directory: packages/flutter/microbenchmarks - run: dart format --set-exit-if-changed ./ @@ -73,7 +73,7 @@ jobs: if: ${{ inputs.package == 'flutter' }} working-directory: ${{ inputs.package }} run: | - sed -i.bak 's|sentry:.*|sentry:\n path: /github/workspace/dart|g' pubspec.yaml + sed -i.bak 's|sentry:.*|sentry:\n path: /github/workspace/packages/dart|g' pubspec.yaml - uses: axel-op/dart-package-analyzer@56afb7e6737bd2b7cee05382ae7f0e8111138080 # pin@v3 id: analysis with: diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index c007b1d4ee..35f5ce4e15 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -12,7 +12,7 @@ on: - '.github/workflows/analyze.yml' - '.github/actions/dart-test/**' - '.github/actions/coverage/**' - - 'dart/**' + - 'packages/dart/**' jobs: cancel-previous-workflow: @@ -45,18 +45,18 @@ jobs: - uses: ./.github/actions/dart-test with: - directory: dart + directory: packages/dart - uses: ./.github/actions/coverage if: runner.os == 'Linux' && matrix.sdk == 'stable' with: token: ${{ secrets.CODECOV_TOKEN }} - directory: dart + directory: packages/dart coverage: sentry min-coverage: 85 - name: Build example - working-directory: dart/example + working-directory: packages/dart/example run: | dart pub get dart compile aot-snapshot bin/example.dart @@ -64,5 +64,5 @@ jobs: analyze: uses: ./.github/workflows/analyze.yml with: - package: dart + package: packages/dart panaThreshold: 87 diff --git a/.github/workflows/dio.yml b/.github/workflows/dio.yml index ec461025a1..a2de24b88d 100644 --- a/.github/workflows/dio.yml +++ b/.github/workflows/dio.yml @@ -12,8 +12,8 @@ on: - '.github/workflows/analyze.yml' - '.github/actions/dart-test/**' - '.github/actions/coverage/**' - - 'dart/**' - - 'dio/**' + - 'packages/dart/**' + - 'packages/dio/**' jobs: cancel-previous-workflow: @@ -39,17 +39,17 @@ jobs: - uses: ./.github/actions/dart-test with: - directory: dio + directory: packages/dio - uses: ./.github/actions/coverage if: runner.os == 'Linux' && matrix.sdk == 'stable' with: token: ${{ secrets.CODECOV_TOKEN }} - directory: dio + directory: packages/dio coverage: sentry_dio min-coverage: 81 analyze: uses: ./.github/workflows/analyze.yml with: - package: dio + package: packages/dio diff --git a/.github/workflows/drift.yml b/.github/workflows/drift.yml index 43d6f9e435..ca443e3fa3 100644 --- a/.github/workflows/drift.yml +++ b/.github/workflows/drift.yml @@ -10,10 +10,10 @@ on: - '!**/class-diagram.svg' - '.github/workflows/drift.yml' - '.github/workflows/analyze.yml' - - '.github/actions/flutter-test/**' + - '.github/actions/dart-test/**' - '.github/actions/coverage/**' - - 'dart/**' - - 'drift/**' + - 'packages/dart/**' + - 'packages/drift/**' jobs: cancel-previous-workflow: @@ -25,36 +25,47 @@ jobs: access_token: ${{ github.token }} build: - name: '${{ matrix.target }} | ${{ matrix.sdk }}' - runs-on: ${{ matrix.target == 'linux' && 'ubuntu' || matrix.target }}-latest + name: '${{ matrix.os }} | ${{ matrix.sdk }}' + runs-on: ${{ matrix.os }}-latest timeout-minutes: 30 strategy: fail-fast: false matrix: - target: [macos, linux, windows] + os: [ubuntu, macos, windows] sdk: [stable, beta] steps: - uses: actions/checkout@v4 - - name: Install libsqlite3 - if: matrix.target == 'linux' + - name: Install libsqlite3 (Ubuntu) + if: matrix.os == 'ubuntu' run: sudo apt-get -y install libsqlite3-dev - - uses: ./.github/actions/flutter-test + - name: Install SQLite (macOS) + if: matrix.os == 'macos' + run: brew install sqlite3 + + - name: Install SQLite (Windows) + if: matrix.os == 'windows' + shell: powershell + run: | + choco install sqlite -y + echo "C:/ProgramData/chocolatey/lib/sqlite/tools" >> $GITHUB_PATH + + - uses: ./.github/actions/dart-test with: - directory: drift + directory: packages/drift + web: 'false' - uses: ./.github/actions/coverage - if: matrix.target == 'linux' && matrix.sdk == 'stable' + if: matrix.os == 'ubuntu' && matrix.sdk == 'stable' with: token: ${{ secrets.CODECOV_TOKEN }} - directory: drift + directory: packages/drift coverage: sentry_drift min-coverage: 80 analyze: uses: ./.github/workflows/analyze.yml with: - package: drift - sdk: flutter + package: packages/drift diff --git a/.github/workflows/e2e_dart.yml b/.github/workflows/e2e_dart.yml index ad4a4ab945..ef836a95e5 100644 --- a/.github/workflows/e2e_dart.yml +++ b/.github/workflows/e2e_dart.yml @@ -9,8 +9,8 @@ on: - "!**/*.md" - "!**/class-diagram.svg" - ".github/workflows/e2e_dart.yml" - - '.github/workflows/analyze.yml' - - "dart/**" + - ".github/workflows/analyze.yml" + - "packages/dart/**" - "e2e_test/**" env: diff --git a/.github/workflows/file.yml b/.github/workflows/file.yml index eda4c26ae3..4725780e0a 100644 --- a/.github/workflows/file.yml +++ b/.github/workflows/file.yml @@ -12,9 +12,8 @@ on: - '.github/workflows/analyze.yml' - '.github/actions/dart-test/**' - '.github/actions/coverage/**' - - 'dart/**' - - 'flutter/**' - - 'file/**' + - 'packages/dart/**' + - 'packages/file/**' jobs: cancel-previous-workflow: @@ -40,19 +39,19 @@ jobs: - uses: ./.github/actions/dart-test with: - directory: file + directory: packages/file web: false - uses: ./.github/actions/coverage if: runner.os == 'Linux' && matrix.sdk == 'stable' with: token: ${{ secrets.CODECOV_TOKEN }} - directory: file + directory: packages/file coverage: sentry_file min-coverage: 55 analyze: uses: ./.github/workflows/analyze.yml with: - package: file + package: packages/file panaThreshold: 90 diff --git a/.github/workflows/firebase_remote_config.yml b/.github/workflows/firebase_remote_config.yml index 09ad1f6a93..06e845c54d 100644 --- a/.github/workflows/firebase_remote_config.yml +++ b/.github/workflows/firebase_remote_config.yml @@ -12,9 +12,9 @@ on: - '.github/workflows/analyze.yml' - '.github/actions/dart-test/**' - '.github/actions/coverage/**' - - 'dart/**' - - 'flutter/**' - - 'firebase_remote_config/**' + - 'packages/dart/**' + - 'packages/flutter/**' + - 'packages/firebase_remote_config/**' # https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value concurrency: @@ -37,7 +37,7 @@ jobs: - uses: ./.github/actions/flutter-test with: - directory: firebase_remote_config + directory: packages/firebase_remote_config web: false # TODO: don't set coverage for now to finish publishing it @@ -52,5 +52,5 @@ jobs: analyze: uses: ./.github/workflows/analyze.yml with: - package: firebase_remote_config + package: packages/firebase_remote_config sdk: flutter diff --git a/.github/workflows/flutter.yml b/.github/workflows/flutter.yml index 45dbf50fc9..c79fb7ed45 100644 --- a/.github/workflows/flutter.yml +++ b/.github/workflows/flutter.yml @@ -12,8 +12,8 @@ on: - '.github/actions/coverage/**' - '!**/*.md' - '!**/class-diagram.svg' - - 'dart/**' - - 'flutter/**' + - 'packages/dart/**' + - 'packages/flutter/**' - 'metrics/flutter.properties' jobs: @@ -61,20 +61,20 @@ jobs: - uses: ./.github/actions/flutter-test with: - directory: flutter + directory: packages/flutter - uses: ./.github/actions/coverage if: matrix.target == 'linux' && matrix.sdk == 'stable' with: token: ${{ secrets.CODECOV_TOKEN }} - directory: flutter + directory: packages/flutter coverage: sentry_flutter min-coverage: 90 - name: Build example for ${{ matrix.target }} # The example currently doesn't support compiling for WASM. Should be OK once we add package:web in v9. if: matrix.target != 'wasm' - working-directory: flutter/example + working-directory: packages/flutter/example shell: bash run: | flutter config --enable-windows-desktop @@ -110,7 +110,7 @@ jobs: defaults: run: shell: bash - working-directory: flutter/example + working-directory: packages/flutter/example strategy: fail-fast: false matrix: @@ -136,7 +136,7 @@ jobs: analyze: uses: ./.github/workflows/analyze.yml with: - package: flutter + package: packages/flutter sdk: flutter panaThreshold: 87 @@ -145,7 +145,7 @@ jobs: timeout-minutes: 20 defaults: run: - working-directory: ./flutter + working-directory: packages/flutter steps: - uses: actions/checkout@v4 # https://github.com/CocoaPods/CocoaPods/issues/5275#issuecomment-315461879 @@ -156,7 +156,7 @@ jobs: timeout-minutes: 20 defaults: run: - working-directory: ./flutter + working-directory: packages/flutter steps: - uses: actions/checkout@v4 - uses: norio-nomura/action-swiftlint@9f4dcd7fd46b4e75d7935cf2f4df406d5cae3684 # pin@3.2.1 @@ -168,7 +168,7 @@ jobs: timeout-minutes: 20 defaults: run: - working-directory: ./flutter + working-directory: packages/flutter steps: - uses: actions/checkout@v4 @@ -185,7 +185,7 @@ jobs: timeout-minutes: 20 steps: - uses: actions/checkout@v4 - # To recreate baseline run: detekt -i flutter/android,flutter/example/android -b flutter/config/detekt-bl.xml -cb + # To recreate baseline run: detekt -i packages/flutter/android,packages/flutter/example/android -b packages/flutter/config/detekt-bl.xml -cb - uses: natiginfo/action-detekt-all@45229fbbe47eaff1160b6c956d7ffe14dc23c206 # pin@1.23.8 with: - args: -i flutter/android,flutter/example/android --baseline flutter/config/detekt-bl.xml --jvm-target 1.8 --build-upon-default-config --all-rules + args: -i packages/flutter/android,packages/flutter/example/android --baseline packages/flutter/config/detekt-bl.xml --jvm-target 1.8 --build-upon-default-config --all-rules diff --git a/.github/workflows/flutter_test.yml b/.github/workflows/flutter_test.yml index f5c84b24a3..e29bd73dce 100644 --- a/.github/workflows/flutter_test.yml +++ b/.github/workflows/flutter_test.yml @@ -9,8 +9,8 @@ on: - '!**/*.md' - '!**/class-diagram.svg' - '.github/workflows/flutter_test.yml' - - 'dart/**' - - 'flutter/**' + - 'packages/dart/**' + - 'packages/flutter/**' env: SENTRY_AUTH_TOKEN_E2E: ${{ secrets.SENTRY_AUTH_TOKEN_E2E }} @@ -29,7 +29,7 @@ jobs: timeout-minutes: 30 defaults: run: - working-directory: ./flutter/example + working-directory: packages/flutter/example strategy: fail-fast: false matrix: @@ -61,13 +61,13 @@ jobs: # TODO: fix emulator caching, in ubuntu-latest emulator won't boot: https://github.com/ReactiveCircus/android-emulator-runner/issues/278 - name: build apk - working-directory: ./flutter/example/android + working-directory: packages/flutter/example/android run: flutter build apk --debug --target-platform=android-x64 - name: launch android emulator & run android native test uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed #pin@v2.34.0 with: - working-directory: ./flutter/example/android + working-directory: packages/flutter/example/android api-level: 31 profile: Nexus 6 arch: x86_64 @@ -80,7 +80,7 @@ jobs: - name: launch android emulator & run android integration test uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed #pin@v2.34.0 with: - working-directory: ./flutter/example + working-directory: packages/flutter/example api-level: 31 profile: Nexus 6 arch: x86_64 @@ -93,7 +93,7 @@ jobs: - name: launch android emulator & run android integration test in profile mode uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed #pin@v2.34.0 with: - working-directory: ./flutter/example + working-directory: packages/flutter/example api-level: 31 profile: Nexus 6 arch: x86_64 @@ -109,7 +109,7 @@ jobs: timeout-minutes: 30 defaults: run: - working-directory: ./flutter/example + working-directory: packages/flutter/example strategy: fail-fast: false matrix: @@ -127,7 +127,7 @@ jobs: - run: flutter pub get - run: pod install - working-directory: ./flutter/example/${{ matrix.target }} + working-directory: packages/flutter/example/${{ matrix.target }} - name: prepare test device id: device @@ -156,7 +156,7 @@ jobs: # We only have the native unit test package in the iOS xcodeproj at the moment. # Should be OK because it will likely be removed after switching to FFI (see https://github.com/getsentry/sentry-dart/issues/1444). if: ${{ matrix.target != 'macos' }} - working-directory: ./flutter/example/${{ matrix.target }} + working-directory: packages/flutter/example/${{ matrix.target }} run: xcodebuild test -workspace Runner.xcworkspace -scheme Runner -configuration Debug -destination "platform=$DEVICE_PLATFORM" -allowProvisioningUpdates CODE_SIGNING_ALLOWED=NO env: DEVICE_PLATFORM: ${{ steps.device.outputs.platform }} @@ -166,7 +166,7 @@ jobs: timeout-minutes: 30 defaults: run: - working-directory: ./flutter/example + working-directory: packages/flutter/example strategy: fail-fast: false matrix: diff --git a/.github/workflows/hive.yml b/.github/workflows/hive.yml index 9ca8828f82..c45b2bfb13 100644 --- a/.github/workflows/hive.yml +++ b/.github/workflows/hive.yml @@ -12,8 +12,8 @@ on: - '.github/workflows/analyze.yml' - '.github/actions/dart-test/**' - '.github/actions/coverage/**' - - 'dart/**' - - 'hive/**' + - 'packages/dart/**' + - 'packages/hive/**' jobs: cancel-previous-workflow: @@ -39,19 +39,19 @@ jobs: - uses: ./.github/actions/dart-test with: - directory: hive + directory: packages/hive web: false - uses: ./.github/actions/coverage if: runner.os == 'Linux' && matrix.sdk == 'stable' with: token: ${{ secrets.CODECOV_TOKEN }} - directory: hive + directory: packages/hive coverage: sentry_hive min-coverage: 55 analyze: uses: ./.github/workflows/analyze.yml with: - package: hive + package: packages/hive panaThreshold: 90 diff --git a/.github/workflows/isar.yml b/.github/workflows/isar.yml index 857aa7832c..6771aa6497 100644 --- a/.github/workflows/isar.yml +++ b/.github/workflows/isar.yml @@ -12,8 +12,8 @@ on: - '.github/workflows/analyze.yml' - '.github/actions/flutter-test/**' - '.github/actions/coverage/**' - - 'dart/**' - - 'isar/**' + - 'packages/dart/**' + - 'packages/isar/**' jobs: cancel-previous-workflow: @@ -39,18 +39,18 @@ jobs: - uses: ./.github/actions/flutter-test with: - directory: isar + directory: packages/isar - uses: ./.github/actions/coverage if: matrix.target == 'linux' && matrix.sdk == 'stable' with: token: ${{ secrets.CODECOV_TOKEN }} - directory: isar + directory: packages/isar coverage: sentry_isar min-coverage: 55 analyze: uses: ./.github/workflows/analyze.yml with: - package: isar + package: packages/isar sdk: flutter diff --git a/.github/workflows/link.yml b/.github/workflows/link.yml index 190ae0100b..8d7075fa78 100644 --- a/.github/workflows/link.yml +++ b/.github/workflows/link.yml @@ -12,8 +12,8 @@ on: - '.github/workflows/analyze.yml' - '.github/actions/dart-test/**' - '.github/actions/coverage/**' - - 'dart/**' - - 'link/**' + - 'packages/dart/**' + - 'packages/link/**' jobs: cancel-previous-workflow: @@ -39,7 +39,7 @@ jobs: - uses: ./.github/actions/dart-test with: - directory: link + directory: packages/link web: false # TODO: don't set coverage for now to finish publishing it @@ -54,4 +54,4 @@ jobs: analyze: uses: ./.github/workflows/analyze.yml with: - package: link + package: packages/link diff --git a/.github/workflows/logging.yml b/.github/workflows/logging.yml index f5149043f2..300605ea29 100644 --- a/.github/workflows/logging.yml +++ b/.github/workflows/logging.yml @@ -12,8 +12,8 @@ on: - '.github/workflows/analyze.yml' - '.github/actions/dart-test/**' - '.github/actions/coverage/**' - - 'dart/**' - - 'logging/**' + - 'packages/dart/**' + - 'packages/logging/**' jobs: cancel-previous-workflow: @@ -39,17 +39,17 @@ jobs: - uses: ./.github/actions/dart-test with: - directory: logging + directory: packages/logging - uses: ./.github/actions/coverage if: runner.os == 'Linux' && matrix.sdk == 'stable' with: token: ${{ secrets.CODECOV_TOKEN }} - directory: logging + directory: packages/logging coverage: sentry_logging min-coverage: 90 analyze: uses: ./.github/workflows/analyze.yml with: - package: logging + package: packages/logging diff --git a/.github/workflows/metrics.yml b/.github/workflows/metrics.yml index 8dc92ebe40..0ae30c2679 100644 --- a/.github/workflows/metrics.yml +++ b/.github/workflows/metrics.yml @@ -4,8 +4,8 @@ on: push: paths: - .github/workflows/metrics.yml - - dart/** - - flutter/** + - packages/dart/** + - packages/flutter/** - metrics/** - "!**/*.md" branches-ignore: diff --git a/.github/workflows/min_version_test.yml b/.github/workflows/min_version_test.yml index 382ee6e839..f15985a699 100644 --- a/.github/workflows/min_version_test.yml +++ b/.github/workflows/min_version_test.yml @@ -9,8 +9,8 @@ on: - "!**/*.md" - "!**/class-diagram.svg" - ".github/workflows/min_version_test.yml" - - "dart/**" - - "flutter/**" + - "packages/dart/**" + - "packages/flutter/**" - "min_version_test/**" jobs: @@ -57,7 +57,7 @@ jobs: - uses: ruby/setup-ruby@472790540115ce5bd69d399a020189a8c87d641f # pin@v1.247.0 with: - ruby-version: '3.1.2' # https://github.com/flutter/flutter/issues/109385#issuecomment-1212614125 + ruby-version: "3.1.2" # https://github.com/flutter/flutter/issues/109385#issuecomment-1212614125 - name: Uninstall existing CocoaPods and install globally run: | diff --git a/.github/workflows/sqflite.yml b/.github/workflows/sqflite.yml index 3dfa026bfa..d5d9488b62 100644 --- a/.github/workflows/sqflite.yml +++ b/.github/workflows/sqflite.yml @@ -12,8 +12,8 @@ on: - '.github/workflows/analyze.yml' - '.github/actions/flutter-test/**' - '.github/actions/coverage/**' - - 'dart/**' - - 'sqflite/**' + - 'packages/dart/**' + - 'packages/sqflite/**' jobs: cancel-previous-workflow: @@ -43,18 +43,18 @@ jobs: - uses: ./.github/actions/flutter-test with: - directory: sqflite + directory: packages/sqflite - uses: ./.github/actions/coverage if: matrix.target == 'linux' && matrix.sdk == 'stable' with: token: ${{ secrets.CODECOV_TOKEN }} - directory: sqflite + directory: packages/sqflite coverage: sentry_sqflite min-coverage: 80 analyze: uses: ./.github/workflows/analyze.yml with: - package: sqflite + package: packages/sqflite sdk: flutter diff --git a/.github/workflows/testflight.yml b/.github/workflows/testflight.yml index 2487c91212..5f8a5ec416 100644 --- a/.github/workflows/testflight.yml +++ b/.github/workflows/testflight.yml @@ -23,17 +23,17 @@ jobs: bundler-cache: true - name: flutter - working-directory: ./flutter/example + working-directory: ./packages/flutter/example run: | flutter pub get flutter build ios --no-codesign --obfuscate --split-debug-info=. - name: Install Fastlane - working-directory: ./flutter/example/ios + working-directory: ./packages/flutter/example/ios run: bundle install - name: Bump, Build & Upload App to TestFlight - working-directory: ./flutter/example/ios + working-directory: ./packages/flutter/example/ios env: APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }} APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }} @@ -51,7 +51,7 @@ jobs: bundle exec fastlane upload_testflight - name: Upload Symbols to Sentry - working-directory: ./flutter/example + working-directory: ./packages/flutter/example env: SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} run: flutter packages pub run sentry_dart_plugin diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml index e85fa4f943..8d9e2122ff 100644 --- a/.github/workflows/update-deps.yml +++ b/.github/workflows/update-deps.yml @@ -13,7 +13,7 @@ jobs: android: uses: getsentry/github-workflows/.github/workflows/updater.yml@v2 with: - path: flutter/scripts/update-android.sh + path: packages/flutter/scripts/update-android.sh name: Android SDK secrets: api-token: ${{ secrets.CI_DEPLOY_KEY }} @@ -21,7 +21,7 @@ jobs: cocoa: uses: getsentry/github-workflows/.github/workflows/updater.yml@v2 with: - path: flutter/scripts/update-cocoa.sh + path: packages/flutter/scripts/update-cocoa.sh name: Cocoa SDK runs-on: macos-latest secrets: @@ -30,7 +30,7 @@ jobs: js: uses: getsentry/github-workflows/.github/workflows/updater.yml@v2 with: - path: flutter/scripts/update-js.sh + path: packages/flutter/scripts/update-js.sh name: JavaScript SDK secrets: api-token: ${{ secrets.CI_DEPLOY_KEY }} @@ -38,7 +38,7 @@ jobs: native: uses: getsentry/github-workflows/.github/workflows/updater.yml@v2 with: - path: flutter/scripts/update-native.sh + path: packages/flutter/scripts/update-native.sh name: Native SDK secrets: api-token: ${{ secrets.CI_DEPLOY_KEY }} diff --git a/.github/workflows/web-example-ghpages.yml b/.github/workflows/web-example-ghpages.yml index 1073c9747e..79ece0904b 100644 --- a/.github/workflows/web-example-ghpages.yml +++ b/.github/workflows/web-example-ghpages.yml @@ -17,13 +17,13 @@ jobs: - uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e # pin@v2.21.0 - uses: bluefireteam/flutter-gh-pages@cf4a9312849577dbfd9df8f3d63d12ef6b09898e # pin@v9 with: - workingDir: flutter/example + workingDir: packages/flutter/example customArgs: --source-maps webRenderer: canvaskit baseHref: "/sentry-dart/" - name: Upload source maps run: | - cd flutter/example + cd packages/flutter/example flutter pub get dart run sentry_dart_plugin diff --git a/.gitignore b/.gitignore index 9f397df184..1df9821de0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ .packages .dart_tool/ build/ -packages pubspec.lock .pub/ .idea/libraries @@ -17,18 +16,10 @@ build/ .fvmrc .test_coverage.dart -dart/coverage/* -logging/coverage/* -dio/coverage/* -file/coverage/* -flutter/coverage/* -sqflite/coverage/* -drift/coverage/* -hive/coverage/* -isar/coverage/* +packages/**/coverage/* pubspec.lock Podfile.lock .gradle -flutter/.gradle +packages/flutter/.gradle diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a876255390..f78ce45036 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,35 +1,99 @@ -### Dart +# Contributing to Sentry Dart & Flutter -All you need is the [sentry-dart](https://github.com/getsentry/sentry-dart/tree/main/dart). The `sentry` package doesn't depend on the Flutter SDK. +Thank you for your interest in contributing to Sentry's Dart and Flutter SDKs! This guide will help +you get started. -### Flutter +## Prerequisites -All you need is the [sentry-flutter](https://github.com/getsentry/sentry-dart/tree/main/flutter) and `sentry-dart` as stated above. +### Required Tools -The SDK currently supports Android, iOS, and Web. We build the example app for these targets on 3 platforms: Windows, macOS, and Linux. -This is to make sure you'd be able to contribute to this project if you're using any of these operating systems. +* **Dart SDK** - Required for all packages +* **Flutter SDK** - Required for `sentry-flutter` and Flutter integrations +* **[melos](https://melos.invertase.dev/)** - For managing the monorepo -We also run CI against the Flutter `stable` and `beta` channels, so you should be able to build it if you're in one of those. +## Environment Setup -The Flutter SDK has our Native SDKs embedded if you wish to learn more about them, they sit at: +### 1. Install melos -[sentry-java](https://github.com/getsentry/sentry-java) for the Android integration. -[sentry-cocoa](https://github.com/getsentry/sentry-cocoa) for the Apple integration. -[sentry-native](https://github.com/getsentry/sentry-native) for the Android NDK integration. +```bash +dart pub global activate melos +``` -### Dependencies +### 2. Bootstrap the project -* The Dart SDK (if you want to change `sentry-dart`) -* The Flutter SDK (if you want to change `sentry-dart` or `sentry-flutter`) -* Android: Android SDK (`sentry-java`) with NDK (`sentry-native`): The example project includes C++. -* iOS: Cocoa SDK (`sentry-cocoa`), you'll need a Mac with Xcode installed. -* Web: No additional dependencies. +At the repository root, run: -### Static Code Analysis, Tests, Formatting, Pub Score and Dry publish +```bash +melos bootstrap +``` -* Dart/Flutter - * Execute `./tool/presubmit.sh` within the `dart` and `flutter` folders -* Swift/CocoaPods - * Use `swiftlint` and `pod lib lint` -* Kotlin - * Use `ktlint` and `detekt` +If you're using [fvm](https://fvm.app/), specify the SDK path: + +```bash +melos bootstrap --sdk-path=/Users/user/fvm/default/ +``` + +## Project Structure + +### Core SDKs + +* **[packages/dart](https://github.com/getsentry/sentry-dart/tree/main/packages/dart)** - Core Dart + SDK (`sentry` package) +* **[packages/flutter](https://github.com/getsentry/sentry-dart/tree/main/packages/flutter)** - + Flutter SDK (`sentry_flutter` package) + +### Integration Packages + +Located under `packages/`, we maintain integrations for popular Dart/Flutter libraries: + +* **sentry_dio** - HTTP client integration for [dio](https://pub.dev/packages/dio) +* **sentry_logging** - Integration for the [logging](https://pub.dev/packages/logging) package +* **sentry_sqflite** - Integration for [sqflite](https://pub.dev/packages/sqflite) database +* **sentry_drift** - Integration for [drift](https://pub.dev/packages/drift) database +* **sentry_hive** - Integration for [hive](https://pub.dev/packages/hive) database +* **sentry_isar** - Integration for [isar](https://pub.dev/packages/isar) database +* **sentry_file** - File I/O operations integration +* **sentry_link** - GraphQL integration via [gql_link](https://pub.dev/packages/gql_link) +* **sentry_firebase_remote_config** - Integration + for [firebase_remote_config](https://pub.dev/packages/firebase_remote_config) + +## Platform Support + +The Flutter SDK supports the following platforms: + +* Android +* iOS +* macOS +* Linux +* Windows +* Web + +We test the example app on Windows, macOS, and Linux to ensure cross-platform compatibility. CI runs +against Flutter `stable` and `beta` channels. + +## Native SDK Dependencies + +The Flutter SDK embeds platform-specific native SDKs: + +* **Android**: [sentry-java](https://github.com/getsentry/sentry-java) (via + Gradle) + [sentry-native](https://github.com/getsentry/sentry-native) for NDK +* **iOS/macOS**: [sentry-cocoa](https://github.com/getsentry/sentry-cocoa) (via CocoaPods/SPM) +* **Linux/Windows**: [sentry-native](https://github.com/getsentry/sentry-native) (bundled in + `packages/flutter/sentry-native/`) +* **Web**: [sentry-javascript](https://github.com/getsentry/sentry-javascript) (loaded via CDN) + +[//]: # (TODO: buenaflor - properly set up precommit hooks) +[//]: # (### Static Code Analysis, Tests, Formatting, Pub Score and Dry publish) + +[//]: # () +[//]: # (* Dart/Flutter) + +[//]: # ( * Execute `./tool/presubmit.sh` within the `dart` and `flutter` folders) + +[//]: # (* Swift/CocoaPods) + +[//]: # ( * Use `swiftlint` and `pod lib lint`) + +[//]: # (* Kotlin) + +[//]: # ( * Use `ktlint` and `detekt`) diff --git a/README.md b/README.md index a293f7d8ff..447de791d3 100644 --- a/README.md +++ b/README.md @@ -9,23 +9,22 @@ _Bad software is everywhere, and we're tired of it. Sentry is on a mission to help developers write better software faster, so we can get back to enjoying technology. If you want to join us [**Check out our open positions**](https://sentry.io/careers/)_ -Sentry SDK for Dart and Flutter -=========== +# Sentry SDK for Dart and Flutter [![codecov](https://codecov.io/gh/getsentry/sentry-dart/branch/main/graph/badge.svg?token=J0QX0LPmwy)](https://codecov.io/gh/getsentry/sentry-dart) -| Package | CI status | Likes | Downloads | Analysis | -|------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------| --------- | -------- | -| [![sentry](https://img.shields.io/pub/v/sentry.svg?label=sentry)](https://pub.dev/packages/sentry) | [![build](https://github.com/getsentry/sentry-dart/actions/workflows/dart.yml/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions/workflows/dart.yml) | [![likes](https://img.shields.io/pub/likes/sentry)](https://pub.dev/packages/sentry/score) | [![dm](https://img.shields.io/pub/dm/sentry)](https://pub.dev/packages/sentry/score) | [![pub points](https://img.shields.io/pub/points/sentry)](https://pub.dev/packages/sentry/score) -| [![sentry_flutter](https://img.shields.io/pub/v/sentry_flutter.svg?label=sentry_flutter)](https://pub.dev/packages/sentry_flutter) | [![build](https://github.com/getsentry/sentry-dart/actions/workflows/flutter.yml/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions/workflows/flutter.yml) | [![likes](https://img.shields.io/pub/likes/sentry_flutter)](https://pub.dev/packages/sentry_flutter/score) | [![dm](https://img.shields.io/pub/dm/sentry_flutter)](https://pub.dev/packages/sentry_flutter/score) | [![pub points](https://img.shields.io/pub/points/sentry_flutter)](https://pub.dev/packages/sentry_flutter/score) -| [![sentry_logging](https://img.shields.io/pub/v/sentry_logging.svg?label=sentry_logging)](https://pub.dev/packages/sentry_logging) | [![build](https://github.com/getsentry/sentry-dart/actions/workflows/logging.yml/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions/workflows/logging.yml) | [![likes](https://img.shields.io/pub/likes/sentry_logging)](https://pub.dev/packages/sentry_logging/score) | [![dm](https://img.shields.io/pub/dm/sentry_logging)](https://pub.dev/packages/sentry_logging/score) | [![pub points](https://img.shields.io/pub/points/sentry_logging)](https://pub.dev/packages/sentry_logging/score) -| [![sentry_dio](https://img.shields.io/pub/v/sentry_dio.svg?label=sentry_dio)](https://pub.dev/packages/sentry_dio) | [![build](https://github.com/getsentry/sentry-dart/actions/workflows/dio.yml/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions/workflows/dio.yml) | [![likes](https://img.shields.io/pub/likes/sentry_dio)](https://pub.dev/packages/sentry_dio/score) | [![dm](https://img.shields.io/pub/dm/sentry_dio)](https://pub.dev/packages/sentry_dio/score) | [![pub points](https://img.shields.io/pub/points/sentry_dio)](https://pub.dev/packages/sentry_dio/score) -| [![sentry_link](https://img.shields.io/pub/v/sentry_link.svg?label=sentry_link)](https://pub.dev/packages/sentry_link) | [![build](https://github.com/getsentry/sentry-dart/actions/workflows/link.yml/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions/workflows/link.yml) | [![likes](https://img.shields.io/pub/likes/sentry_link)](https://pub.dev/packages/sentry_link/score) | [![dm](https://img.shields.io/pub/dm/sentry_link)](https://pub.dev/packages/sentry_link/score) | [![pub points](https://img.shields.io/pub/points/sentry_link)](https://pub.dev/packages/sentry_link/score) -| [![sentry_file](https://img.shields.io/pub/v/sentry_file.svg?label=sentry_file)](https://pub.dev/packages/sentry_file) | [![build](https://github.com/getsentry/sentry-dart/actions/workflows/file.yml/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions/workflows/file.yml) | [![likes](https://img.shields.io/pub/likes/sentry_file)](https://pub.dev/packages/sentry_file/score) | [![dm](https://img.shields.io/pub/dm/sentry_file)](https://pub.dev/packages/sentry_file/score) | [![pub points](https://img.shields.io/pub/points/sentry_file)](https://pub.dev/packages/sentry_file/score) -| [![sentry_sqflite](https://img.shields.io/pub/v/sentry_sqflite.svg?label=sentry_sqflite)](https://pub.dev/packages/sentry_sqflite) | [![build](https://github.com/getsentry/sentry-dart/actions/workflows/sqflite.yml/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions/workflows/sqflite.yml) | [![likes](https://img.shields.io/pub/likes/sentry_sqflite)](https://pub.dev/packages/sentry_sqflite/score) | [![dm](https://img.shields.io/pub/dm/sentry_sqflite)](https://pub.dev/packages/sentry_sqflite/score) | [![pub points](https://img.shields.io/pub/points/sentry_sqflite)](https://pub.dev/packages/sentry_sqflite/score) -| [![sentry_drift](https://img.shields.io/pub/v/sentry_drift.svg?label=sentry_drift)](https://pub.dev/packages/sentry_drift) | [![build](https://github.com/getsentry/sentry-dart/actions/workflows/drift.yml/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions/workflows/drift.yml) | [![likes](https://img.shields.io/pub/likes/sentry_drift)](https://pub.dev/packages/sentry_drift/score) | [![dm](https://img.shields.io/pub/dm/sentry_drift)](https://pub.dev/packages/sentry_drift/score) | [![pub points](https://img.shields.io/pub/points/sentry_drift)](https://pub.dev/packages/sentry_drift/score) -| [![sentry_hive](https://img.shields.io/pub/v/sentry_hive.svg?label=sentry_hive)](https://pub.dev/packages/sentry_hive) | [![build](https://github.com/getsentry/sentry-dart/actions/workflows/hive.yml/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions/workflows/hive.yml) | [![likes](https://img.shields.io/pub/likes/sentry_hive)](https://pub.dev/packages/sentry_hive/score) | [![dm](https://img.shields.io/pub/dm/sentry_hive)](https://pub.dev/packages/sentry_hive/score) | [![pub points](https://img.shields.io/pub/points/sentry_hive)](https://pub.dev/packages/sentry_hive/score) -| [![sentry_isar](https://img.shields.io/pub/v/sentry_isar.svg?label=sentry_isar)](https://pub.dev/packages/sentry_isar) | [![build](https://github.com/getsentry/sentry-dart/actions/workflows/isar.yml/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions/workflows/isar.yml) | [![likes](https://img.shields.io/pub/likes/sentry_isar)](https://pub.dev/packages/sentry_isar/score) | [![dm](https://img.shields.io/pub/dm/sentry_isar)](https://pub.dev/packages/sentry_isar/score) | [![pub points](https://img.shields.io/pub/points/sentry_isar)](https://pub.dev/packages/sentry_isar/score) +| Package | CI status | Likes | Downloads | Analysis | +| ---------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------- | +| [![sentry](https://img.shields.io/pub/v/sentry.svg?label=sentry)](https://pub.dev/packages/sentry) | [![build](https://github.com/getsentry/sentry-dart/actions/workflows/dart.yml/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions/workflows/dart.yml) | [![likes](https://img.shields.io/pub/likes/sentry)](https://pub.dev/packages/sentry/score) | [![dm](https://img.shields.io/pub/dm/sentry)](https://pub.dev/packages/sentry/score) | [![pub points](https://img.shields.io/pub/points/sentry)](https://pub.dev/packages/sentry/score) | +| [![sentry_flutter](https://img.shields.io/pub/v/sentry_flutter.svg?label=sentry_flutter)](https://pub.dev/packages/sentry_flutter) | [![build](https://github.com/getsentry/sentry-dart/actions/workflows/flutter.yml/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions/workflows/flutter.yml) | [![likes](https://img.shields.io/pub/likes/sentry_flutter)](https://pub.dev/packages/sentry_flutter/score) | [![dm](https://img.shields.io/pub/dm/sentry_flutter)](https://pub.dev/packages/sentry_flutter/score) | [![pub points](https://img.shields.io/pub/points/sentry_flutter)](https://pub.dev/packages/sentry_flutter/score) | +| [![sentry_logging](https://img.shields.io/pub/v/sentry_logging.svg?label=sentry_logging)](https://pub.dev/packages/sentry_logging) | [![build](https://github.com/getsentry/sentry-dart/actions/workflows/logging.yml/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions/workflows/logging.yml) | [![likes](https://img.shields.io/pub/likes/sentry_logging)](https://pub.dev/packages/sentry_logging/score) | [![dm](https://img.shields.io/pub/dm/sentry_logging)](https://pub.dev/packages/sentry_logging/score) | [![pub points](https://img.shields.io/pub/points/sentry_logging)](https://pub.dev/packages/sentry_logging/score) | +| [![sentry_dio](https://img.shields.io/pub/v/sentry_dio.svg?label=sentry_dio)](https://pub.dev/packages/sentry_dio) | [![build](https://github.com/getsentry/sentry-dart/actions/workflows/dio.yml/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions/workflows/dio.yml) | [![likes](https://img.shields.io/pub/likes/sentry_dio)](https://pub.dev/packages/sentry_dio/score) | [![dm](https://img.shields.io/pub/dm/sentry_dio)](https://pub.dev/packages/sentry_dio/score) | [![pub points](https://img.shields.io/pub/points/sentry_dio)](https://pub.dev/packages/sentry_dio/score) | +| [![sentry_link](https://img.shields.io/pub/v/sentry_link.svg?label=sentry_link)](https://pub.dev/packages/sentry_link) | [![build](https://github.com/getsentry/sentry-dart/actions/workflows/link.yml/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions/workflows/link.yml) | [![likes](https://img.shields.io/pub/likes/sentry_link)](https://pub.dev/packages/sentry_link/score) | [![dm](https://img.shields.io/pub/dm/sentry_link)](https://pub.dev/packages/sentry_link/score) | [![pub points](https://img.shields.io/pub/points/sentry_link)](https://pub.dev/packages/sentry_link/score) | +| [![sentry_file](https://img.shields.io/pub/v/sentry_file.svg?label=sentry_file)](https://pub.dev/packages/sentry_file) | [![build](https://github.com/getsentry/sentry-dart/actions/workflows/file.yml/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions/workflows/file.yml) | [![likes](https://img.shields.io/pub/likes/sentry_file)](https://pub.dev/packages/sentry_file/score) | [![dm](https://img.shields.io/pub/dm/sentry_file)](https://pub.dev/packages/sentry_file/score) | [![pub points](https://img.shields.io/pub/points/sentry_file)](https://pub.dev/packages/sentry_file/score) | +| [![sentry_sqflite](https://img.shields.io/pub/v/sentry_sqflite.svg?label=sentry_sqflite)](https://pub.dev/packages/sentry_sqflite) | [![build](https://github.com/getsentry/sentry-dart/actions/workflows/sqflite.yml/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions/workflows/sqflite.yml) | [![likes](https://img.shields.io/pub/likes/sentry_sqflite)](https://pub.dev/packages/sentry_sqflite/score) | [![dm](https://img.shields.io/pub/dm/sentry_sqflite)](https://pub.dev/packages/sentry_sqflite/score) | [![pub points](https://img.shields.io/pub/points/sentry_sqflite)](https://pub.dev/packages/sentry_sqflite/score) | +| [![sentry_drift](https://img.shields.io/pub/v/sentry_drift.svg?label=sentry_drift)](https://pub.dev/packages/sentry_drift) | [![build](https://github.com/getsentry/sentry-dart/actions/workflows/drift.yml/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions/workflows/drift.yml) | [![likes](https://img.shields.io/pub/likes/sentry_drift)](https://pub.dev/packages/sentry_drift/score) | [![dm](https://img.shields.io/pub/dm/sentry_drift)](https://pub.dev/packages/sentry_drift/score) | [![pub points](https://img.shields.io/pub/points/sentry_drift)](https://pub.dev/packages/sentry_drift/score) | +| [![sentry_hive](https://img.shields.io/pub/v/sentry_hive.svg?label=sentry_hive)](https://pub.dev/packages/sentry_hive) | [![build](https://github.com/getsentry/sentry-dart/actions/workflows/hive.yml/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions/workflows/hive.yml) | [![likes](https://img.shields.io/pub/likes/sentry_hive)](https://pub.dev/packages/sentry_hive/score) | [![dm](https://img.shields.io/pub/dm/sentry_hive)](https://pub.dev/packages/sentry_hive/score) | [![pub points](https://img.shields.io/pub/points/sentry_hive)](https://pub.dev/packages/sentry_hive/score) | +| [![sentry_isar](https://img.shields.io/pub/v/sentry_isar.svg?label=sentry_isar)](https://pub.dev/packages/sentry_isar) | [![build](https://github.com/getsentry/sentry-dart/actions/workflows/isar.yml/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions/workflows/isar.yml) | [![likes](https://img.shields.io/pub/likes/sentry_isar)](https://pub.dev/packages/sentry_isar/score) | [![dm](https://img.shields.io/pub/dm/sentry_isar)](https://pub.dev/packages/sentry_isar/score) | [![pub points](https://img.shields.io/pub/points/sentry_isar)](https://pub.dev/packages/sentry_isar/score) | ## Releases @@ -37,7 +36,7 @@ This repo uses the following ways to release SDK updates: ## Usage -For detailed usage, check out the inner [dart](https://github.com/getsentry/sentry-dart/tree/main/dart), [flutter](https://github.com/getsentry/sentry-dart/tree/main/flutter), [logging](https://github.com/getsentry/sentry-dart/tree/main/logging), [dio](https://github.com/getsentry/sentry-dart/tree/main/dio), [file](https://github.com/getsentry/sentry-dart/tree/main/file), [sqflite](https://github.com/getsentry/sentry-dart/tree/main/sqflite), [drift](https://github.com/getsentry/sentry-dart/tree/main/drift), [hive](https://github.com/getsentry/sentry-dart/tree/main/hive) and [isar](https://github.com/getsentry/sentry-dart/tree/main/isar) `README's` or our `Resources` section below. +For detailed usage, check out the inner [dart](https://github.com/getsentry/sentry-dart/tree/main/packages/dart), [flutter](https://github.com/getsentry/sentry-dart/tree/main/packages/flutter), [logging](https://github.com/getsentry/sentry-dart/tree/main/packages/logging), [dio](https://github.com/getsentry/sentry-dart/tree/main/packages/dio), [file](https://github.com/getsentry/sentry-dart/tree/main/packages/file), [sqflite](https://github.com/getsentry/sentry-dart/tree/main/packages/sqflite), [drift](https://github.com/getsentry/sentry-dart/tree/main/packages/drift), [hive](https://github.com/getsentry/sentry-dart/tree/main/packages/hive) and [isar](https://github.com/getsentry/sentry-dart/tree/main/packages/isar) `README's` or our `Resources` section below. ## Blog posts @@ -51,12 +50,12 @@ For detailed usage, check out the inner [dart](https://github.com/getsentry/sent ## Resources -* [![Flutter docs](https://img.shields.io/badge/documentation-sentry.io-green.svg?label=flutter%20docs)](https://docs.sentry.io/platforms/flutter/) -* [![Dart docs](https://img.shields.io/badge/documentation-sentry.io-green.svg?label=dart%20docs)](https://docs.sentry.io/platforms/dart/) -* [![Discussions](https://img.shields.io/github/discussions/getsentry/sentry-dart.svg)](https://github.com/getsentry/sentry-dart/discussions) -* [![Discord Chat](https://img.shields.io/discord/621778831602221064?logo=discord&logoColor=ffffff&color=7389D8)](https://discord.gg/gB6ja9uZuN) -* [![Stack Overflow](https://img.shields.io/badge/stack%20overflow-sentry-green.svg)](https://stackoverflow.com/questions/tagged/sentry) -* [![Twitter Follow](https://img.shields.io/twitter/follow/getsentry?label=getsentry&style=social)](https://twitter.com/intent/follow?screen_name=getsentry) +- [![Flutter docs](https://img.shields.io/badge/documentation-sentry.io-green.svg?label=flutter%20docs)](https://docs.sentry.io/platforms/flutter/) +- [![Dart docs](https://img.shields.io/badge/documentation-sentry.io-green.svg?label=dart%20docs)](https://docs.sentry.io/platforms/dart/) +- [![Discussions](https://img.shields.io/github/discussions/getsentry/sentry-dart.svg)](https://github.com/getsentry/sentry-dart/discussions) +- [![Discord Chat](https://img.shields.io/discord/621778831602221064?logo=discord&logoColor=ffffff&color=7389D8)](https://discord.gg/gB6ja9uZuN) +- [![Stack Overflow](https://img.shields.io/badge/stack%20overflow-sentry-green.svg)](https://stackoverflow.com/questions/tagged/sentry) +- [![Twitter Follow](https://img.shields.io/twitter/follow/getsentry?label=getsentry&style=social)](https://twitter.com/intent/follow?screen_name=getsentry) ## Apple Privacy Manifest diff --git a/dart/CHANGELOG.md b/dart/CHANGELOG.md deleted file mode 120000 index 04c99a55ca..0000000000 --- a/dart/CHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -../CHANGELOG.md \ No newline at end of file diff --git a/dio/CHANGELOG.md b/dio/CHANGELOG.md deleted file mode 120000 index 04c99a55ca..0000000000 --- a/dio/CHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -../CHANGELOG.md \ No newline at end of file diff --git a/docs/new-package-release-checklist.md b/docs/new-package-release-checklist.md index 0a7cd19821..81b9206af7 100644 --- a/docs/new-package-release-checklist.md +++ b/docs/new-package-release-checklist.md @@ -5,33 +5,35 @@ This page serves as a checklist of what to do when releasing a new package for t ## Release Preparation - [ ] Make sure the project is set up - - [ ] The package only exports the public API - - [ ] The package contains an example folder - - [ ] The package contains a README.md file - - [ ] CI badges show a status - - [ ] The package contains a CHANGELOG.md file (symlink to the root changelog) - - [ ] The package contains a dartdoc_options.yaml file (symlink to the root file) - - [ ] The package contains a LICENSE (default is `MIT`) - - [ ] The package contains a pubspec.yaml file - - [ ] The package contains a analysis_options.yaml file - -- [ ] Update the [Flutter example](https://github.com/getsentry/sentry-dart/tree/main/flutter/example) to use your new package if applicable + + - [ ] The package only exports the public API + - [ ] The package contains an example folder + - [ ] The package contains a README.md file + - [ ] CI badges show a status + - [ ] The package contains a CHANGELOG.md file (symlink to the root changelog) + - [ ] The package contains a dartdoc_options.yaml file (symlink to the root file) + - [ ] The package contains a LICENSE (default is `MIT`) + - [ ] The package contains a pubspec.yaml file + - [ ] The package contains a analysis_options.yaml file + +- [ ] Update the [Flutter example](https://github.com/getsentry/sentry-dart/tree/main/packages/flutter/example) to use your new package if applicable - [ ] Make sure your new package has a `version.dart` in the `lib/src` folder. - - This is used to set the version and package in the `Hub`. See this [example](https://github.com/getsentry/sentry-dart/blob/8609bd8dd7ea572e5d241a59643c7570e5621bda/sqflite/lib/src/sentry_database.dart#L69). - - The version will be updated to the newest version after triggering the release process. + + - This is used to set the version and package in the `Hub`. See this [example](https://github.com/getsentry/sentry-dart/blob/8609bd8dd7ea572e5d241a59643c7570e5621bda/sqflite/lib/src/sentry_database.dart#L69). + - The version will be updated to the newest version after triggering the release process. - [ ] Create a new workflow called `your-package-name.yml` for building and testing the package. - [ ] Excluding `your-package-name.yml`, add the package to the `paths-ignore` section of all package workflow files. - For examples see `sqflite.yml`, `dio.yml` etc... - -- [ ] Add an entry to [diagram.yml](https://github.com/getsentry/sentry-dart/blob/main/.github/workflows/diagrams.yml) for your package. +- [ ] Add an entry to [diagram.yml](https://github.com/getsentry/sentry-dart/blob/main/.github/workflows/diagrams.yml) for your package. - [ ] In the root `.gitignore` file add the package coverage as ignored. The `analyze` workflow will fail in your PR and in the main branch because the package is not released yet and the `pubspec.yaml` is not 'valid' according to the analyzer. This is expected - it will succeed after the release. + - [ ] Make sure the analyze workflow doesn't have other failures, only the one mentioned above. - [ ] **Very important**: add your package to `scripts/bump-version.sh`. @@ -48,7 +50,7 @@ Do these steps in the **correct order** ## After the first release - [ ] Check if package is succesfully released on `pub.dev` -- [ ] Add the package to the Sentry Release Registry +- [ ] Add the package to the Sentry Release Registry - Instructions on how to do this can be found [here](https://github.com/getsentry/sentry-release-registry#adding-new-sdks) - [Example PR](https://github.com/getsentry/sentry-release-registry/pull/136) - [ ] Add an entry to `.craft.yml` for the package in the `registry` section. diff --git a/drift/CHANGELOG.md b/drift/CHANGELOG.md deleted file mode 120000 index 04c99a55ca..0000000000 --- a/drift/CHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -../CHANGELOG.md \ No newline at end of file diff --git a/drift/test/utils/windows_helper.dart b/drift/test/utils/windows_helper.dart deleted file mode 100644 index e77fb03bed..0000000000 --- a/drift/test/utils/windows_helper.dart +++ /dev/null @@ -1,8 +0,0 @@ -import 'dart:ffi'; -import 'dart:io'; - -DynamicLibrary openOnWindows() { - final scriptDir = File(Platform.script.toFilePath()).parent; - final libraryNextToScript = File('${scriptDir.path}/test/sqlite3.dll'); - return DynamicLibrary.open(libraryNextToScript.path); -} diff --git a/e2e_test/pubspec.yaml b/e2e_test/pubspec.yaml index d0ec1b711c..f79e955bfb 100644 --- a/e2e_test/pubspec.yaml +++ b/e2e_test/pubspec.yaml @@ -10,7 +10,7 @@ environment: dependencies: sentry: path: - ./../dart + ./../packages/dart http: ^0.13.0 dev_dependencies: diff --git a/file/CHANGELOG.md b/file/CHANGELOG.md deleted file mode 120000 index 04c99a55ca..0000000000 --- a/file/CHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -../CHANGELOG.md \ No newline at end of file diff --git a/firebase_remote_config/CHANGELOG.md b/firebase_remote_config/CHANGELOG.md deleted file mode 120000 index 04c99a55ca..0000000000 --- a/firebase_remote_config/CHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -../CHANGELOG.md \ No newline at end of file diff --git a/flutter/CHANGELOG.md b/flutter/CHANGELOG.md deleted file mode 120000 index 04c99a55ca..0000000000 --- a/flutter/CHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -../CHANGELOG.md \ No newline at end of file diff --git a/flutter/microbenchmarks/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/flutter/microbenchmarks/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a625..0000000000 --- a/flutter/microbenchmarks/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/flutter/pubspec_overrides.yaml b/flutter/pubspec_overrides.yaml deleted file mode 100644 index 16e71d16f0..0000000000 --- a/flutter/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - sentry: - path: ../dart diff --git a/hive/CHANGELOG.md b/hive/CHANGELOG.md deleted file mode 120000 index 04c99a55ca..0000000000 --- a/hive/CHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -../CHANGELOG.md \ No newline at end of file diff --git a/hive/pubspec_overrides.yaml b/hive/pubspec_overrides.yaml deleted file mode 100644 index 16e71d16f0..0000000000 --- a/hive/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - sentry: - path: ../dart diff --git a/isar/CHANGELOG.md b/isar/CHANGELOG.md deleted file mode 120000 index 04c99a55ca..0000000000 --- a/isar/CHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -../CHANGELOG.md \ No newline at end of file diff --git a/isar/pubspec_overrides.yaml b/isar/pubspec_overrides.yaml deleted file mode 100644 index 16e71d16f0..0000000000 --- a/isar/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - sentry: - path: ../dart diff --git a/link/CHANGELOG.md b/link/CHANGELOG.md deleted file mode 120000 index 04c99a55ca..0000000000 --- a/link/CHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -../CHANGELOG.md \ No newline at end of file diff --git a/link/pubspec_overrides.yaml b/link/pubspec_overrides.yaml deleted file mode 100644 index 16e71d16f0..0000000000 --- a/link/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - sentry: - path: ../dart diff --git a/logging/CHANGELOG.md b/logging/CHANGELOG.md deleted file mode 120000 index 04c99a55ca..0000000000 --- a/logging/CHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -../CHANGELOG.md \ No newline at end of file diff --git a/logging/pubspec_overrides.yaml b/logging/pubspec_overrides.yaml deleted file mode 100644 index 16e71d16f0..0000000000 --- a/logging/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - sentry: - path: ../dart diff --git a/melos.yaml b/melos.yaml new file mode 100644 index 0000000000..14ce45a3d8 --- /dev/null +++ b/melos.yaml @@ -0,0 +1,9 @@ +name: sentry_dart_workspace +packages: + - 'packages/*' + - 'packages/*/*' + - 'packages/*/*/*' + +ide: + intellij: + moduleNamePrefix: '' diff --git a/metrics/prepare-dart.sh b/metrics/prepare-dart.sh index f0bac4730e..5e71f00a8d 100755 --- a/metrics/prepare-dart.sh +++ b/metrics/prepare-dart.sh @@ -26,7 +26,7 @@ cat <>"$pubspec" dependency_overrides: sentry: - path: ../../dart + path: ../../packages/dart EOF diff --git a/metrics/prepare.sh b/metrics/prepare.sh index 98d9ca0ee3..6e33a460b2 100755 --- a/metrics/prepare.sh +++ b/metrics/prepare.sh @@ -26,9 +26,9 @@ cat <>"$pubspec" dependency_overrides: sentry: - path: ../../dart + path: ../../packages/dart sentry_flutter: - path: ../../flutter + path: ../../packages/flutter EOF diff --git a/min_version_test/pubspec.yaml b/min_version_test/pubspec.yaml index 40bcc4a009..a410eefea7 100644 --- a/min_version_test/pubspec.yaml +++ b/min_version_test/pubspec.yaml @@ -44,13 +44,13 @@ dependency_overrides: flutter: sdk: flutter sentry: - path: ../dart + path: ../packages/dart sentry_flutter: - path: ../flutter + path: ../packages/flutter sentry_dio: - path: ../dio + path: ../packages/dio sentry_logging: - path: ../logging + path: ../packages/logging # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/dart/AUTHORS b/packages/dart/AUTHORS similarity index 100% rename from dart/AUTHORS rename to packages/dart/AUTHORS diff --git a/packages/dart/CHANGELOG.md b/packages/dart/CHANGELOG.md new file mode 120000 index 0000000000..699cc9e7b7 --- /dev/null +++ b/packages/dart/CHANGELOG.md @@ -0,0 +1 @@ +../../CHANGELOG.md \ No newline at end of file diff --git a/dart/LICENSE b/packages/dart/LICENSE similarity index 100% rename from dart/LICENSE rename to packages/dart/LICENSE diff --git a/dart/PATENTS b/packages/dart/PATENTS similarity index 100% rename from dart/PATENTS rename to packages/dart/PATENTS diff --git a/dart/README.md b/packages/dart/README.md similarity index 100% rename from dart/README.md rename to packages/dart/README.md diff --git a/dart/analysis_options.yaml b/packages/dart/analysis_options.yaml similarity index 100% rename from dart/analysis_options.yaml rename to packages/dart/analysis_options.yaml diff --git a/dart/class-diagram.svg b/packages/dart/class-diagram.svg similarity index 100% rename from dart/class-diagram.svg rename to packages/dart/class-diagram.svg diff --git a/dart/dartdoc_options.yaml b/packages/dart/dartdoc_options.yaml similarity index 100% rename from dart/dartdoc_options.yaml rename to packages/dart/dartdoc_options.yaml diff --git a/dart/example/.gitignore b/packages/dart/example/.gitignore similarity index 100% rename from dart/example/.gitignore rename to packages/dart/example/.gitignore diff --git a/dart/example/README.md b/packages/dart/example/README.md similarity index 100% rename from dart/example/README.md rename to packages/dart/example/README.md diff --git a/dart/example/analysis_options.yaml b/packages/dart/example/analysis_options.yaml similarity index 100% rename from dart/example/analysis_options.yaml rename to packages/dart/example/analysis_options.yaml diff --git a/dart/example/bin/event_example.dart b/packages/dart/example/bin/event_example.dart similarity index 100% rename from dart/example/bin/event_example.dart rename to packages/dart/example/bin/event_example.dart diff --git a/dart/example/bin/example.dart b/packages/dart/example/bin/example.dart similarity index 100% rename from dart/example/bin/example.dart rename to packages/dart/example/bin/example.dart diff --git a/dart/example/pubspec.yaml b/packages/dart/example/pubspec.yaml similarity index 100% rename from dart/example/pubspec.yaml rename to packages/dart/example/pubspec.yaml diff --git a/packages/dart/example/pubspec_overrides.yaml b/packages/dart/example/pubspec_overrides.yaml new file mode 100644 index 0000000000..fb3ef0716c --- /dev/null +++ b/packages/dart/example/pubspec_overrides.yaml @@ -0,0 +1,4 @@ +# melos_managed_dependency_overrides: sentry +dependency_overrides: + sentry: + path: .. diff --git a/dart/example_web/.gitignore b/packages/dart/example_web/.gitignore similarity index 100% rename from dart/example_web/.gitignore rename to packages/dart/example_web/.gitignore diff --git a/dart/example_web/README.md b/packages/dart/example_web/README.md similarity index 100% rename from dart/example_web/README.md rename to packages/dart/example_web/README.md diff --git a/dart/example_web/analysis_options.yaml b/packages/dart/example_web/analysis_options.yaml similarity index 100% rename from dart/example_web/analysis_options.yaml rename to packages/dart/example_web/analysis_options.yaml diff --git a/dart/example_web/pubspec.yaml b/packages/dart/example_web/pubspec.yaml similarity index 100% rename from dart/example_web/pubspec.yaml rename to packages/dart/example_web/pubspec.yaml diff --git a/packages/dart/example_web/pubspec_overrides.yaml b/packages/dart/example_web/pubspec_overrides.yaml new file mode 100644 index 0000000000..fb3ef0716c --- /dev/null +++ b/packages/dart/example_web/pubspec_overrides.yaml @@ -0,0 +1,4 @@ +# melos_managed_dependency_overrides: sentry +dependency_overrides: + sentry: + path: .. diff --git a/dart/example_web/web/event.dart b/packages/dart/example_web/web/event.dart similarity index 100% rename from dart/example_web/web/event.dart rename to packages/dart/example_web/web/event.dart diff --git a/dart/example_web/web/favicon.ico b/packages/dart/example_web/web/favicon.ico similarity index 100% rename from dart/example_web/web/favicon.ico rename to packages/dart/example_web/web/favicon.ico diff --git a/dart/example_web/web/index.html b/packages/dart/example_web/web/index.html similarity index 100% rename from dart/example_web/web/index.html rename to packages/dart/example_web/web/index.html diff --git a/dart/example_web/web/main.dart b/packages/dart/example_web/web/main.dart similarity index 100% rename from dart/example_web/web/main.dart rename to packages/dart/example_web/web/main.dart diff --git a/dart/example_web/web/styles.css b/packages/dart/example_web/web/styles.css similarity index 100% rename from dart/example_web/web/styles.css rename to packages/dart/example_web/web/styles.css diff --git a/dart/lib/sentry.dart b/packages/dart/lib/sentry.dart similarity index 100% rename from dart/lib/sentry.dart rename to packages/dart/lib/sentry.dart diff --git a/dart/lib/sentry_io.dart b/packages/dart/lib/sentry_io.dart similarity index 100% rename from dart/lib/sentry_io.dart rename to packages/dart/lib/sentry_io.dart diff --git a/dart/lib/src/client_reports/client_report.dart b/packages/dart/lib/src/client_reports/client_report.dart similarity index 100% rename from dart/lib/src/client_reports/client_report.dart rename to packages/dart/lib/src/client_reports/client_report.dart diff --git a/dart/lib/src/client_reports/client_report_recorder.dart b/packages/dart/lib/src/client_reports/client_report_recorder.dart similarity index 100% rename from dart/lib/src/client_reports/client_report_recorder.dart rename to packages/dart/lib/src/client_reports/client_report_recorder.dart diff --git a/dart/lib/src/client_reports/discard_reason.dart b/packages/dart/lib/src/client_reports/discard_reason.dart similarity index 100% rename from dart/lib/src/client_reports/discard_reason.dart rename to packages/dart/lib/src/client_reports/discard_reason.dart diff --git a/dart/lib/src/client_reports/discarded_event.dart b/packages/dart/lib/src/client_reports/discarded_event.dart similarity index 100% rename from dart/lib/src/client_reports/discarded_event.dart rename to packages/dart/lib/src/client_reports/discarded_event.dart diff --git a/dart/lib/src/client_reports/noop_client_report_recorder.dart b/packages/dart/lib/src/client_reports/noop_client_report_recorder.dart similarity index 100% rename from dart/lib/src/client_reports/noop_client_report_recorder.dart rename to packages/dart/lib/src/client_reports/noop_client_report_recorder.dart diff --git a/dart/lib/src/constants.dart b/packages/dart/lib/src/constants.dart similarity index 100% rename from dart/lib/src/constants.dart rename to packages/dart/lib/src/constants.dart diff --git a/dart/lib/src/dart_exception_type_identifier.dart b/packages/dart/lib/src/dart_exception_type_identifier.dart similarity index 100% rename from dart/lib/src/dart_exception_type_identifier.dart rename to packages/dart/lib/src/dart_exception_type_identifier.dart diff --git a/dart/lib/src/dart_exception_type_identifier_io.dart b/packages/dart/lib/src/dart_exception_type_identifier_io.dart similarity index 100% rename from dart/lib/src/dart_exception_type_identifier_io.dart rename to packages/dart/lib/src/dart_exception_type_identifier_io.dart diff --git a/dart/lib/src/dart_exception_type_identifier_web.dart b/packages/dart/lib/src/dart_exception_type_identifier_web.dart similarity index 100% rename from dart/lib/src/dart_exception_type_identifier_web.dart rename to packages/dart/lib/src/dart_exception_type_identifier_web.dart diff --git a/dart/lib/src/diagnostic_log.dart b/packages/dart/lib/src/diagnostic_log.dart similarity index 100% rename from dart/lib/src/diagnostic_log.dart rename to packages/dart/lib/src/diagnostic_log.dart diff --git a/dart/lib/src/environment/_io_environment_variables.dart b/packages/dart/lib/src/environment/_io_environment_variables.dart similarity index 100% rename from dart/lib/src/environment/_io_environment_variables.dart rename to packages/dart/lib/src/environment/_io_environment_variables.dart diff --git a/dart/lib/src/environment/_web_environment_variables.dart b/packages/dart/lib/src/environment/_web_environment_variables.dart similarity index 100% rename from dart/lib/src/environment/_web_environment_variables.dart rename to packages/dart/lib/src/environment/_web_environment_variables.dart diff --git a/dart/lib/src/environment/environment_variables.dart b/packages/dart/lib/src/environment/environment_variables.dart similarity index 100% rename from dart/lib/src/environment/environment_variables.dart rename to packages/dart/lib/src/environment/environment_variables.dart diff --git a/dart/lib/src/environment/keys.dart b/packages/dart/lib/src/environment/keys.dart similarity index 100% rename from dart/lib/src/environment/keys.dart rename to packages/dart/lib/src/environment/keys.dart diff --git a/dart/lib/src/event_processor.dart b/packages/dart/lib/src/event_processor.dart similarity index 100% rename from dart/lib/src/event_processor.dart rename to packages/dart/lib/src/event_processor.dart diff --git a/dart/lib/src/event_processor/deduplication_event_processor.dart b/packages/dart/lib/src/event_processor/deduplication_event_processor.dart similarity index 100% rename from dart/lib/src/event_processor/deduplication_event_processor.dart rename to packages/dart/lib/src/event_processor/deduplication_event_processor.dart diff --git a/dart/lib/src/event_processor/enricher/enricher_event_processor.dart b/packages/dart/lib/src/event_processor/enricher/enricher_event_processor.dart similarity index 100% rename from dart/lib/src/event_processor/enricher/enricher_event_processor.dart rename to packages/dart/lib/src/event_processor/enricher/enricher_event_processor.dart diff --git a/dart/lib/src/event_processor/enricher/flutter_runtime.dart b/packages/dart/lib/src/event_processor/enricher/flutter_runtime.dart similarity index 100% rename from dart/lib/src/event_processor/enricher/flutter_runtime.dart rename to packages/dart/lib/src/event_processor/enricher/flutter_runtime.dart diff --git a/dart/lib/src/event_processor/enricher/io_enricher_event_processor.dart b/packages/dart/lib/src/event_processor/enricher/io_enricher_event_processor.dart similarity index 100% rename from dart/lib/src/event_processor/enricher/io_enricher_event_processor.dart rename to packages/dart/lib/src/event_processor/enricher/io_enricher_event_processor.dart diff --git a/dart/lib/src/event_processor/enricher/io_platform_memory.dart b/packages/dart/lib/src/event_processor/enricher/io_platform_memory.dart similarity index 100% rename from dart/lib/src/event_processor/enricher/io_platform_memory.dart rename to packages/dart/lib/src/event_processor/enricher/io_platform_memory.dart diff --git a/dart/lib/src/event_processor/enricher/web_enricher_event_processor.dart b/packages/dart/lib/src/event_processor/enricher/web_enricher_event_processor.dart similarity index 100% rename from dart/lib/src/event_processor/enricher/web_enricher_event_processor.dart rename to packages/dart/lib/src/event_processor/enricher/web_enricher_event_processor.dart diff --git a/dart/lib/src/event_processor/exception/exception_event_processor.dart b/packages/dart/lib/src/event_processor/exception/exception_event_processor.dart similarity index 100% rename from dart/lib/src/event_processor/exception/exception_event_processor.dart rename to packages/dart/lib/src/event_processor/exception/exception_event_processor.dart diff --git a/dart/lib/src/event_processor/exception/exception_group_event_processor.dart b/packages/dart/lib/src/event_processor/exception/exception_group_event_processor.dart similarity index 100% rename from dart/lib/src/event_processor/exception/exception_group_event_processor.dart rename to packages/dart/lib/src/event_processor/exception/exception_group_event_processor.dart diff --git a/dart/lib/src/event_processor/exception/io_exception_event_processor.dart b/packages/dart/lib/src/event_processor/exception/io_exception_event_processor.dart similarity index 100% rename from dart/lib/src/event_processor/exception/io_exception_event_processor.dart rename to packages/dart/lib/src/event_processor/exception/io_exception_event_processor.dart diff --git a/dart/lib/src/event_processor/exception/web_exception_event_processor.dart b/packages/dart/lib/src/event_processor/exception/web_exception_event_processor.dart similarity index 100% rename from dart/lib/src/event_processor/exception/web_exception_event_processor.dart rename to packages/dart/lib/src/event_processor/exception/web_exception_event_processor.dart diff --git a/dart/lib/src/event_processor/run_event_processors.dart b/packages/dart/lib/src/event_processor/run_event_processors.dart similarity index 100% rename from dart/lib/src/event_processor/run_event_processors.dart rename to packages/dart/lib/src/event_processor/run_event_processors.dart diff --git a/dart/lib/src/exception_cause.dart b/packages/dart/lib/src/exception_cause.dart similarity index 100% rename from dart/lib/src/exception_cause.dart rename to packages/dart/lib/src/exception_cause.dart diff --git a/dart/lib/src/exception_cause_extractor.dart b/packages/dart/lib/src/exception_cause_extractor.dart similarity index 100% rename from dart/lib/src/exception_cause_extractor.dart rename to packages/dart/lib/src/exception_cause_extractor.dart diff --git a/dart/lib/src/exception_stacktrace_extractor.dart b/packages/dart/lib/src/exception_stacktrace_extractor.dart similarity index 100% rename from dart/lib/src/exception_stacktrace_extractor.dart rename to packages/dart/lib/src/exception_stacktrace_extractor.dart diff --git a/dart/lib/src/exception_type_identifier.dart b/packages/dart/lib/src/exception_type_identifier.dart similarity index 100% rename from dart/lib/src/exception_type_identifier.dart rename to packages/dart/lib/src/exception_type_identifier.dart diff --git a/dart/lib/src/feature_flags_integration.dart b/packages/dart/lib/src/feature_flags_integration.dart similarity index 100% rename from dart/lib/src/feature_flags_integration.dart rename to packages/dart/lib/src/feature_flags_integration.dart diff --git a/dart/lib/src/hint.dart b/packages/dart/lib/src/hint.dart similarity index 100% rename from dart/lib/src/hint.dart rename to packages/dart/lib/src/hint.dart diff --git a/dart/lib/src/http_client/breadcrumb_client.dart b/packages/dart/lib/src/http_client/breadcrumb_client.dart similarity index 100% rename from dart/lib/src/http_client/breadcrumb_client.dart rename to packages/dart/lib/src/http_client/breadcrumb_client.dart diff --git a/dart/lib/src/http_client/client_provider.dart b/packages/dart/lib/src/http_client/client_provider.dart similarity index 100% rename from dart/lib/src/http_client/client_provider.dart rename to packages/dart/lib/src/http_client/client_provider.dart diff --git a/dart/lib/src/http_client/failed_request_client.dart b/packages/dart/lib/src/http_client/failed_request_client.dart similarity index 100% rename from dart/lib/src/http_client/failed_request_client.dart rename to packages/dart/lib/src/http_client/failed_request_client.dart diff --git a/dart/lib/src/http_client/io_client_provider.dart b/packages/dart/lib/src/http_client/io_client_provider.dart similarity index 100% rename from dart/lib/src/http_client/io_client_provider.dart rename to packages/dart/lib/src/http_client/io_client_provider.dart diff --git a/dart/lib/src/http_client/sentry_http_client.dart b/packages/dart/lib/src/http_client/sentry_http_client.dart similarity index 100% rename from dart/lib/src/http_client/sentry_http_client.dart rename to packages/dart/lib/src/http_client/sentry_http_client.dart diff --git a/dart/lib/src/http_client/sentry_http_client_error.dart b/packages/dart/lib/src/http_client/sentry_http_client_error.dart similarity index 100% rename from dart/lib/src/http_client/sentry_http_client_error.dart rename to packages/dart/lib/src/http_client/sentry_http_client_error.dart diff --git a/dart/lib/src/http_client/tracing_client.dart b/packages/dart/lib/src/http_client/tracing_client.dart similarity index 100% rename from dart/lib/src/http_client/tracing_client.dart rename to packages/dart/lib/src/http_client/tracing_client.dart diff --git a/dart/lib/src/hub.dart b/packages/dart/lib/src/hub.dart similarity index 100% rename from dart/lib/src/hub.dart rename to packages/dart/lib/src/hub.dart diff --git a/dart/lib/src/hub_adapter.dart b/packages/dart/lib/src/hub_adapter.dart similarity index 100% rename from dart/lib/src/hub_adapter.dart rename to packages/dart/lib/src/hub_adapter.dart diff --git a/dart/lib/src/integration.dart b/packages/dart/lib/src/integration.dart similarity index 100% rename from dart/lib/src/integration.dart rename to packages/dart/lib/src/integration.dart diff --git a/dart/lib/src/invalid_sentry_trace_header_exception.dart b/packages/dart/lib/src/invalid_sentry_trace_header_exception.dart similarity index 100% rename from dart/lib/src/invalid_sentry_trace_header_exception.dart rename to packages/dart/lib/src/invalid_sentry_trace_header_exception.dart diff --git a/dart/lib/src/isolate_error_integration.dart b/packages/dart/lib/src/isolate_error_integration.dart similarity index 100% rename from dart/lib/src/isolate_error_integration.dart rename to packages/dart/lib/src/isolate_error_integration.dart diff --git a/dart/lib/src/load_dart_debug_images_integration.dart b/packages/dart/lib/src/load_dart_debug_images_integration.dart similarity index 100% rename from dart/lib/src/load_dart_debug_images_integration.dart rename to packages/dart/lib/src/load_dart_debug_images_integration.dart diff --git a/dart/lib/src/logs_enricher_integration.dart b/packages/dart/lib/src/logs_enricher_integration.dart similarity index 100% rename from dart/lib/src/logs_enricher_integration.dart rename to packages/dart/lib/src/logs_enricher_integration.dart diff --git a/dart/lib/src/noop_client.dart b/packages/dart/lib/src/noop_client.dart similarity index 100% rename from dart/lib/src/noop_client.dart rename to packages/dart/lib/src/noop_client.dart diff --git a/dart/lib/src/noop_hub.dart b/packages/dart/lib/src/noop_hub.dart similarity index 100% rename from dart/lib/src/noop_hub.dart rename to packages/dart/lib/src/noop_hub.dart diff --git a/dart/lib/src/noop_isolate_error_integration.dart b/packages/dart/lib/src/noop_isolate_error_integration.dart similarity index 100% rename from dart/lib/src/noop_isolate_error_integration.dart rename to packages/dart/lib/src/noop_isolate_error_integration.dart diff --git a/dart/lib/src/noop_log_batcher.dart b/packages/dart/lib/src/noop_log_batcher.dart similarity index 100% rename from dart/lib/src/noop_log_batcher.dart rename to packages/dart/lib/src/noop_log_batcher.dart diff --git a/dart/lib/src/noop_sentry_client.dart b/packages/dart/lib/src/noop_sentry_client.dart similarity index 100% rename from dart/lib/src/noop_sentry_client.dart rename to packages/dart/lib/src/noop_sentry_client.dart diff --git a/dart/lib/src/noop_sentry_span.dart b/packages/dart/lib/src/noop_sentry_span.dart similarity index 100% rename from dart/lib/src/noop_sentry_span.dart rename to packages/dart/lib/src/noop_sentry_span.dart diff --git a/dart/lib/src/origin.dart b/packages/dart/lib/src/origin.dart similarity index 100% rename from dart/lib/src/origin.dart rename to packages/dart/lib/src/origin.dart diff --git a/dart/lib/src/origin_io.dart b/packages/dart/lib/src/origin_io.dart similarity index 100% rename from dart/lib/src/origin_io.dart rename to packages/dart/lib/src/origin_io.dart diff --git a/dart/lib/src/origin_web.dart b/packages/dart/lib/src/origin_web.dart similarity index 100% rename from dart/lib/src/origin_web.dart rename to packages/dart/lib/src/origin_web.dart diff --git a/dart/lib/src/performance_collector.dart b/packages/dart/lib/src/performance_collector.dart similarity index 100% rename from dart/lib/src/performance_collector.dart rename to packages/dart/lib/src/performance_collector.dart diff --git a/dart/lib/src/platform/_io_platform.dart b/packages/dart/lib/src/platform/_io_platform.dart similarity index 100% rename from dart/lib/src/platform/_io_platform.dart rename to packages/dart/lib/src/platform/_io_platform.dart diff --git a/dart/lib/src/platform/_web_platform.dart b/packages/dart/lib/src/platform/_web_platform.dart similarity index 100% rename from dart/lib/src/platform/_web_platform.dart rename to packages/dart/lib/src/platform/_web_platform.dart diff --git a/dart/lib/src/platform/mock_platform.dart b/packages/dart/lib/src/platform/mock_platform.dart similarity index 100% rename from dart/lib/src/platform/mock_platform.dart rename to packages/dart/lib/src/platform/mock_platform.dart diff --git a/dart/lib/src/platform/platform.dart b/packages/dart/lib/src/platform/platform.dart similarity index 100% rename from dart/lib/src/platform/platform.dart rename to packages/dart/lib/src/platform/platform.dart diff --git a/dart/lib/src/profiling.dart b/packages/dart/lib/src/profiling.dart similarity index 100% rename from dart/lib/src/profiling.dart rename to packages/dart/lib/src/profiling.dart diff --git a/dart/lib/src/propagation_context.dart b/packages/dart/lib/src/propagation_context.dart similarity index 100% rename from dart/lib/src/propagation_context.dart rename to packages/dart/lib/src/propagation_context.dart diff --git a/dart/lib/src/protocol.dart b/packages/dart/lib/src/protocol.dart similarity index 100% rename from dart/lib/src/protocol.dart rename to packages/dart/lib/src/protocol.dart diff --git a/dart/lib/src/protocol/access_aware_map.dart b/packages/dart/lib/src/protocol/access_aware_map.dart similarity index 100% rename from dart/lib/src/protocol/access_aware_map.dart rename to packages/dart/lib/src/protocol/access_aware_map.dart diff --git a/dart/lib/src/protocol/breadcrumb.dart b/packages/dart/lib/src/protocol/breadcrumb.dart similarity index 100% rename from dart/lib/src/protocol/breadcrumb.dart rename to packages/dart/lib/src/protocol/breadcrumb.dart diff --git a/dart/lib/src/protocol/contexts.dart b/packages/dart/lib/src/protocol/contexts.dart similarity index 100% rename from dart/lib/src/protocol/contexts.dart rename to packages/dart/lib/src/protocol/contexts.dart diff --git a/dart/lib/src/protocol/debug_image.dart b/packages/dart/lib/src/protocol/debug_image.dart similarity index 100% rename from dart/lib/src/protocol/debug_image.dart rename to packages/dart/lib/src/protocol/debug_image.dart diff --git a/dart/lib/src/protocol/debug_meta.dart b/packages/dart/lib/src/protocol/debug_meta.dart similarity index 100% rename from dart/lib/src/protocol/debug_meta.dart rename to packages/dart/lib/src/protocol/debug_meta.dart diff --git a/dart/lib/src/protocol/dsn.dart b/packages/dart/lib/src/protocol/dsn.dart similarity index 100% rename from dart/lib/src/protocol/dsn.dart rename to packages/dart/lib/src/protocol/dsn.dart diff --git a/dart/lib/src/protocol/max_body_size.dart b/packages/dart/lib/src/protocol/max_body_size.dart similarity index 100% rename from dart/lib/src/protocol/max_body_size.dart rename to packages/dart/lib/src/protocol/max_body_size.dart diff --git a/dart/lib/src/protocol/mechanism.dart b/packages/dart/lib/src/protocol/mechanism.dart similarity index 100% rename from dart/lib/src/protocol/mechanism.dart rename to packages/dart/lib/src/protocol/mechanism.dart diff --git a/dart/lib/src/protocol/sdk_info.dart b/packages/dart/lib/src/protocol/sdk_info.dart similarity index 100% rename from dart/lib/src/protocol/sdk_info.dart rename to packages/dart/lib/src/protocol/sdk_info.dart diff --git a/dart/lib/src/protocol/sdk_version.dart b/packages/dart/lib/src/protocol/sdk_version.dart similarity index 100% rename from dart/lib/src/protocol/sdk_version.dart rename to packages/dart/lib/src/protocol/sdk_version.dart diff --git a/dart/lib/src/protocol/sentry_app.dart b/packages/dart/lib/src/protocol/sentry_app.dart similarity index 100% rename from dart/lib/src/protocol/sentry_app.dart rename to packages/dart/lib/src/protocol/sentry_app.dart diff --git a/dart/lib/src/protocol/sentry_baggage_header.dart b/packages/dart/lib/src/protocol/sentry_baggage_header.dart similarity index 100% rename from dart/lib/src/protocol/sentry_baggage_header.dart rename to packages/dart/lib/src/protocol/sentry_baggage_header.dart diff --git a/dart/lib/src/protocol/sentry_browser.dart b/packages/dart/lib/src/protocol/sentry_browser.dart similarity index 100% rename from dart/lib/src/protocol/sentry_browser.dart rename to packages/dart/lib/src/protocol/sentry_browser.dart diff --git a/dart/lib/src/protocol/sentry_culture.dart b/packages/dart/lib/src/protocol/sentry_culture.dart similarity index 100% rename from dart/lib/src/protocol/sentry_culture.dart rename to packages/dart/lib/src/protocol/sentry_culture.dart diff --git a/dart/lib/src/protocol/sentry_device.dart b/packages/dart/lib/src/protocol/sentry_device.dart similarity index 100% rename from dart/lib/src/protocol/sentry_device.dart rename to packages/dart/lib/src/protocol/sentry_device.dart diff --git a/dart/lib/src/protocol/sentry_event.dart b/packages/dart/lib/src/protocol/sentry_event.dart similarity index 100% rename from dart/lib/src/protocol/sentry_event.dart rename to packages/dart/lib/src/protocol/sentry_event.dart diff --git a/dart/lib/src/protocol/sentry_exception.dart b/packages/dart/lib/src/protocol/sentry_exception.dart similarity index 100% rename from dart/lib/src/protocol/sentry_exception.dart rename to packages/dart/lib/src/protocol/sentry_exception.dart diff --git a/dart/lib/src/protocol/sentry_feature_flag.dart b/packages/dart/lib/src/protocol/sentry_feature_flag.dart similarity index 100% rename from dart/lib/src/protocol/sentry_feature_flag.dart rename to packages/dart/lib/src/protocol/sentry_feature_flag.dart diff --git a/dart/lib/src/protocol/sentry_feature_flags.dart b/packages/dart/lib/src/protocol/sentry_feature_flags.dart similarity index 100% rename from dart/lib/src/protocol/sentry_feature_flags.dart rename to packages/dart/lib/src/protocol/sentry_feature_flags.dart diff --git a/dart/lib/src/protocol/sentry_feedback.dart b/packages/dart/lib/src/protocol/sentry_feedback.dart similarity index 100% rename from dart/lib/src/protocol/sentry_feedback.dart rename to packages/dart/lib/src/protocol/sentry_feedback.dart diff --git a/dart/lib/src/protocol/sentry_geo.dart b/packages/dart/lib/src/protocol/sentry_geo.dart similarity index 100% rename from dart/lib/src/protocol/sentry_geo.dart rename to packages/dart/lib/src/protocol/sentry_geo.dart diff --git a/dart/lib/src/protocol/sentry_gpu.dart b/packages/dart/lib/src/protocol/sentry_gpu.dart similarity index 100% rename from dart/lib/src/protocol/sentry_gpu.dart rename to packages/dart/lib/src/protocol/sentry_gpu.dart diff --git a/dart/lib/src/protocol/sentry_id.dart b/packages/dart/lib/src/protocol/sentry_id.dart similarity index 100% rename from dart/lib/src/protocol/sentry_id.dart rename to packages/dart/lib/src/protocol/sentry_id.dart diff --git a/dart/lib/src/protocol/sentry_level.dart b/packages/dart/lib/src/protocol/sentry_level.dart similarity index 100% rename from dart/lib/src/protocol/sentry_level.dart rename to packages/dart/lib/src/protocol/sentry_level.dart diff --git a/dart/lib/src/protocol/sentry_log.dart b/packages/dart/lib/src/protocol/sentry_log.dart similarity index 100% rename from dart/lib/src/protocol/sentry_log.dart rename to packages/dart/lib/src/protocol/sentry_log.dart diff --git a/dart/lib/src/protocol/sentry_log_attribute.dart b/packages/dart/lib/src/protocol/sentry_log_attribute.dart similarity index 100% rename from dart/lib/src/protocol/sentry_log_attribute.dart rename to packages/dart/lib/src/protocol/sentry_log_attribute.dart diff --git a/dart/lib/src/protocol/sentry_log_level.dart b/packages/dart/lib/src/protocol/sentry_log_level.dart similarity index 100% rename from dart/lib/src/protocol/sentry_log_level.dart rename to packages/dart/lib/src/protocol/sentry_log_level.dart diff --git a/dart/lib/src/protocol/sentry_message.dart b/packages/dart/lib/src/protocol/sentry_message.dart similarity index 100% rename from dart/lib/src/protocol/sentry_message.dart rename to packages/dart/lib/src/protocol/sentry_message.dart diff --git a/dart/lib/src/protocol/sentry_operating_system.dart b/packages/dart/lib/src/protocol/sentry_operating_system.dart similarity index 100% rename from dart/lib/src/protocol/sentry_operating_system.dart rename to packages/dart/lib/src/protocol/sentry_operating_system.dart diff --git a/dart/lib/src/protocol/sentry_package.dart b/packages/dart/lib/src/protocol/sentry_package.dart similarity index 100% rename from dart/lib/src/protocol/sentry_package.dart rename to packages/dart/lib/src/protocol/sentry_package.dart diff --git a/dart/lib/src/protocol/sentry_proxy.dart b/packages/dart/lib/src/protocol/sentry_proxy.dart similarity index 100% rename from dart/lib/src/protocol/sentry_proxy.dart rename to packages/dart/lib/src/protocol/sentry_proxy.dart diff --git a/dart/lib/src/protocol/sentry_request.dart b/packages/dart/lib/src/protocol/sentry_request.dart similarity index 100% rename from dart/lib/src/protocol/sentry_request.dart rename to packages/dart/lib/src/protocol/sentry_request.dart diff --git a/dart/lib/src/protocol/sentry_response.dart b/packages/dart/lib/src/protocol/sentry_response.dart similarity index 100% rename from dart/lib/src/protocol/sentry_response.dart rename to packages/dart/lib/src/protocol/sentry_response.dart diff --git a/dart/lib/src/protocol/sentry_runtime.dart b/packages/dart/lib/src/protocol/sentry_runtime.dart similarity index 100% rename from dart/lib/src/protocol/sentry_runtime.dart rename to packages/dart/lib/src/protocol/sentry_runtime.dart diff --git a/dart/lib/src/protocol/sentry_span.dart b/packages/dart/lib/src/protocol/sentry_span.dart similarity index 100% rename from dart/lib/src/protocol/sentry_span.dart rename to packages/dart/lib/src/protocol/sentry_span.dart diff --git a/dart/lib/src/protocol/sentry_stack_frame.dart b/packages/dart/lib/src/protocol/sentry_stack_frame.dart similarity index 100% rename from dart/lib/src/protocol/sentry_stack_frame.dart rename to packages/dart/lib/src/protocol/sentry_stack_frame.dart diff --git a/dart/lib/src/protocol/sentry_stack_trace.dart b/packages/dart/lib/src/protocol/sentry_stack_trace.dart similarity index 100% rename from dart/lib/src/protocol/sentry_stack_trace.dart rename to packages/dart/lib/src/protocol/sentry_stack_trace.dart diff --git a/dart/lib/src/protocol/sentry_thread.dart b/packages/dart/lib/src/protocol/sentry_thread.dart similarity index 100% rename from dart/lib/src/protocol/sentry_thread.dart rename to packages/dart/lib/src/protocol/sentry_thread.dart diff --git a/dart/lib/src/protocol/sentry_trace_context.dart b/packages/dart/lib/src/protocol/sentry_trace_context.dart similarity index 100% rename from dart/lib/src/protocol/sentry_trace_context.dart rename to packages/dart/lib/src/protocol/sentry_trace_context.dart diff --git a/dart/lib/src/protocol/sentry_trace_header.dart b/packages/dart/lib/src/protocol/sentry_trace_header.dart similarity index 100% rename from dart/lib/src/protocol/sentry_trace_header.dart rename to packages/dart/lib/src/protocol/sentry_trace_header.dart diff --git a/dart/lib/src/protocol/sentry_transaction.dart b/packages/dart/lib/src/protocol/sentry_transaction.dart similarity index 100% rename from dart/lib/src/protocol/sentry_transaction.dart rename to packages/dart/lib/src/protocol/sentry_transaction.dart diff --git a/dart/lib/src/protocol/sentry_transaction_info.dart b/packages/dart/lib/src/protocol/sentry_transaction_info.dart similarity index 100% rename from dart/lib/src/protocol/sentry_transaction_info.dart rename to packages/dart/lib/src/protocol/sentry_transaction_info.dart diff --git a/dart/lib/src/protocol/sentry_transaction_name_source.dart b/packages/dart/lib/src/protocol/sentry_transaction_name_source.dart similarity index 100% rename from dart/lib/src/protocol/sentry_transaction_name_source.dart rename to packages/dart/lib/src/protocol/sentry_transaction_name_source.dart diff --git a/dart/lib/src/protocol/sentry_user.dart b/packages/dart/lib/src/protocol/sentry_user.dart similarity index 100% rename from dart/lib/src/protocol/sentry_user.dart rename to packages/dart/lib/src/protocol/sentry_user.dart diff --git a/dart/lib/src/protocol/sentry_view_hierarchy.dart b/packages/dart/lib/src/protocol/sentry_view_hierarchy.dart similarity index 100% rename from dart/lib/src/protocol/sentry_view_hierarchy.dart rename to packages/dart/lib/src/protocol/sentry_view_hierarchy.dart diff --git a/dart/lib/src/protocol/sentry_view_hierarchy_element.dart b/packages/dart/lib/src/protocol/sentry_view_hierarchy_element.dart similarity index 100% rename from dart/lib/src/protocol/sentry_view_hierarchy_element.dart rename to packages/dart/lib/src/protocol/sentry_view_hierarchy_element.dart diff --git a/dart/lib/src/protocol/span_id.dart b/packages/dart/lib/src/protocol/span_id.dart similarity index 100% rename from dart/lib/src/protocol/span_id.dart rename to packages/dart/lib/src/protocol/span_id.dart diff --git a/dart/lib/src/protocol/span_status.dart b/packages/dart/lib/src/protocol/span_status.dart similarity index 100% rename from dart/lib/src/protocol/span_status.dart rename to packages/dart/lib/src/protocol/span_status.dart diff --git a/dart/lib/src/recursive_exception_cause_extractor.dart b/packages/dart/lib/src/recursive_exception_cause_extractor.dart similarity index 100% rename from dart/lib/src/recursive_exception_cause_extractor.dart rename to packages/dart/lib/src/recursive_exception_cause_extractor.dart diff --git a/dart/lib/src/run_zoned_guarded_integration.dart b/packages/dart/lib/src/run_zoned_guarded_integration.dart similarity index 100% rename from dart/lib/src/run_zoned_guarded_integration.dart rename to packages/dart/lib/src/run_zoned_guarded_integration.dart diff --git a/dart/lib/src/runtime_checker.dart b/packages/dart/lib/src/runtime_checker.dart similarity index 100% rename from dart/lib/src/runtime_checker.dart rename to packages/dart/lib/src/runtime_checker.dart diff --git a/dart/lib/src/scope.dart b/packages/dart/lib/src/scope.dart similarity index 100% rename from dart/lib/src/scope.dart rename to packages/dart/lib/src/scope.dart diff --git a/dart/lib/src/scope_observer.dart b/packages/dart/lib/src/scope_observer.dart similarity index 100% rename from dart/lib/src/scope_observer.dart rename to packages/dart/lib/src/scope_observer.dart diff --git a/dart/lib/src/sdk_lifecycle_hooks.dart b/packages/dart/lib/src/sdk_lifecycle_hooks.dart similarity index 100% rename from dart/lib/src/sdk_lifecycle_hooks.dart rename to packages/dart/lib/src/sdk_lifecycle_hooks.dart diff --git a/dart/lib/src/sentry.dart b/packages/dart/lib/src/sentry.dart similarity index 100% rename from dart/lib/src/sentry.dart rename to packages/dart/lib/src/sentry.dart diff --git a/dart/lib/src/sentry_attachment/io_sentry_attachment.dart b/packages/dart/lib/src/sentry_attachment/io_sentry_attachment.dart similarity index 100% rename from dart/lib/src/sentry_attachment/io_sentry_attachment.dart rename to packages/dart/lib/src/sentry_attachment/io_sentry_attachment.dart diff --git a/dart/lib/src/sentry_attachment/sentry_attachment.dart b/packages/dart/lib/src/sentry_attachment/sentry_attachment.dart similarity index 100% rename from dart/lib/src/sentry_attachment/sentry_attachment.dart rename to packages/dart/lib/src/sentry_attachment/sentry_attachment.dart diff --git a/dart/lib/src/sentry_baggage.dart b/packages/dart/lib/src/sentry_baggage.dart similarity index 100% rename from dart/lib/src/sentry_baggage.dart rename to packages/dart/lib/src/sentry_baggage.dart diff --git a/dart/lib/src/sentry_client.dart b/packages/dart/lib/src/sentry_client.dart similarity index 100% rename from dart/lib/src/sentry_client.dart rename to packages/dart/lib/src/sentry_client.dart diff --git a/dart/lib/src/sentry_envelope.dart b/packages/dart/lib/src/sentry_envelope.dart similarity index 100% rename from dart/lib/src/sentry_envelope.dart rename to packages/dart/lib/src/sentry_envelope.dart diff --git a/dart/lib/src/sentry_envelope_header.dart b/packages/dart/lib/src/sentry_envelope_header.dart similarity index 100% rename from dart/lib/src/sentry_envelope_header.dart rename to packages/dart/lib/src/sentry_envelope_header.dart diff --git a/dart/lib/src/sentry_envelope_item.dart b/packages/dart/lib/src/sentry_envelope_item.dart similarity index 100% rename from dart/lib/src/sentry_envelope_item.dart rename to packages/dart/lib/src/sentry_envelope_item.dart diff --git a/dart/lib/src/sentry_envelope_item_header.dart b/packages/dart/lib/src/sentry_envelope_item_header.dart similarity index 100% rename from dart/lib/src/sentry_envelope_item_header.dart rename to packages/dart/lib/src/sentry_envelope_item_header.dart diff --git a/dart/lib/src/sentry_event_like.dart b/packages/dart/lib/src/sentry_event_like.dart similarity index 100% rename from dart/lib/src/sentry_event_like.dart rename to packages/dart/lib/src/sentry_event_like.dart diff --git a/dart/lib/src/sentry_exception_factory.dart b/packages/dart/lib/src/sentry_exception_factory.dart similarity index 100% rename from dart/lib/src/sentry_exception_factory.dart rename to packages/dart/lib/src/sentry_exception_factory.dart diff --git a/dart/lib/src/sentry_isolate.dart b/packages/dart/lib/src/sentry_isolate.dart similarity index 100% rename from dart/lib/src/sentry_isolate.dart rename to packages/dart/lib/src/sentry_isolate.dart diff --git a/dart/lib/src/sentry_isolate_extension.dart b/packages/dart/lib/src/sentry_isolate_extension.dart similarity index 100% rename from dart/lib/src/sentry_isolate_extension.dart rename to packages/dart/lib/src/sentry_isolate_extension.dart diff --git a/dart/lib/src/sentry_item_type.dart b/packages/dart/lib/src/sentry_item_type.dart similarity index 100% rename from dart/lib/src/sentry_item_type.dart rename to packages/dart/lib/src/sentry_item_type.dart diff --git a/dart/lib/src/sentry_log_batcher.dart b/packages/dart/lib/src/sentry_log_batcher.dart similarity index 100% rename from dart/lib/src/sentry_log_batcher.dart rename to packages/dart/lib/src/sentry_log_batcher.dart diff --git a/dart/lib/src/sentry_logger.dart b/packages/dart/lib/src/sentry_logger.dart similarity index 100% rename from dart/lib/src/sentry_logger.dart rename to packages/dart/lib/src/sentry_logger.dart diff --git a/dart/lib/src/sentry_logger_formatter.dart b/packages/dart/lib/src/sentry_logger_formatter.dart similarity index 100% rename from dart/lib/src/sentry_logger_formatter.dart rename to packages/dart/lib/src/sentry_logger_formatter.dart diff --git a/dart/lib/src/sentry_measurement.dart b/packages/dart/lib/src/sentry_measurement.dart similarity index 100% rename from dart/lib/src/sentry_measurement.dart rename to packages/dart/lib/src/sentry_measurement.dart diff --git a/dart/lib/src/sentry_measurement_unit.dart b/packages/dart/lib/src/sentry_measurement_unit.dart similarity index 100% rename from dart/lib/src/sentry_measurement_unit.dart rename to packages/dart/lib/src/sentry_measurement_unit.dart diff --git a/dart/lib/src/sentry_options.dart b/packages/dart/lib/src/sentry_options.dart similarity index 100% rename from dart/lib/src/sentry_options.dart rename to packages/dart/lib/src/sentry_options.dart diff --git a/dart/lib/src/sentry_run_zoned_guarded.dart b/packages/dart/lib/src/sentry_run_zoned_guarded.dart similarity index 100% rename from dart/lib/src/sentry_run_zoned_guarded.dart rename to packages/dart/lib/src/sentry_run_zoned_guarded.dart diff --git a/dart/lib/src/sentry_sampling_context.dart b/packages/dart/lib/src/sentry_sampling_context.dart similarity index 100% rename from dart/lib/src/sentry_sampling_context.dart rename to packages/dart/lib/src/sentry_sampling_context.dart diff --git a/dart/lib/src/sentry_span_context.dart b/packages/dart/lib/src/sentry_span_context.dart similarity index 100% rename from dart/lib/src/sentry_span_context.dart rename to packages/dart/lib/src/sentry_span_context.dart diff --git a/dart/lib/src/sentry_span_interface.dart b/packages/dart/lib/src/sentry_span_interface.dart similarity index 100% rename from dart/lib/src/sentry_span_interface.dart rename to packages/dart/lib/src/sentry_span_interface.dart diff --git a/dart/lib/src/sentry_stack_trace_factory.dart b/packages/dart/lib/src/sentry_stack_trace_factory.dart similarity index 100% rename from dart/lib/src/sentry_stack_trace_factory.dart rename to packages/dart/lib/src/sentry_stack_trace_factory.dart diff --git a/dart/lib/src/sentry_template_string.dart b/packages/dart/lib/src/sentry_template_string.dart similarity index 100% rename from dart/lib/src/sentry_template_string.dart rename to packages/dart/lib/src/sentry_template_string.dart diff --git a/dart/lib/src/sentry_trace_context_header.dart b/packages/dart/lib/src/sentry_trace_context_header.dart similarity index 100% rename from dart/lib/src/sentry_trace_context_header.dart rename to packages/dart/lib/src/sentry_trace_context_header.dart diff --git a/dart/lib/src/sentry_trace_origins.dart b/packages/dart/lib/src/sentry_trace_origins.dart similarity index 100% rename from dart/lib/src/sentry_trace_origins.dart rename to packages/dart/lib/src/sentry_trace_origins.dart diff --git a/dart/lib/src/sentry_tracer.dart b/packages/dart/lib/src/sentry_tracer.dart similarity index 100% rename from dart/lib/src/sentry_tracer.dart rename to packages/dart/lib/src/sentry_tracer.dart diff --git a/dart/lib/src/sentry_tracer_finish_status.dart b/packages/dart/lib/src/sentry_tracer_finish_status.dart similarity index 100% rename from dart/lib/src/sentry_tracer_finish_status.dart rename to packages/dart/lib/src/sentry_tracer_finish_status.dart diff --git a/dart/lib/src/sentry_traces_sampler.dart b/packages/dart/lib/src/sentry_traces_sampler.dart similarity index 100% rename from dart/lib/src/sentry_traces_sampler.dart rename to packages/dart/lib/src/sentry_traces_sampler.dart diff --git a/dart/lib/src/sentry_traces_sampling_decision.dart b/packages/dart/lib/src/sentry_traces_sampling_decision.dart similarity index 100% rename from dart/lib/src/sentry_traces_sampling_decision.dart rename to packages/dart/lib/src/sentry_traces_sampling_decision.dart diff --git a/dart/lib/src/sentry_transaction_context.dart b/packages/dart/lib/src/sentry_transaction_context.dart similarity index 100% rename from dart/lib/src/sentry_transaction_context.dart rename to packages/dart/lib/src/sentry_transaction_context.dart diff --git a/dart/lib/src/span_data_convention.dart b/packages/dart/lib/src/span_data_convention.dart similarity index 100% rename from dart/lib/src/span_data_convention.dart rename to packages/dart/lib/src/span_data_convention.dart diff --git a/dart/lib/src/spotlight.dart b/packages/dart/lib/src/spotlight.dart similarity index 100% rename from dart/lib/src/spotlight.dart rename to packages/dart/lib/src/spotlight.dart diff --git a/dart/lib/src/throwable_mechanism.dart b/packages/dart/lib/src/throwable_mechanism.dart similarity index 100% rename from dart/lib/src/throwable_mechanism.dart rename to packages/dart/lib/src/throwable_mechanism.dart diff --git a/dart/lib/src/tracing.dart b/packages/dart/lib/src/tracing.dart similarity index 100% rename from dart/lib/src/tracing.dart rename to packages/dart/lib/src/tracing.dart diff --git a/dart/lib/src/transport/client_report_transport.dart b/packages/dart/lib/src/transport/client_report_transport.dart similarity index 100% rename from dart/lib/src/transport/client_report_transport.dart rename to packages/dart/lib/src/transport/client_report_transport.dart diff --git a/dart/lib/src/transport/data_category.dart b/packages/dart/lib/src/transport/data_category.dart similarity index 100% rename from dart/lib/src/transport/data_category.dart rename to packages/dart/lib/src/transport/data_category.dart diff --git a/dart/lib/src/transport/encode.dart b/packages/dart/lib/src/transport/encode.dart similarity index 100% rename from dart/lib/src/transport/encode.dart rename to packages/dart/lib/src/transport/encode.dart diff --git a/dart/lib/src/transport/http_transport.dart b/packages/dart/lib/src/transport/http_transport.dart similarity index 100% rename from dart/lib/src/transport/http_transport.dart rename to packages/dart/lib/src/transport/http_transport.dart diff --git a/dart/lib/src/transport/http_transport_request_handler.dart b/packages/dart/lib/src/transport/http_transport_request_handler.dart similarity index 100% rename from dart/lib/src/transport/http_transport_request_handler.dart rename to packages/dart/lib/src/transport/http_transport_request_handler.dart diff --git a/dart/lib/src/transport/noop_encode.dart b/packages/dart/lib/src/transport/noop_encode.dart similarity index 100% rename from dart/lib/src/transport/noop_encode.dart rename to packages/dart/lib/src/transport/noop_encode.dart diff --git a/dart/lib/src/transport/noop_transport.dart b/packages/dart/lib/src/transport/noop_transport.dart similarity index 100% rename from dart/lib/src/transport/noop_transport.dart rename to packages/dart/lib/src/transport/noop_transport.dart diff --git a/dart/lib/src/transport/rate_limit.dart b/packages/dart/lib/src/transport/rate_limit.dart similarity index 100% rename from dart/lib/src/transport/rate_limit.dart rename to packages/dart/lib/src/transport/rate_limit.dart diff --git a/dart/lib/src/transport/rate_limit_parser.dart b/packages/dart/lib/src/transport/rate_limit_parser.dart similarity index 100% rename from dart/lib/src/transport/rate_limit_parser.dart rename to packages/dart/lib/src/transport/rate_limit_parser.dart diff --git a/dart/lib/src/transport/rate_limiter.dart b/packages/dart/lib/src/transport/rate_limiter.dart similarity index 100% rename from dart/lib/src/transport/rate_limiter.dart rename to packages/dart/lib/src/transport/rate_limiter.dart diff --git a/dart/lib/src/transport/spotlight_http_transport.dart b/packages/dart/lib/src/transport/spotlight_http_transport.dart similarity index 100% rename from dart/lib/src/transport/spotlight_http_transport.dart rename to packages/dart/lib/src/transport/spotlight_http_transport.dart diff --git a/dart/lib/src/transport/task_queue.dart b/packages/dart/lib/src/transport/task_queue.dart similarity index 100% rename from dart/lib/src/transport/task_queue.dart rename to packages/dart/lib/src/transport/task_queue.dart diff --git a/dart/lib/src/transport/transport.dart b/packages/dart/lib/src/transport/transport.dart similarity index 100% rename from dart/lib/src/transport/transport.dart rename to packages/dart/lib/src/transport/transport.dart diff --git a/dart/lib/src/type_check_hint.dart b/packages/dart/lib/src/type_check_hint.dart similarity index 100% rename from dart/lib/src/type_check_hint.dart rename to packages/dart/lib/src/type_check_hint.dart diff --git a/dart/lib/src/utils.dart b/packages/dart/lib/src/utils.dart similarity index 100% rename from dart/lib/src/utils.dart rename to packages/dart/lib/src/utils.dart diff --git a/dart/lib/src/utils/_io_get_isolate_name.dart b/packages/dart/lib/src/utils/_io_get_isolate_name.dart similarity index 100% rename from dart/lib/src/utils/_io_get_isolate_name.dart rename to packages/dart/lib/src/utils/_io_get_isolate_name.dart diff --git a/dart/lib/src/utils/_io_get_sentry_operating_system.dart b/packages/dart/lib/src/utils/_io_get_sentry_operating_system.dart similarity index 100% rename from dart/lib/src/utils/_io_get_sentry_operating_system.dart rename to packages/dart/lib/src/utils/_io_get_sentry_operating_system.dart diff --git a/dart/lib/src/utils/_web_get_isolate_name.dart b/packages/dart/lib/src/utils/_web_get_isolate_name.dart similarity index 100% rename from dart/lib/src/utils/_web_get_isolate_name.dart rename to packages/dart/lib/src/utils/_web_get_isolate_name.dart diff --git a/dart/lib/src/utils/_web_get_sentry_operating_system.dart b/packages/dart/lib/src/utils/_web_get_sentry_operating_system.dart similarity index 100% rename from dart/lib/src/utils/_web_get_sentry_operating_system.dart rename to packages/dart/lib/src/utils/_web_get_sentry_operating_system.dart diff --git a/dart/lib/src/utils/breadcrumb_log_level.dart b/packages/dart/lib/src/utils/breadcrumb_log_level.dart similarity index 100% rename from dart/lib/src/utils/breadcrumb_log_level.dart rename to packages/dart/lib/src/utils/breadcrumb_log_level.dart diff --git a/dart/lib/src/utils/crc32_utils.dart b/packages/dart/lib/src/utils/crc32_utils.dart similarity index 100% rename from dart/lib/src/utils/crc32_utils.dart rename to packages/dart/lib/src/utils/crc32_utils.dart diff --git a/dart/lib/src/utils/http_header_utils.dart b/packages/dart/lib/src/utils/http_header_utils.dart similarity index 100% rename from dart/lib/src/utils/http_header_utils.dart rename to packages/dart/lib/src/utils/http_header_utils.dart diff --git a/dart/lib/src/utils/http_sanitizer.dart b/packages/dart/lib/src/utils/http_sanitizer.dart similarity index 100% rename from dart/lib/src/utils/http_sanitizer.dart rename to packages/dart/lib/src/utils/http_sanitizer.dart diff --git a/dart/lib/src/utils/isolate_utils.dart b/packages/dart/lib/src/utils/isolate_utils.dart similarity index 100% rename from dart/lib/src/utils/isolate_utils.dart rename to packages/dart/lib/src/utils/isolate_utils.dart diff --git a/dart/lib/src/utils/iterable_utils.dart b/packages/dart/lib/src/utils/iterable_utils.dart similarity index 100% rename from dart/lib/src/utils/iterable_utils.dart rename to packages/dart/lib/src/utils/iterable_utils.dart diff --git a/dart/lib/src/utils/os_utils.dart b/packages/dart/lib/src/utils/os_utils.dart similarity index 100% rename from dart/lib/src/utils/os_utils.dart rename to packages/dart/lib/src/utils/os_utils.dart diff --git a/dart/lib/src/utils/regex_utils.dart b/packages/dart/lib/src/utils/regex_utils.dart similarity index 100% rename from dart/lib/src/utils/regex_utils.dart rename to packages/dart/lib/src/utils/regex_utils.dart diff --git a/dart/lib/src/utils/sample_rate_format.dart b/packages/dart/lib/src/utils/sample_rate_format.dart similarity index 100% rename from dart/lib/src/utils/sample_rate_format.dart rename to packages/dart/lib/src/utils/sample_rate_format.dart diff --git a/dart/lib/src/utils/stacktrace_utils.dart b/packages/dart/lib/src/utils/stacktrace_utils.dart similarity index 100% rename from dart/lib/src/utils/stacktrace_utils.dart rename to packages/dart/lib/src/utils/stacktrace_utils.dart diff --git a/dart/lib/src/utils/tracing_utils.dart b/packages/dart/lib/src/utils/tracing_utils.dart similarity index 100% rename from dart/lib/src/utils/tracing_utils.dart rename to packages/dart/lib/src/utils/tracing_utils.dart diff --git a/dart/lib/src/utils/transport_utils.dart b/packages/dart/lib/src/utils/transport_utils.dart similarity index 100% rename from dart/lib/src/utils/transport_utils.dart rename to packages/dart/lib/src/utils/transport_utils.dart diff --git a/dart/lib/src/utils/url_details.dart b/packages/dart/lib/src/utils/url_details.dart similarity index 100% rename from dart/lib/src/utils/url_details.dart rename to packages/dart/lib/src/utils/url_details.dart diff --git a/dart/lib/src/version.dart b/packages/dart/lib/src/version.dart similarity index 100% rename from dart/lib/src/version.dart rename to packages/dart/lib/src/version.dart diff --git a/dart/pubspec.yaml b/packages/dart/pubspec.yaml similarity index 100% rename from dart/pubspec.yaml rename to packages/dart/pubspec.yaml diff --git a/dart/test/client_reports/client_report_recorder_test.dart b/packages/dart/test/client_reports/client_report_recorder_test.dart similarity index 100% rename from dart/test/client_reports/client_report_recorder_test.dart rename to packages/dart/test/client_reports/client_report_recorder_test.dart diff --git a/dart/test/client_reports/client_report_test.dart b/packages/dart/test/client_reports/client_report_test.dart similarity index 100% rename from dart/test/client_reports/client_report_test.dart rename to packages/dart/test/client_reports/client_report_test.dart diff --git a/dart/test/contexts_test.dart b/packages/dart/test/contexts_test.dart similarity index 100% rename from dart/test/contexts_test.dart rename to packages/dart/test/contexts_test.dart diff --git a/dart/test/diagnostic_logger_test.dart b/packages/dart/test/diagnostic_logger_test.dart similarity index 100% rename from dart/test/diagnostic_logger_test.dart rename to packages/dart/test/diagnostic_logger_test.dart diff --git a/dart/test/environment_test.dart b/packages/dart/test/environment_test.dart similarity index 100% rename from dart/test/environment_test.dart rename to packages/dart/test/environment_test.dart diff --git a/dart/test/event_processor/deduplication_event_processor_test.dart b/packages/dart/test/event_processor/deduplication_event_processor_test.dart similarity index 100% rename from dart/test/event_processor/deduplication_event_processor_test.dart rename to packages/dart/test/event_processor/deduplication_event_processor_test.dart diff --git a/dart/test/event_processor/enricher/io_enricher_test.dart b/packages/dart/test/event_processor/enricher/io_enricher_test.dart similarity index 100% rename from dart/test/event_processor/enricher/io_enricher_test.dart rename to packages/dart/test/event_processor/enricher/io_enricher_test.dart diff --git a/dart/test/event_processor/enricher/io_platform_memory_test.dart b/packages/dart/test/event_processor/enricher/io_platform_memory_test.dart similarity index 100% rename from dart/test/event_processor/enricher/io_platform_memory_test.dart rename to packages/dart/test/event_processor/enricher/io_platform_memory_test.dart diff --git a/dart/test/event_processor/enricher/web_enricher_test.dart b/packages/dart/test/event_processor/enricher/web_enricher_test.dart similarity index 100% rename from dart/test/event_processor/enricher/web_enricher_test.dart rename to packages/dart/test/event_processor/enricher/web_enricher_test.dart diff --git a/dart/test/event_processor/exception/exception_group_event_processor_test.dart b/packages/dart/test/event_processor/exception/exception_group_event_processor_test.dart similarity index 100% rename from dart/test/event_processor/exception/exception_group_event_processor_test.dart rename to packages/dart/test/event_processor/exception/exception_group_event_processor_test.dart diff --git a/dart/test/event_processor/exception/io_exception_event_processor_test.dart b/packages/dart/test/event_processor/exception/io_exception_event_processor_test.dart similarity index 100% rename from dart/test/event_processor/exception/io_exception_event_processor_test.dart rename to packages/dart/test/event_processor/exception/io_exception_event_processor_test.dart diff --git a/dart/test/example_web_compile_test.dart b/packages/dart/test/example_web_compile_test.dart similarity index 100% rename from dart/test/example_web_compile_test.dart rename to packages/dart/test/example_web_compile_test.dart diff --git a/dart/test/exception_identifier_test.dart b/packages/dart/test/exception_identifier_test.dart similarity index 100% rename from dart/test/exception_identifier_test.dart rename to packages/dart/test/exception_identifier_test.dart diff --git a/dart/test/feature_flags_integration_test.dart b/packages/dart/test/feature_flags_integration_test.dart similarity index 100% rename from dart/test/feature_flags_integration_test.dart rename to packages/dart/test/feature_flags_integration_test.dart diff --git a/dart/test/hint_test.dart b/packages/dart/test/hint_test.dart similarity index 100% rename from dart/test/hint_test.dart rename to packages/dart/test/hint_test.dart diff --git a/dart/test/http_client/breadcrumb_client_test.dart b/packages/dart/test/http_client/breadcrumb_client_test.dart similarity index 100% rename from dart/test/http_client/breadcrumb_client_test.dart rename to packages/dart/test/http_client/breadcrumb_client_test.dart diff --git a/dart/test/http_client/failed_request_client_test.dart b/packages/dart/test/http_client/failed_request_client_test.dart similarity index 100% rename from dart/test/http_client/failed_request_client_test.dart rename to packages/dart/test/http_client/failed_request_client_test.dart diff --git a/dart/test/http_client/io_client_provider_test.dart b/packages/dart/test/http_client/io_client_provider_test.dart similarity index 100% rename from dart/test/http_client/io_client_provider_test.dart rename to packages/dart/test/http_client/io_client_provider_test.dart diff --git a/dart/test/http_client/sentry_http_client_test.dart b/packages/dart/test/http_client/sentry_http_client_test.dart similarity index 100% rename from dart/test/http_client/sentry_http_client_test.dart rename to packages/dart/test/http_client/sentry_http_client_test.dart diff --git a/dart/test/http_client/tracing_client_test.dart b/packages/dart/test/http_client/tracing_client_test.dart similarity index 100% rename from dart/test/http_client/tracing_client_test.dart rename to packages/dart/test/http_client/tracing_client_test.dart diff --git a/dart/test/hub_test.dart b/packages/dart/test/hub_test.dart similarity index 100% rename from dart/test/hub_test.dart rename to packages/dart/test/hub_test.dart diff --git a/dart/test/initialization_test.dart b/packages/dart/test/initialization_test.dart similarity index 100% rename from dart/test/initialization_test.dart rename to packages/dart/test/initialization_test.dart diff --git a/dart/test/load_dart_debug_images_integration_test.dart b/packages/dart/test/load_dart_debug_images_integration_test.dart similarity index 100% rename from dart/test/load_dart_debug_images_integration_test.dart rename to packages/dart/test/load_dart_debug_images_integration_test.dart diff --git a/dart/test/logs_enricher_interation_test.dart b/packages/dart/test/logs_enricher_interation_test.dart similarity index 100% rename from dart/test/logs_enricher_interation_test.dart rename to packages/dart/test/logs_enricher_interation_test.dart diff --git a/dart/test/mocks.dart b/packages/dart/test/mocks.dart similarity index 100% rename from dart/test/mocks.dart rename to packages/dart/test/mocks.dart diff --git a/dart/test/mocks.mocks.dart b/packages/dart/test/mocks.mocks.dart similarity index 100% rename from dart/test/mocks.mocks.dart rename to packages/dart/test/mocks.mocks.dart diff --git a/dart/test/mocks/mock_client_report_recorder.dart b/packages/dart/test/mocks/mock_client_report_recorder.dart similarity index 100% rename from dart/test/mocks/mock_client_report_recorder.dart rename to packages/dart/test/mocks/mock_client_report_recorder.dart diff --git a/dart/test/mocks/mock_envelope.dart b/packages/dart/test/mocks/mock_envelope.dart similarity index 100% rename from dart/test/mocks/mock_envelope.dart rename to packages/dart/test/mocks/mock_envelope.dart diff --git a/dart/test/mocks/mock_environment_variables.dart b/packages/dart/test/mocks/mock_environment_variables.dart similarity index 100% rename from dart/test/mocks/mock_environment_variables.dart rename to packages/dart/test/mocks/mock_environment_variables.dart diff --git a/dart/test/mocks/mock_hub.dart b/packages/dart/test/mocks/mock_hub.dart similarity index 100% rename from dart/test/mocks/mock_hub.dart rename to packages/dart/test/mocks/mock_hub.dart diff --git a/dart/test/mocks/mock_integration.dart b/packages/dart/test/mocks/mock_integration.dart similarity index 100% rename from dart/test/mocks/mock_integration.dart rename to packages/dart/test/mocks/mock_integration.dart diff --git a/dart/test/mocks/mock_log_batcher.dart b/packages/dart/test/mocks/mock_log_batcher.dart similarity index 100% rename from dart/test/mocks/mock_log_batcher.dart rename to packages/dart/test/mocks/mock_log_batcher.dart diff --git a/dart/test/mocks/mock_runtime_checker.dart b/packages/dart/test/mocks/mock_runtime_checker.dart similarity index 100% rename from dart/test/mocks/mock_runtime_checker.dart rename to packages/dart/test/mocks/mock_runtime_checker.dart diff --git a/dart/test/mocks/mock_scope_observer.dart b/packages/dart/test/mocks/mock_scope_observer.dart similarity index 100% rename from dart/test/mocks/mock_scope_observer.dart rename to packages/dart/test/mocks/mock_scope_observer.dart diff --git a/dart/test/mocks/mock_sentry_client.dart b/packages/dart/test/mocks/mock_sentry_client.dart similarity index 100% rename from dart/test/mocks/mock_sentry_client.dart rename to packages/dart/test/mocks/mock_sentry_client.dart diff --git a/dart/test/mocks/mock_transport.dart b/packages/dart/test/mocks/mock_transport.dart similarity index 100% rename from dart/test/mocks/mock_transport.dart rename to packages/dart/test/mocks/mock_transport.dart diff --git a/dart/test/mocks/no_such_method_provider.dart b/packages/dart/test/mocks/no_such_method_provider.dart similarity index 100% rename from dart/test/mocks/no_such_method_provider.dart rename to packages/dart/test/mocks/no_such_method_provider.dart diff --git a/dart/test/propagation_context_test.dart b/packages/dart/test/propagation_context_test.dart similarity index 100% rename from dart/test/propagation_context_test.dart rename to packages/dart/test/propagation_context_test.dart diff --git a/dart/test/protocol/access_aware_map_tests.dart b/packages/dart/test/protocol/access_aware_map_tests.dart similarity index 100% rename from dart/test/protocol/access_aware_map_tests.dart rename to packages/dart/test/protocol/access_aware_map_tests.dart diff --git a/dart/test/protocol/breadcrumb_test.dart b/packages/dart/test/protocol/breadcrumb_test.dart similarity index 100% rename from dart/test/protocol/breadcrumb_test.dart rename to packages/dart/test/protocol/breadcrumb_test.dart diff --git a/dart/test/protocol/contexts_test.dart b/packages/dart/test/protocol/contexts_test.dart similarity index 100% rename from dart/test/protocol/contexts_test.dart rename to packages/dart/test/protocol/contexts_test.dart diff --git a/dart/test/protocol/culture_test.dart b/packages/dart/test/protocol/culture_test.dart similarity index 100% rename from dart/test/protocol/culture_test.dart rename to packages/dart/test/protocol/culture_test.dart diff --git a/dart/test/protocol/debug_image_test.dart b/packages/dart/test/protocol/debug_image_test.dart similarity index 100% rename from dart/test/protocol/debug_image_test.dart rename to packages/dart/test/protocol/debug_image_test.dart diff --git a/dart/test/protocol/debug_meta_test.dart b/packages/dart/test/protocol/debug_meta_test.dart similarity index 100% rename from dart/test/protocol/debug_meta_test.dart rename to packages/dart/test/protocol/debug_meta_test.dart diff --git a/dart/test/protocol/mechanism_test.dart b/packages/dart/test/protocol/mechanism_test.dart similarity index 100% rename from dart/test/protocol/mechanism_test.dart rename to packages/dart/test/protocol/mechanism_test.dart diff --git a/dart/test/protocol/rate_limit_parser_test.dart b/packages/dart/test/protocol/rate_limit_parser_test.dart similarity index 100% rename from dart/test/protocol/rate_limit_parser_test.dart rename to packages/dart/test/protocol/rate_limit_parser_test.dart diff --git a/dart/test/protocol/rate_limiter_test.dart b/packages/dart/test/protocol/rate_limiter_test.dart similarity index 100% rename from dart/test/protocol/rate_limiter_test.dart rename to packages/dart/test/protocol/rate_limiter_test.dart diff --git a/dart/test/protocol/sdk_info_test.dart b/packages/dart/test/protocol/sdk_info_test.dart similarity index 100% rename from dart/test/protocol/sdk_info_test.dart rename to packages/dart/test/protocol/sdk_info_test.dart diff --git a/dart/test/protocol/sdk_version_test.dart b/packages/dart/test/protocol/sdk_version_test.dart similarity index 100% rename from dart/test/protocol/sdk_version_test.dart rename to packages/dart/test/protocol/sdk_version_test.dart diff --git a/dart/test/protocol/sentry_app_test.dart b/packages/dart/test/protocol/sentry_app_test.dart similarity index 100% rename from dart/test/protocol/sentry_app_test.dart rename to packages/dart/test/protocol/sentry_app_test.dart diff --git a/dart/test/protocol/sentry_baggage_header_test.dart b/packages/dart/test/protocol/sentry_baggage_header_test.dart similarity index 100% rename from dart/test/protocol/sentry_baggage_header_test.dart rename to packages/dart/test/protocol/sentry_baggage_header_test.dart diff --git a/dart/test/protocol/sentry_browser_test.dart b/packages/dart/test/protocol/sentry_browser_test.dart similarity index 100% rename from dart/test/protocol/sentry_browser_test.dart rename to packages/dart/test/protocol/sentry_browser_test.dart diff --git a/dart/test/protocol/sentry_device_test.dart b/packages/dart/test/protocol/sentry_device_test.dart similarity index 100% rename from dart/test/protocol/sentry_device_test.dart rename to packages/dart/test/protocol/sentry_device_test.dart diff --git a/dart/test/protocol/sentry_exception_test.dart b/packages/dart/test/protocol/sentry_exception_test.dart similarity index 100% rename from dart/test/protocol/sentry_exception_test.dart rename to packages/dart/test/protocol/sentry_exception_test.dart diff --git a/dart/test/protocol/sentry_feature_flag_tests.dart b/packages/dart/test/protocol/sentry_feature_flag_tests.dart similarity index 100% rename from dart/test/protocol/sentry_feature_flag_tests.dart rename to packages/dart/test/protocol/sentry_feature_flag_tests.dart diff --git a/dart/test/protocol/sentry_feature_flags_tests.dart b/packages/dart/test/protocol/sentry_feature_flags_tests.dart similarity index 100% rename from dart/test/protocol/sentry_feature_flags_tests.dart rename to packages/dart/test/protocol/sentry_feature_flags_tests.dart diff --git a/dart/test/protocol/sentry_feedback_test.dart b/packages/dart/test/protocol/sentry_feedback_test.dart similarity index 100% rename from dart/test/protocol/sentry_feedback_test.dart rename to packages/dart/test/protocol/sentry_feedback_test.dart diff --git a/dart/test/protocol/sentry_gpu_test.dart b/packages/dart/test/protocol/sentry_gpu_test.dart similarity index 100% rename from dart/test/protocol/sentry_gpu_test.dart rename to packages/dart/test/protocol/sentry_gpu_test.dart diff --git a/dart/test/protocol/sentry_log_attribute_test.dart b/packages/dart/test/protocol/sentry_log_attribute_test.dart similarity index 100% rename from dart/test/protocol/sentry_log_attribute_test.dart rename to packages/dart/test/protocol/sentry_log_attribute_test.dart diff --git a/dart/test/protocol/sentry_log_test.dart b/packages/dart/test/protocol/sentry_log_test.dart similarity index 100% rename from dart/test/protocol/sentry_log_test.dart rename to packages/dart/test/protocol/sentry_log_test.dart diff --git a/dart/test/protocol/sentry_message_test.dart b/packages/dart/test/protocol/sentry_message_test.dart similarity index 100% rename from dart/test/protocol/sentry_message_test.dart rename to packages/dart/test/protocol/sentry_message_test.dart diff --git a/dart/test/protocol/sentry_operating_system_test.dart b/packages/dart/test/protocol/sentry_operating_system_test.dart similarity index 100% rename from dart/test/protocol/sentry_operating_system_test.dart rename to packages/dart/test/protocol/sentry_operating_system_test.dart diff --git a/dart/test/protocol/sentry_package_test.dart b/packages/dart/test/protocol/sentry_package_test.dart similarity index 100% rename from dart/test/protocol/sentry_package_test.dart rename to packages/dart/test/protocol/sentry_package_test.dart diff --git a/dart/test/protocol/sentry_proxy_test.dart b/packages/dart/test/protocol/sentry_proxy_test.dart similarity index 100% rename from dart/test/protocol/sentry_proxy_test.dart rename to packages/dart/test/protocol/sentry_proxy_test.dart diff --git a/dart/test/protocol/sentry_request_test.dart b/packages/dart/test/protocol/sentry_request_test.dart similarity index 100% rename from dart/test/protocol/sentry_request_test.dart rename to packages/dart/test/protocol/sentry_request_test.dart diff --git a/dart/test/protocol/sentry_response_test.dart b/packages/dart/test/protocol/sentry_response_test.dart similarity index 100% rename from dart/test/protocol/sentry_response_test.dart rename to packages/dart/test/protocol/sentry_response_test.dart diff --git a/dart/test/protocol/sentry_runtime_test.dart b/packages/dart/test/protocol/sentry_runtime_test.dart similarity index 100% rename from dart/test/protocol/sentry_runtime_test.dart rename to packages/dart/test/protocol/sentry_runtime_test.dart diff --git a/dart/test/protocol/sentry_stack_frame_test.dart b/packages/dart/test/protocol/sentry_stack_frame_test.dart similarity index 100% rename from dart/test/protocol/sentry_stack_frame_test.dart rename to packages/dart/test/protocol/sentry_stack_frame_test.dart diff --git a/dart/test/protocol/sentry_stack_trace_test.dart b/packages/dart/test/protocol/sentry_stack_trace_test.dart similarity index 100% rename from dart/test/protocol/sentry_stack_trace_test.dart rename to packages/dart/test/protocol/sentry_stack_trace_test.dart diff --git a/dart/test/protocol/sentry_trace_header_test.dart b/packages/dart/test/protocol/sentry_trace_header_test.dart similarity index 100% rename from dart/test/protocol/sentry_trace_header_test.dart rename to packages/dart/test/protocol/sentry_trace_header_test.dart diff --git a/dart/test/protocol/sentry_transaction_info_test.dart b/packages/dart/test/protocol/sentry_transaction_info_test.dart similarity index 100% rename from dart/test/protocol/sentry_transaction_info_test.dart rename to packages/dart/test/protocol/sentry_transaction_info_test.dart diff --git a/dart/test/protocol/sentry_user_test.dart b/packages/dart/test/protocol/sentry_user_test.dart similarity index 100% rename from dart/test/protocol/sentry_user_test.dart rename to packages/dart/test/protocol/sentry_user_test.dart diff --git a/dart/test/protocol/sentry_view_hierarchy_element_test.dart b/packages/dart/test/protocol/sentry_view_hierarchy_element_test.dart similarity index 100% rename from dart/test/protocol/sentry_view_hierarchy_element_test.dart rename to packages/dart/test/protocol/sentry_view_hierarchy_element_test.dart diff --git a/dart/test/protocol/sentry_view_hierarchy_test.dart b/packages/dart/test/protocol/sentry_view_hierarchy_test.dart similarity index 100% rename from dart/test/protocol/sentry_view_hierarchy_test.dart rename to packages/dart/test/protocol/sentry_view_hierarchy_test.dart diff --git a/dart/test/protocol/span_id_test.dart b/packages/dart/test/protocol/span_id_test.dart similarity index 100% rename from dart/test/protocol/span_id_test.dart rename to packages/dart/test/protocol/span_id_test.dart diff --git a/dart/test/protocol/span_status_test.dart b/packages/dart/test/protocol/span_status_test.dart similarity index 100% rename from dart/test/protocol/span_status_test.dart rename to packages/dart/test/protocol/span_status_test.dart diff --git a/dart/test/recursive_exception_cause_extractor_test.dart b/packages/dart/test/recursive_exception_cause_extractor_test.dart similarity index 100% rename from dart/test/recursive_exception_cause_extractor_test.dart rename to packages/dart/test/recursive_exception_cause_extractor_test.dart diff --git a/dart/test/scope_test.dart b/packages/dart/test/scope_test.dart similarity index 100% rename from dart/test/scope_test.dart rename to packages/dart/test/scope_test.dart diff --git a/dart/test/sdk_lifecycle_hooks_test.dart b/packages/dart/test/sdk_lifecycle_hooks_test.dart similarity index 100% rename from dart/test/sdk_lifecycle_hooks_test.dart rename to packages/dart/test/sdk_lifecycle_hooks_test.dart diff --git a/dart/test/sentry_attachment_io_test.dart b/packages/dart/test/sentry_attachment_io_test.dart similarity index 100% rename from dart/test/sentry_attachment_io_test.dart rename to packages/dart/test/sentry_attachment_io_test.dart diff --git a/dart/test/sentry_attachment_test.dart b/packages/dart/test/sentry_attachment_test.dart similarity index 100% rename from dart/test/sentry_attachment_test.dart rename to packages/dart/test/sentry_attachment_test.dart diff --git a/dart/test/sentry_baggage_test.dart b/packages/dart/test/sentry_baggage_test.dart similarity index 100% rename from dart/test/sentry_baggage_test.dart rename to packages/dart/test/sentry_baggage_test.dart diff --git a/dart/test/sentry_browser_test.dart b/packages/dart/test/sentry_browser_test.dart similarity index 100% rename from dart/test/sentry_browser_test.dart rename to packages/dart/test/sentry_browser_test.dart diff --git a/dart/test/sentry_client_lifecycle_test.dart b/packages/dart/test/sentry_client_lifecycle_test.dart similarity index 100% rename from dart/test/sentry_client_lifecycle_test.dart rename to packages/dart/test/sentry_client_lifecycle_test.dart diff --git a/dart/test/sentry_client_sdk_lifecycle_test.dart b/packages/dart/test/sentry_client_sdk_lifecycle_test.dart similarity index 100% rename from dart/test/sentry_client_sdk_lifecycle_test.dart rename to packages/dart/test/sentry_client_sdk_lifecycle_test.dart diff --git a/dart/test/sentry_client_test.dart b/packages/dart/test/sentry_client_test.dart similarity index 100% rename from dart/test/sentry_client_test.dart rename to packages/dart/test/sentry_client_test.dart diff --git a/dart/test/sentry_envelope_header_test.dart b/packages/dart/test/sentry_envelope_header_test.dart similarity index 100% rename from dart/test/sentry_envelope_header_test.dart rename to packages/dart/test/sentry_envelope_header_test.dart diff --git a/dart/test/sentry_envelope_item_header_test.dart b/packages/dart/test/sentry_envelope_item_header_test.dart similarity index 100% rename from dart/test/sentry_envelope_item_header_test.dart rename to packages/dart/test/sentry_envelope_item_header_test.dart diff --git a/dart/test/sentry_envelope_item_test.dart b/packages/dart/test/sentry_envelope_item_test.dart similarity index 100% rename from dart/test/sentry_envelope_item_test.dart rename to packages/dart/test/sentry_envelope_item_test.dart diff --git a/dart/test/sentry_envelope_test.dart b/packages/dart/test/sentry_envelope_test.dart similarity index 100% rename from dart/test/sentry_envelope_test.dart rename to packages/dart/test/sentry_envelope_test.dart diff --git a/dart/test/sentry_envelope_vm_test.dart b/packages/dart/test/sentry_envelope_vm_test.dart similarity index 100% rename from dart/test/sentry_envelope_vm_test.dart rename to packages/dart/test/sentry_envelope_vm_test.dart diff --git a/dart/test/sentry_event_test.dart b/packages/dart/test/sentry_event_test.dart similarity index 100% rename from dart/test/sentry_event_test.dart rename to packages/dart/test/sentry_event_test.dart diff --git a/dart/test/sentry_exception_factory_test.dart b/packages/dart/test/sentry_exception_factory_test.dart similarity index 100% rename from dart/test/sentry_exception_factory_test.dart rename to packages/dart/test/sentry_exception_factory_test.dart diff --git a/dart/test/sentry_id_test.dart b/packages/dart/test/sentry_id_test.dart similarity index 100% rename from dart/test/sentry_id_test.dart rename to packages/dart/test/sentry_id_test.dart diff --git a/dart/test/sentry_io_client_test.dart b/packages/dart/test/sentry_io_client_test.dart similarity index 100% rename from dart/test/sentry_io_client_test.dart rename to packages/dart/test/sentry_io_client_test.dart diff --git a/dart/test/sentry_isolate_extension_test.dart b/packages/dart/test/sentry_isolate_extension_test.dart similarity index 100% rename from dart/test/sentry_isolate_extension_test.dart rename to packages/dart/test/sentry_isolate_extension_test.dart diff --git a/dart/test/sentry_isolate_test.dart b/packages/dart/test/sentry_isolate_test.dart similarity index 100% rename from dart/test/sentry_isolate_test.dart rename to packages/dart/test/sentry_isolate_test.dart diff --git a/dart/test/sentry_log_batcher_test.dart b/packages/dart/test/sentry_log_batcher_test.dart similarity index 100% rename from dart/test/sentry_log_batcher_test.dart rename to packages/dart/test/sentry_log_batcher_test.dart diff --git a/dart/test/sentry_logger_formatter_test.dart b/packages/dart/test/sentry_logger_formatter_test.dart similarity index 100% rename from dart/test/sentry_logger_formatter_test.dart rename to packages/dart/test/sentry_logger_formatter_test.dart diff --git a/dart/test/sentry_logger_test.dart b/packages/dart/test/sentry_logger_test.dart similarity index 100% rename from dart/test/sentry_logger_test.dart rename to packages/dart/test/sentry_logger_test.dart diff --git a/dart/test/sentry_measurement_test.dart b/packages/dart/test/sentry_measurement_test.dart similarity index 100% rename from dart/test/sentry_measurement_test.dart rename to packages/dart/test/sentry_measurement_test.dart diff --git a/dart/test/sentry_measurement_unit_test.dart b/packages/dart/test/sentry_measurement_unit_test.dart similarity index 100% rename from dart/test/sentry_measurement_unit_test.dart rename to packages/dart/test/sentry_measurement_unit_test.dart diff --git a/dart/test/sentry_options_test.dart b/packages/dart/test/sentry_options_test.dart similarity index 100% rename from dart/test/sentry_options_test.dart rename to packages/dart/test/sentry_options_test.dart diff --git a/dart/test/sentry_run_zoned_guarded_test.dart b/packages/dart/test/sentry_run_zoned_guarded_test.dart similarity index 100% rename from dart/test/sentry_run_zoned_guarded_test.dart rename to packages/dart/test/sentry_run_zoned_guarded_test.dart diff --git a/dart/test/sentry_span_context_test.dart b/packages/dart/test/sentry_span_context_test.dart similarity index 100% rename from dart/test/sentry_span_context_test.dart rename to packages/dart/test/sentry_span_context_test.dart diff --git a/dart/test/sentry_span_test.dart b/packages/dart/test/sentry_span_test.dart similarity index 100% rename from dart/test/sentry_span_test.dart rename to packages/dart/test/sentry_span_test.dart diff --git a/dart/test/sentry_template_string_test.dart b/packages/dart/test/sentry_template_string_test.dart similarity index 100% rename from dart/test/sentry_template_string_test.dart rename to packages/dart/test/sentry_template_string_test.dart diff --git a/dart/test/sentry_test.dart b/packages/dart/test/sentry_test.dart similarity index 100% rename from dart/test/sentry_test.dart rename to packages/dart/test/sentry_test.dart diff --git a/dart/test/sentry_trace_context_header_test.dart b/packages/dart/test/sentry_trace_context_header_test.dart similarity index 100% rename from dart/test/sentry_trace_context_header_test.dart rename to packages/dart/test/sentry_trace_context_header_test.dart diff --git a/dart/test/sentry_trace_context_test.dart b/packages/dart/test/sentry_trace_context_test.dart similarity index 100% rename from dart/test/sentry_trace_context_test.dart rename to packages/dart/test/sentry_trace_context_test.dart diff --git a/dart/test/sentry_tracer_test.dart b/packages/dart/test/sentry_tracer_test.dart similarity index 100% rename from dart/test/sentry_tracer_test.dart rename to packages/dart/test/sentry_tracer_test.dart diff --git a/dart/test/sentry_traces_sampler_test.dart b/packages/dart/test/sentry_traces_sampler_test.dart similarity index 100% rename from dart/test/sentry_traces_sampler_test.dart rename to packages/dart/test/sentry_traces_sampler_test.dart diff --git a/dart/test/sentry_transaction_context_test.dart b/packages/dart/test/sentry_transaction_context_test.dart similarity index 100% rename from dart/test/sentry_transaction_context_test.dart rename to packages/dart/test/sentry_transaction_context_test.dart diff --git a/dart/test/sentry_transaction_test.dart b/packages/dart/test/sentry_transaction_test.dart similarity index 100% rename from dart/test/sentry_transaction_test.dart rename to packages/dart/test/sentry_transaction_test.dart diff --git a/dart/test/stack_trace_test.dart b/packages/dart/test/stack_trace_test.dart similarity index 100% rename from dart/test/stack_trace_test.dart rename to packages/dart/test/stack_trace_test.dart diff --git a/dart/test/test_utils.dart b/packages/dart/test/test_utils.dart similarity index 100% rename from dart/test/test_utils.dart rename to packages/dart/test/test_utils.dart diff --git a/dart/test/transport/client_report_transport_test.dart b/packages/dart/test/transport/client_report_transport_test.dart similarity index 100% rename from dart/test/transport/client_report_transport_test.dart rename to packages/dart/test/transport/client_report_transport_test.dart diff --git a/dart/test/transport/http_transport_test.dart b/packages/dart/test/transport/http_transport_test.dart similarity index 100% rename from dart/test/transport/http_transport_test.dart rename to packages/dart/test/transport/http_transport_test.dart diff --git a/dart/test/transport/spotlight_http_transport_test.dart b/packages/dart/test/transport/spotlight_http_transport_test.dart similarity index 100% rename from dart/test/transport/spotlight_http_transport_test.dart rename to packages/dart/test/transport/spotlight_http_transport_test.dart diff --git a/dart/test/transport/tesk_queue_test.dart b/packages/dart/test/transport/tesk_queue_test.dart similarity index 100% rename from dart/test/transport/tesk_queue_test.dart rename to packages/dart/test/transport/tesk_queue_test.dart diff --git a/dart/test/unsupported_throwables_test.dart b/packages/dart/test/unsupported_throwables_test.dart similarity index 100% rename from dart/test/unsupported_throwables_test.dart rename to packages/dart/test/unsupported_throwables_test.dart diff --git a/dart/test/utils/http_header_utils_test.dart b/packages/dart/test/utils/http_header_utils_test.dart similarity index 100% rename from dart/test/utils/http_header_utils_test.dart rename to packages/dart/test/utils/http_header_utils_test.dart diff --git a/dart/test/utils/http_sanitizer_test.dart b/packages/dart/test/utils/http_sanitizer_test.dart similarity index 100% rename from dart/test/utils/http_sanitizer_test.dart rename to packages/dart/test/utils/http_sanitizer_test.dart diff --git a/dart/test/utils/regex_utils_test.dart b/packages/dart/test/utils/regex_utils_test.dart similarity index 100% rename from dart/test/utils/regex_utils_test.dart rename to packages/dart/test/utils/regex_utils_test.dart diff --git a/dart/test/utils/sample_rate_format_test.dart b/packages/dart/test/utils/sample_rate_format_test.dart similarity index 100% rename from dart/test/utils/sample_rate_format_test.dart rename to packages/dart/test/utils/sample_rate_format_test.dart diff --git a/dart/test/utils/tracing_utils_test.dart b/packages/dart/test/utils/tracing_utils_test.dart similarity index 100% rename from dart/test/utils/tracing_utils_test.dart rename to packages/dart/test/utils/tracing_utils_test.dart diff --git a/dart/test/utils/url_details_test.dart b/packages/dart/test/utils/url_details_test.dart similarity index 100% rename from dart/test/utils/url_details_test.dart rename to packages/dart/test/utils/url_details_test.dart diff --git a/dart/test/utils_test.dart b/packages/dart/test/utils_test.dart similarity index 100% rename from dart/test/utils_test.dart rename to packages/dart/test/utils_test.dart diff --git a/dart/test/version_test.dart b/packages/dart/test/version_test.dart similarity index 100% rename from dart/test/version_test.dart rename to packages/dart/test/version_test.dart diff --git a/dart/test_resources/envelope-no-attachment.envelope b/packages/dart/test_resources/envelope-no-attachment.envelope similarity index 100% rename from dart/test_resources/envelope-no-attachment.envelope rename to packages/dart/test_resources/envelope-no-attachment.envelope diff --git a/dart/test_resources/envelope-with-image.envelope b/packages/dart/test_resources/envelope-with-image.envelope similarity index 100% rename from dart/test_resources/envelope-with-image.envelope rename to packages/dart/test_resources/envelope-with-image.envelope diff --git a/dart/test_resources/sentry.png b/packages/dart/test_resources/sentry.png similarity index 100% rename from dart/test_resources/sentry.png rename to packages/dart/test_resources/sentry.png diff --git a/dart/test_resources/testfile.txt b/packages/dart/test_resources/testfile.txt similarity index 100% rename from dart/test_resources/testfile.txt rename to packages/dart/test_resources/testfile.txt diff --git a/dart/tool/presubmit.sh b/packages/dart/tool/presubmit.sh similarity index 100% rename from dart/tool/presubmit.sh rename to packages/dart/tool/presubmit.sh diff --git a/dio/.gitignore b/packages/dio/.gitignore similarity index 100% rename from dio/.gitignore rename to packages/dio/.gitignore diff --git a/packages/dio/CHANGELOG.md b/packages/dio/CHANGELOG.md new file mode 120000 index 0000000000..699cc9e7b7 --- /dev/null +++ b/packages/dio/CHANGELOG.md @@ -0,0 +1 @@ +../../CHANGELOG.md \ No newline at end of file diff --git a/dio/LICENSE b/packages/dio/LICENSE similarity index 100% rename from dio/LICENSE rename to packages/dio/LICENSE diff --git a/dio/README.md b/packages/dio/README.md similarity index 100% rename from dio/README.md rename to packages/dio/README.md diff --git a/dio/analysis_options.yaml b/packages/dio/analysis_options.yaml similarity index 100% rename from dio/analysis_options.yaml rename to packages/dio/analysis_options.yaml diff --git a/dio/class-diagram.svg b/packages/dio/class-diagram.svg similarity index 100% rename from dio/class-diagram.svg rename to packages/dio/class-diagram.svg diff --git a/dio/dartdoc_options.yaml b/packages/dio/dartdoc_options.yaml similarity index 100% rename from dio/dartdoc_options.yaml rename to packages/dio/dartdoc_options.yaml diff --git a/dio/example/example.dart b/packages/dio/example/example.dart similarity index 100% rename from dio/example/example.dart rename to packages/dio/example/example.dart diff --git a/dio/lib/sentry_dio.dart b/packages/dio/lib/sentry_dio.dart similarity index 100% rename from dio/lib/sentry_dio.dart rename to packages/dio/lib/sentry_dio.dart diff --git a/dio/lib/src/breadcrumb_client_adapter.dart b/packages/dio/lib/src/breadcrumb_client_adapter.dart similarity index 100% rename from dio/lib/src/breadcrumb_client_adapter.dart rename to packages/dio/lib/src/breadcrumb_client_adapter.dart diff --git a/dio/lib/src/dio_error_extractor.dart b/packages/dio/lib/src/dio_error_extractor.dart similarity index 100% rename from dio/lib/src/dio_error_extractor.dart rename to packages/dio/lib/src/dio_error_extractor.dart diff --git a/dio/lib/src/dio_event_processor.dart b/packages/dio/lib/src/dio_event_processor.dart similarity index 100% rename from dio/lib/src/dio_event_processor.dart rename to packages/dio/lib/src/dio_event_processor.dart diff --git a/dio/lib/src/dio_stacktrace_extractor.dart b/packages/dio/lib/src/dio_stacktrace_extractor.dart similarity index 100% rename from dio/lib/src/dio_stacktrace_extractor.dart rename to packages/dio/lib/src/dio_stacktrace_extractor.dart diff --git a/dio/lib/src/failed_request_interceptor.dart b/packages/dio/lib/src/failed_request_interceptor.dart similarity index 100% rename from dio/lib/src/failed_request_interceptor.dart rename to packages/dio/lib/src/failed_request_interceptor.dart diff --git a/dio/lib/src/sentry_dio_client_adapter.dart b/packages/dio/lib/src/sentry_dio_client_adapter.dart similarity index 100% rename from dio/lib/src/sentry_dio_client_adapter.dart rename to packages/dio/lib/src/sentry_dio_client_adapter.dart diff --git a/dio/lib/src/sentry_dio_extension.dart b/packages/dio/lib/src/sentry_dio_extension.dart similarity index 100% rename from dio/lib/src/sentry_dio_extension.dart rename to packages/dio/lib/src/sentry_dio_extension.dart diff --git a/dio/lib/src/sentry_transformer.dart b/packages/dio/lib/src/sentry_transformer.dart similarity index 100% rename from dio/lib/src/sentry_transformer.dart rename to packages/dio/lib/src/sentry_transformer.dart diff --git a/dio/lib/src/tracing_client_adapter.dart b/packages/dio/lib/src/tracing_client_adapter.dart similarity index 100% rename from dio/lib/src/tracing_client_adapter.dart rename to packages/dio/lib/src/tracing_client_adapter.dart diff --git a/dio/lib/src/version.dart b/packages/dio/lib/src/version.dart similarity index 100% rename from dio/lib/src/version.dart rename to packages/dio/lib/src/version.dart diff --git a/dio/pubspec.yaml b/packages/dio/pubspec.yaml similarity index 100% rename from dio/pubspec.yaml rename to packages/dio/pubspec.yaml diff --git a/drift/pubspec_overrides.yaml b/packages/dio/pubspec_overrides.yaml similarity index 52% rename from drift/pubspec_overrides.yaml rename to packages/dio/pubspec_overrides.yaml index 16e71d16f0..04ac16fe75 100644 --- a/drift/pubspec_overrides.yaml +++ b/packages/dio/pubspec_overrides.yaml @@ -1,3 +1,4 @@ +# melos_managed_dependency_overrides: sentry dependency_overrides: sentry: path: ../dart diff --git a/dio/test/breadcrumb_client_adapter_test.dart b/packages/dio/test/breadcrumb_client_adapter_test.dart similarity index 100% rename from dio/test/breadcrumb_client_adapter_test.dart rename to packages/dio/test/breadcrumb_client_adapter_test.dart diff --git a/dio/test/dio_error_extractor_test.dart b/packages/dio/test/dio_error_extractor_test.dart similarity index 100% rename from dio/test/dio_error_extractor_test.dart rename to packages/dio/test/dio_error_extractor_test.dart diff --git a/dio/test/dio_event_processor_test.dart b/packages/dio/test/dio_event_processor_test.dart similarity index 100% rename from dio/test/dio_event_processor_test.dart rename to packages/dio/test/dio_event_processor_test.dart diff --git a/dio/test/dio_stacktrace_extractor_test.dart b/packages/dio/test/dio_stacktrace_extractor_test.dart similarity index 100% rename from dio/test/dio_stacktrace_extractor_test.dart rename to packages/dio/test/dio_stacktrace_extractor_test.dart diff --git a/dio/test/failed_request_interceptor_test.dart b/packages/dio/test/failed_request_interceptor_test.dart similarity index 100% rename from dio/test/failed_request_interceptor_test.dart rename to packages/dio/test/failed_request_interceptor_test.dart diff --git a/dio/test/mocks.dart b/packages/dio/test/mocks.dart similarity index 100% rename from dio/test/mocks.dart rename to packages/dio/test/mocks.dart diff --git a/dio/test/mocks/mock_http_client_adapter.dart b/packages/dio/test/mocks/mock_http_client_adapter.dart similarity index 100% rename from dio/test/mocks/mock_http_client_adapter.dart rename to packages/dio/test/mocks/mock_http_client_adapter.dart diff --git a/dio/test/mocks/mock_hub.dart b/packages/dio/test/mocks/mock_hub.dart similarity index 100% rename from dio/test/mocks/mock_hub.dart rename to packages/dio/test/mocks/mock_hub.dart diff --git a/dio/test/mocks/mock_transport.dart b/packages/dio/test/mocks/mock_transport.dart similarity index 100% rename from dio/test/mocks/mock_transport.dart rename to packages/dio/test/mocks/mock_transport.dart diff --git a/dio/test/mocks/no_such_method_provider.dart b/packages/dio/test/mocks/no_such_method_provider.dart similarity index 100% rename from dio/test/mocks/no_such_method_provider.dart rename to packages/dio/test/mocks/no_such_method_provider.dart diff --git a/dio/test/sentry_dio_client_adapter_test.dart b/packages/dio/test/sentry_dio_client_adapter_test.dart similarity index 100% rename from dio/test/sentry_dio_client_adapter_test.dart rename to packages/dio/test/sentry_dio_client_adapter_test.dart diff --git a/dio/test/sentry_dio_extension_test.dart b/packages/dio/test/sentry_dio_extension_test.dart similarity index 100% rename from dio/test/sentry_dio_extension_test.dart rename to packages/dio/test/sentry_dio_extension_test.dart diff --git a/dio/test/sentry_transformer_test.dart b/packages/dio/test/sentry_transformer_test.dart similarity index 100% rename from dio/test/sentry_transformer_test.dart rename to packages/dio/test/sentry_transformer_test.dart diff --git a/dio/test/tracing_client_adapter_test.dart b/packages/dio/test/tracing_client_adapter_test.dart similarity index 100% rename from dio/test/tracing_client_adapter_test.dart rename to packages/dio/test/tracing_client_adapter_test.dart diff --git a/dio/test/version_test.dart b/packages/dio/test/version_test.dart similarity index 100% rename from dio/test/version_test.dart rename to packages/dio/test/version_test.dart diff --git a/drift/.gitignore b/packages/drift/.gitignore similarity index 100% rename from drift/.gitignore rename to packages/drift/.gitignore diff --git a/packages/drift/CHANGELOG.md b/packages/drift/CHANGELOG.md new file mode 120000 index 0000000000..699cc9e7b7 --- /dev/null +++ b/packages/drift/CHANGELOG.md @@ -0,0 +1 @@ +../../CHANGELOG.md \ No newline at end of file diff --git a/drift/LICENSE b/packages/drift/LICENSE similarity index 100% rename from drift/LICENSE rename to packages/drift/LICENSE diff --git a/drift/README.md b/packages/drift/README.md similarity index 100% rename from drift/README.md rename to packages/drift/README.md diff --git a/drift/analysis_options.yaml b/packages/drift/analysis_options.yaml similarity index 100% rename from drift/analysis_options.yaml rename to packages/drift/analysis_options.yaml diff --git a/drift/dartdoc_options.yaml b/packages/drift/dartdoc_options.yaml similarity index 100% rename from drift/dartdoc_options.yaml rename to packages/drift/dartdoc_options.yaml diff --git a/drift/example/database.dart b/packages/drift/example/database.dart similarity index 100% rename from drift/example/database.dart rename to packages/drift/example/database.dart diff --git a/drift/example/database.g.dart b/packages/drift/example/database.g.dart similarity index 100% rename from drift/example/database.g.dart rename to packages/drift/example/database.g.dart diff --git a/drift/example/example.dart b/packages/drift/example/example.dart similarity index 100% rename from drift/example/example.dart rename to packages/drift/example/example.dart diff --git a/drift/lib/sentry_drift.dart b/packages/drift/lib/sentry_drift.dart similarity index 100% rename from drift/lib/sentry_drift.dart rename to packages/drift/lib/sentry_drift.dart diff --git a/drift/lib/src/constants.dart b/packages/drift/lib/src/constants.dart similarity index 100% rename from drift/lib/src/constants.dart rename to packages/drift/lib/src/constants.dart diff --git a/drift/lib/src/sentry_query_interceptor.dart b/packages/drift/lib/src/sentry_query_interceptor.dart similarity index 100% rename from drift/lib/src/sentry_query_interceptor.dart rename to packages/drift/lib/src/sentry_query_interceptor.dart diff --git a/drift/lib/src/sentry_span_helper.dart b/packages/drift/lib/src/sentry_span_helper.dart similarity index 100% rename from drift/lib/src/sentry_span_helper.dart rename to packages/drift/lib/src/sentry_span_helper.dart diff --git a/drift/lib/src/version.dart b/packages/drift/lib/src/version.dart similarity index 100% rename from drift/lib/src/version.dart rename to packages/drift/lib/src/version.dart diff --git a/drift/pubspec.yaml b/packages/drift/pubspec.yaml similarity index 91% rename from drift/pubspec.yaml rename to packages/drift/pubspec.yaml index 073b2085bc..d937c31117 100644 --- a/drift/pubspec.yaml +++ b/packages/drift/pubspec.yaml @@ -23,13 +23,11 @@ dependencies: dev_dependencies: lints: '>=2.0.0' - flutter_test: - sdk: flutter + test: ^1.26.3 coverage: ^1.3.0 mockito: ^5.1.0 build_runner: ^2.4.6 drift_dev: ^2.13.0 yaml: ^3.1.0 # needed for version match (code and pubspec) - sqlite3_flutter_libs: ^0.5.0 sqlite3: ^2.1.0 archive: ^3.1.2 diff --git a/file/pubspec_overrides.yaml b/packages/drift/pubspec_overrides.yaml similarity index 52% rename from file/pubspec_overrides.yaml rename to packages/drift/pubspec_overrides.yaml index 16e71d16f0..04ac16fe75 100644 --- a/file/pubspec_overrides.yaml +++ b/packages/drift/pubspec_overrides.yaml @@ -1,3 +1,4 @@ +# melos_managed_dependency_overrides: sentry dependency_overrides: sentry: path: ../dart diff --git a/drift/test/mocks/mocks.dart b/packages/drift/test/mocks/mocks.dart similarity index 100% rename from drift/test/mocks/mocks.dart rename to packages/drift/test/mocks/mocks.dart diff --git a/drift/test/mocks/mocks.mocks.dart b/packages/drift/test/mocks/mocks.mocks.dart similarity index 100% rename from drift/test/mocks/mocks.mocks.dart rename to packages/drift/test/mocks/mocks.mocks.dart diff --git a/drift/test/sentry_drift_test.dart b/packages/drift/test/sentry_drift_test.dart similarity index 99% rename from drift/test/sentry_drift_test.dart rename to packages/drift/test/sentry_drift_test.dart index ab115e6b2a..27ce6b8320 100644 --- a/drift/test/sentry_drift_test.dart +++ b/packages/drift/test/sentry_drift_test.dart @@ -4,7 +4,7 @@ import 'package:drift/drift.dart'; import 'package:drift/native.dart'; -import 'package:flutter_test/flutter_test.dart'; +import 'package:test/test.dart'; import 'package:mockito/mockito.dart'; import 'package:sentry/sentry.dart'; import 'package:sentry/src/sentry_tracer.dart'; diff --git a/drift/test/sqlite3.dll b/packages/drift/test/sqlite3.dll similarity index 100% rename from drift/test/sqlite3.dll rename to packages/drift/test/sqlite3.dll diff --git a/drift/test/test_database.dart b/packages/drift/test/test_database.dart similarity index 100% rename from drift/test/test_database.dart rename to packages/drift/test/test_database.dart diff --git a/drift/test/test_database.g.dart b/packages/drift/test/test_database.g.dart similarity index 100% rename from drift/test/test_database.g.dart rename to packages/drift/test/test_database.g.dart diff --git a/drift/test/utils.dart b/packages/drift/test/utils.dart similarity index 100% rename from drift/test/utils.dart rename to packages/drift/test/utils.dart diff --git a/packages/drift/test/utils/windows_helper.dart b/packages/drift/test/utils/windows_helper.dart new file mode 100644 index 0000000000..984ee55504 --- /dev/null +++ b/packages/drift/test/utils/windows_helper.dart @@ -0,0 +1,14 @@ +import 'dart:ffi'; + +DynamicLibrary openOnWindows() { + // Use the system SQLite DLL installed by Chocolatey + try { + // Try to load from system path first + return DynamicLibrary.open('sqlite3.dll'); + } catch (e) { + // Fallback to absolute path from Chocolatey installation + return DynamicLibrary.open( + 'C:\\ProgramData\\chocolatey\\lib\\sqlite\\tools\\sqlite3.dll', + ); + } +} diff --git a/packages/file/CHANGELOG.md b/packages/file/CHANGELOG.md new file mode 120000 index 0000000000..699cc9e7b7 --- /dev/null +++ b/packages/file/CHANGELOG.md @@ -0,0 +1 @@ +../../CHANGELOG.md \ No newline at end of file diff --git a/file/LICENSE b/packages/file/LICENSE similarity index 100% rename from file/LICENSE rename to packages/file/LICENSE diff --git a/file/README.md b/packages/file/README.md similarity index 100% rename from file/README.md rename to packages/file/README.md diff --git a/file/analysis_options.yaml b/packages/file/analysis_options.yaml similarity index 100% rename from file/analysis_options.yaml rename to packages/file/analysis_options.yaml diff --git a/file/class-diagram.svg b/packages/file/class-diagram.svg similarity index 100% rename from file/class-diagram.svg rename to packages/file/class-diagram.svg diff --git a/file/dartdoc_options.yaml b/packages/file/dartdoc_options.yaml similarity index 100% rename from file/dartdoc_options.yaml rename to packages/file/dartdoc_options.yaml diff --git a/file/example/example.dart b/packages/file/example/example.dart similarity index 100% rename from file/example/example.dart rename to packages/file/example/example.dart diff --git a/file/lib/sentry_file.dart b/packages/file/lib/sentry_file.dart similarity index 100% rename from file/lib/sentry_file.dart rename to packages/file/lib/sentry_file.dart diff --git a/file/lib/src/sentry_file.dart b/packages/file/lib/src/sentry_file.dart similarity index 100% rename from file/lib/src/sentry_file.dart rename to packages/file/lib/src/sentry_file.dart diff --git a/file/lib/src/sentry_file_extension.dart b/packages/file/lib/src/sentry_file_extension.dart similarity index 100% rename from file/lib/src/sentry_file_extension.dart rename to packages/file/lib/src/sentry_file_extension.dart diff --git a/file/lib/src/sentry_io_overrides.dart b/packages/file/lib/src/sentry_io_overrides.dart similarity index 100% rename from file/lib/src/sentry_io_overrides.dart rename to packages/file/lib/src/sentry_io_overrides.dart diff --git a/file/lib/src/sentry_io_overrides_integration.dart b/packages/file/lib/src/sentry_io_overrides_integration.dart similarity index 100% rename from file/lib/src/sentry_io_overrides_integration.dart rename to packages/file/lib/src/sentry_io_overrides_integration.dart diff --git a/file/lib/src/version.dart b/packages/file/lib/src/version.dart similarity index 100% rename from file/lib/src/version.dart rename to packages/file/lib/src/version.dart diff --git a/file/pubspec.yaml b/packages/file/pubspec.yaml similarity index 100% rename from file/pubspec.yaml rename to packages/file/pubspec.yaml diff --git a/dio/pubspec_overrides.yaml b/packages/file/pubspec_overrides.yaml similarity index 52% rename from dio/pubspec_overrides.yaml rename to packages/file/pubspec_overrides.yaml index 16e71d16f0..04ac16fe75 100644 --- a/dio/pubspec_overrides.yaml +++ b/packages/file/pubspec_overrides.yaml @@ -1,3 +1,4 @@ +# melos_managed_dependency_overrides: sentry dependency_overrides: sentry: path: ../dart diff --git a/file/test/mock_sentry_client.dart b/packages/file/test/mock_sentry_client.dart similarity index 100% rename from file/test/mock_sentry_client.dart rename to packages/file/test/mock_sentry_client.dart diff --git a/file/test/no_such_method_provider.dart b/packages/file/test/no_such_method_provider.dart similarity index 100% rename from file/test/no_such_method_provider.dart rename to packages/file/test/no_such_method_provider.dart diff --git a/file/test/sentry_file_extension_test.dart b/packages/file/test/sentry_file_extension_test.dart similarity index 100% rename from file/test/sentry_file_extension_test.dart rename to packages/file/test/sentry_file_extension_test.dart diff --git a/file/test/sentry_file_test.dart b/packages/file/test/sentry_file_test.dart similarity index 100% rename from file/test/sentry_file_test.dart rename to packages/file/test/sentry_file_test.dart diff --git a/file/test/sentry_io_overrides_integration_test.dart b/packages/file/test/sentry_io_overrides_integration_test.dart similarity index 100% rename from file/test/sentry_io_overrides_integration_test.dart rename to packages/file/test/sentry_io_overrides_integration_test.dart diff --git a/file/test/version_test.dart b/packages/file/test/version_test.dart similarity index 100% rename from file/test/version_test.dart rename to packages/file/test/version_test.dart diff --git a/file/test_resources/sentry.png b/packages/file/test_resources/sentry.png similarity index 100% rename from file/test_resources/sentry.png rename to packages/file/test_resources/sentry.png diff --git a/file/test_resources/testfile.txt b/packages/file/test_resources/testfile.txt similarity index 100% rename from file/test_resources/testfile.txt rename to packages/file/test_resources/testfile.txt diff --git a/firebase_remote_config/.gitignore b/packages/firebase_remote_config/.gitignore similarity index 100% rename from firebase_remote_config/.gitignore rename to packages/firebase_remote_config/.gitignore diff --git a/firebase_remote_config/.metadata b/packages/firebase_remote_config/.metadata similarity index 100% rename from firebase_remote_config/.metadata rename to packages/firebase_remote_config/.metadata diff --git a/packages/firebase_remote_config/CHANGELOG.md b/packages/firebase_remote_config/CHANGELOG.md new file mode 120000 index 0000000000..699cc9e7b7 --- /dev/null +++ b/packages/firebase_remote_config/CHANGELOG.md @@ -0,0 +1 @@ +../../CHANGELOG.md \ No newline at end of file diff --git a/firebase_remote_config/LICENSE b/packages/firebase_remote_config/LICENSE similarity index 100% rename from firebase_remote_config/LICENSE rename to packages/firebase_remote_config/LICENSE diff --git a/firebase_remote_config/README.md b/packages/firebase_remote_config/README.md similarity index 100% rename from firebase_remote_config/README.md rename to packages/firebase_remote_config/README.md diff --git a/firebase_remote_config/analysis_options.yaml b/packages/firebase_remote_config/analysis_options.yaml similarity index 100% rename from firebase_remote_config/analysis_options.yaml rename to packages/firebase_remote_config/analysis_options.yaml diff --git a/firebase_remote_config/dartdoc_options.yaml b/packages/firebase_remote_config/dartdoc_options.yaml similarity index 100% rename from firebase_remote_config/dartdoc_options.yaml rename to packages/firebase_remote_config/dartdoc_options.yaml diff --git a/firebase_remote_config/example/example.dart b/packages/firebase_remote_config/example/example.dart similarity index 100% rename from firebase_remote_config/example/example.dart rename to packages/firebase_remote_config/example/example.dart diff --git a/firebase_remote_config/lib/sentry_firebase_remote_config.dart b/packages/firebase_remote_config/lib/sentry_firebase_remote_config.dart similarity index 100% rename from firebase_remote_config/lib/sentry_firebase_remote_config.dart rename to packages/firebase_remote_config/lib/sentry_firebase_remote_config.dart diff --git a/firebase_remote_config/lib/src/sentry_firebase_remote_config_integration.dart b/packages/firebase_remote_config/lib/src/sentry_firebase_remote_config_integration.dart similarity index 100% rename from firebase_remote_config/lib/src/sentry_firebase_remote_config_integration.dart rename to packages/firebase_remote_config/lib/src/sentry_firebase_remote_config_integration.dart diff --git a/firebase_remote_config/pubspec.yaml b/packages/firebase_remote_config/pubspec.yaml similarity index 100% rename from firebase_remote_config/pubspec.yaml rename to packages/firebase_remote_config/pubspec.yaml diff --git a/firebase_remote_config/pubspec_overrides.yaml b/packages/firebase_remote_config/pubspec_overrides.yaml similarity index 52% rename from firebase_remote_config/pubspec_overrides.yaml rename to packages/firebase_remote_config/pubspec_overrides.yaml index 16e71d16f0..04ac16fe75 100644 --- a/firebase_remote_config/pubspec_overrides.yaml +++ b/packages/firebase_remote_config/pubspec_overrides.yaml @@ -1,3 +1,4 @@ +# melos_managed_dependency_overrides: sentry dependency_overrides: sentry: path: ../dart diff --git a/firebase_remote_config/test/mocks/mocks.dart b/packages/firebase_remote_config/test/mocks/mocks.dart similarity index 100% rename from firebase_remote_config/test/mocks/mocks.dart rename to packages/firebase_remote_config/test/mocks/mocks.dart diff --git a/firebase_remote_config/test/mocks/mocks.mocks.dart b/packages/firebase_remote_config/test/mocks/mocks.mocks.dart similarity index 100% rename from firebase_remote_config/test/mocks/mocks.mocks.dart rename to packages/firebase_remote_config/test/mocks/mocks.mocks.dart diff --git a/firebase_remote_config/test/src/sentry_firebase_remote_config_integration_test.dart b/packages/firebase_remote_config/test/src/sentry_firebase_remote_config_integration_test.dart similarity index 100% rename from firebase_remote_config/test/src/sentry_firebase_remote_config_integration_test.dart rename to packages/firebase_remote_config/test/src/sentry_firebase_remote_config_integration_test.dart diff --git a/flutter/.editorconfig b/packages/flutter/.editorconfig similarity index 100% rename from flutter/.editorconfig rename to packages/flutter/.editorconfig diff --git a/flutter/.gitignore b/packages/flutter/.gitignore similarity index 100% rename from flutter/.gitignore rename to packages/flutter/.gitignore diff --git a/flutter/.metadata b/packages/flutter/.metadata similarity index 100% rename from flutter/.metadata rename to packages/flutter/.metadata diff --git a/flutter/.pubignore b/packages/flutter/.pubignore similarity index 100% rename from flutter/.pubignore rename to packages/flutter/.pubignore diff --git a/packages/flutter/CHANGELOG.md b/packages/flutter/CHANGELOG.md new file mode 120000 index 0000000000..699cc9e7b7 --- /dev/null +++ b/packages/flutter/CHANGELOG.md @@ -0,0 +1 @@ +../../CHANGELOG.md \ No newline at end of file diff --git a/flutter/LICENSE b/packages/flutter/LICENSE similarity index 100% rename from flutter/LICENSE rename to packages/flutter/LICENSE diff --git a/flutter/README.md b/packages/flutter/README.md similarity index 100% rename from flutter/README.md rename to packages/flutter/README.md diff --git a/flutter/analysis_options.yaml b/packages/flutter/analysis_options.yaml similarity index 100% rename from flutter/analysis_options.yaml rename to packages/flutter/analysis_options.yaml diff --git a/flutter/android/.gitignore b/packages/flutter/android/.gitignore similarity index 100% rename from flutter/android/.gitignore rename to packages/flutter/android/.gitignore diff --git a/flutter/android/build.gradle b/packages/flutter/android/build.gradle similarity index 100% rename from flutter/android/build.gradle rename to packages/flutter/android/build.gradle diff --git a/flutter/android/gradle.properties b/packages/flutter/android/gradle.properties similarity index 100% rename from flutter/android/gradle.properties rename to packages/flutter/android/gradle.properties diff --git a/flutter/android/gradle/wrapper/gradle-wrapper.properties b/packages/flutter/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from flutter/android/gradle/wrapper/gradle-wrapper.properties rename to packages/flutter/android/gradle/wrapper/gradle-wrapper.properties diff --git a/flutter/android/proguard-rules.pro b/packages/flutter/android/proguard-rules.pro similarity index 100% rename from flutter/android/proguard-rules.pro rename to packages/flutter/android/proguard-rules.pro diff --git a/flutter/android/settings.gradle b/packages/flutter/android/settings.gradle similarity index 100% rename from flutter/android/settings.gradle rename to packages/flutter/android/settings.gradle diff --git a/flutter/android/src/main/AndroidManifest.xml b/packages/flutter/android/src/main/AndroidManifest.xml similarity index 100% rename from flutter/android/src/main/AndroidManifest.xml rename to packages/flutter/android/src/main/AndroidManifest.xml diff --git a/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutter.kt b/packages/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutter.kt similarity index 100% rename from flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutter.kt rename to packages/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutter.kt diff --git a/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt b/packages/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt similarity index 100% rename from flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt rename to packages/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt diff --git a/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterReplayBreadcrumbConverter.kt b/packages/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterReplayBreadcrumbConverter.kt similarity index 100% rename from flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterReplayBreadcrumbConverter.kt rename to packages/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterReplayBreadcrumbConverter.kt diff --git a/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterReplayRecorder.kt b/packages/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterReplayRecorder.kt similarity index 100% rename from flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterReplayRecorder.kt rename to packages/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterReplayRecorder.kt diff --git a/flutter/android/src/test/kotlin/io/sentry/flutter/SentryFlutterTest.kt b/packages/flutter/android/src/test/kotlin/io/sentry/flutter/SentryFlutterTest.kt similarity index 100% rename from flutter/android/src/test/kotlin/io/sentry/flutter/SentryFlutterTest.kt rename to packages/flutter/android/src/test/kotlin/io/sentry/flutter/SentryFlutterTest.kt diff --git a/flutter/class-diagram.svg b/packages/flutter/class-diagram.svg similarity index 100% rename from flutter/class-diagram.svg rename to packages/flutter/class-diagram.svg diff --git a/flutter/config/detekt-bl.xml b/packages/flutter/config/detekt-bl.xml similarity index 100% rename from flutter/config/detekt-bl.xml rename to packages/flutter/config/detekt-bl.xml diff --git a/flutter/dartdoc_options.yaml b/packages/flutter/dartdoc_options.yaml similarity index 100% rename from flutter/dartdoc_options.yaml rename to packages/flutter/dartdoc_options.yaml diff --git a/flutter/example/.gitignore b/packages/flutter/example/.gitignore similarity index 100% rename from flutter/example/.gitignore rename to packages/flutter/example/.gitignore diff --git a/flutter/example/.metadata b/packages/flutter/example/.metadata similarity index 100% rename from flutter/example/.metadata rename to packages/flutter/example/.metadata diff --git a/flutter/example/README.md b/packages/flutter/example/README.md similarity index 100% rename from flutter/example/README.md rename to packages/flutter/example/README.md diff --git a/flutter/example/analysis_options.yaml b/packages/flutter/example/analysis_options.yaml similarity index 100% rename from flutter/example/analysis_options.yaml rename to packages/flutter/example/analysis_options.yaml diff --git a/flutter/example/android/.gitignore b/packages/flutter/example/android/.gitignore similarity index 100% rename from flutter/example/android/.gitignore rename to packages/flutter/example/android/.gitignore diff --git a/flutter/example/android/app/CMakeLists.txt b/packages/flutter/example/android/app/CMakeLists.txt similarity index 100% rename from flutter/example/android/app/CMakeLists.txt rename to packages/flutter/example/android/app/CMakeLists.txt diff --git a/flutter/example/android/app/build.gradle b/packages/flutter/example/android/app/build.gradle similarity index 100% rename from flutter/example/android/app/build.gradle rename to packages/flutter/example/android/app/build.gradle diff --git a/flutter/example/android/app/proguard-rules.pro b/packages/flutter/example/android/app/proguard-rules.pro similarity index 100% rename from flutter/example/android/app/proguard-rules.pro rename to packages/flutter/example/android/app/proguard-rules.pro diff --git a/flutter/example/android/app/src/main/AndroidManifest.xml b/packages/flutter/example/android/app/src/main/AndroidManifest.xml similarity index 100% rename from flutter/example/android/app/src/main/AndroidManifest.xml rename to packages/flutter/example/android/app/src/main/AndroidManifest.xml diff --git a/flutter/example/android/app/src/main/cpp/native-sample.cpp b/packages/flutter/example/android/app/src/main/cpp/native-sample.cpp similarity index 100% rename from flutter/example/android/app/src/main/cpp/native-sample.cpp rename to packages/flutter/example/android/app/src/main/cpp/native-sample.cpp diff --git a/flutter/example/android/app/src/main/kotlin/io/sentry/samples/flutter/MainActivity.kt b/packages/flutter/example/android/app/src/main/kotlin/io/sentry/samples/flutter/MainActivity.kt similarity index 100% rename from flutter/example/android/app/src/main/kotlin/io/sentry/samples/flutter/MainActivity.kt rename to packages/flutter/example/android/app/src/main/kotlin/io/sentry/samples/flutter/MainActivity.kt diff --git a/flutter/example/android/app/src/main/res/drawable/launch_background.xml b/packages/flutter/example/android/app/src/main/res/drawable/launch_background.xml similarity index 100% rename from flutter/example/android/app/src/main/res/drawable/launch_background.xml rename to packages/flutter/example/android/app/src/main/res/drawable/launch_background.xml diff --git a/flutter/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/flutter/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from flutter/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to packages/flutter/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/flutter/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/flutter/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from flutter/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to packages/flutter/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/flutter/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/flutter/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from flutter/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to packages/flutter/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/flutter/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/flutter/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from flutter/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to packages/flutter/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/flutter/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/flutter/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from flutter/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to packages/flutter/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/flutter/example/android/app/src/main/res/values/styles.xml b/packages/flutter/example/android/app/src/main/res/values/styles.xml similarity index 100% rename from flutter/example/android/app/src/main/res/values/styles.xml rename to packages/flutter/example/android/app/src/main/res/values/styles.xml diff --git a/flutter/example/android/app/src/main/res/xml/network.xml b/packages/flutter/example/android/app/src/main/res/xml/network.xml similarity index 100% rename from flutter/example/android/app/src/main/res/xml/network.xml rename to packages/flutter/example/android/app/src/main/res/xml/network.xml diff --git a/flutter/example/android/build.gradle b/packages/flutter/example/android/build.gradle similarity index 100% rename from flutter/example/android/build.gradle rename to packages/flutter/example/android/build.gradle diff --git a/flutter/example/android/gradle.properties b/packages/flutter/example/android/gradle.properties similarity index 100% rename from flutter/example/android/gradle.properties rename to packages/flutter/example/android/gradle.properties diff --git a/flutter/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/flutter/example/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from flutter/example/android/gradle/wrapper/gradle-wrapper.properties rename to packages/flutter/example/android/gradle/wrapper/gradle-wrapper.properties diff --git a/flutter/example/android/sentry.properties b/packages/flutter/example/android/sentry.properties similarity index 100% rename from flutter/example/android/sentry.properties rename to packages/flutter/example/android/sentry.properties diff --git a/flutter/example/android/settings.gradle b/packages/flutter/example/android/settings.gradle similarity index 100% rename from flutter/example/android/settings.gradle rename to packages/flutter/example/android/settings.gradle diff --git a/flutter/example/assets/lorem-ipsum.txt b/packages/flutter/example/assets/lorem-ipsum.txt similarity index 100% rename from flutter/example/assets/lorem-ipsum.txt rename to packages/flutter/example/assets/lorem-ipsum.txt diff --git a/flutter/example/assets/sentry-wordmark.png b/packages/flutter/example/assets/sentry-wordmark.png similarity index 100% rename from flutter/example/assets/sentry-wordmark.png rename to packages/flutter/example/assets/sentry-wordmark.png diff --git a/flutter/example/devtools_options.yaml b/packages/flutter/example/devtools_options.yaml similarity index 100% rename from flutter/example/devtools_options.yaml rename to packages/flutter/example/devtools_options.yaml diff --git a/flutter/example/img/ios_simulator.png b/packages/flutter/example/img/ios_simulator.png similarity index 100% rename from flutter/example/img/ios_simulator.png rename to packages/flutter/example/img/ios_simulator.png diff --git a/flutter/example/img/sentry_dashboard.png b/packages/flutter/example/img/sentry_dashboard.png similarity index 100% rename from flutter/example/img/sentry_dashboard.png rename to packages/flutter/example/img/sentry_dashboard.png diff --git a/flutter/example/integration_test/all.dart b/packages/flutter/example/integration_test/all.dart similarity index 100% rename from flutter/example/integration_test/all.dart rename to packages/flutter/example/integration_test/all.dart diff --git a/flutter/example/integration_test/integration_test.dart b/packages/flutter/example/integration_test/integration_test.dart similarity index 100% rename from flutter/example/integration_test/integration_test.dart rename to packages/flutter/example/integration_test/integration_test.dart diff --git a/flutter/example/integration_test/profiling_test.dart b/packages/flutter/example/integration_test/profiling_test.dart similarity index 100% rename from flutter/example/integration_test/profiling_test.dart rename to packages/flutter/example/integration_test/profiling_test.dart diff --git a/flutter/example/integration_test/replay_test.dart b/packages/flutter/example/integration_test/replay_test.dart similarity index 100% rename from flutter/example/integration_test/replay_test.dart rename to packages/flutter/example/integration_test/replay_test.dart diff --git a/flutter/example/integration_test/sentry_widgets_flutter_binding_test.dart b/packages/flutter/example/integration_test/sentry_widgets_flutter_binding_test.dart similarity index 100% rename from flutter/example/integration_test/sentry_widgets_flutter_binding_test.dart rename to packages/flutter/example/integration_test/sentry_widgets_flutter_binding_test.dart diff --git a/flutter/example/integration_test/test_driver/driver.dart b/packages/flutter/example/integration_test/test_driver/driver.dart similarity index 100% rename from flutter/example/integration_test/test_driver/driver.dart rename to packages/flutter/example/integration_test/test_driver/driver.dart diff --git a/flutter/example/integration_test/utils.dart b/packages/flutter/example/integration_test/utils.dart similarity index 100% rename from flutter/example/integration_test/utils.dart rename to packages/flutter/example/integration_test/utils.dart diff --git a/flutter/example/integration_test/web_sdk_test.dart b/packages/flutter/example/integration_test/web_sdk_test.dart similarity index 100% rename from flutter/example/integration_test/web_sdk_test.dart rename to packages/flutter/example/integration_test/web_sdk_test.dart diff --git a/flutter/example/ios/.gitignore b/packages/flutter/example/ios/.gitignore similarity index 100% rename from flutter/example/ios/.gitignore rename to packages/flutter/example/ios/.gitignore diff --git a/flutter/example/ios/Flutter/AppFrameworkInfo.plist b/packages/flutter/example/ios/Flutter/AppFrameworkInfo.plist similarity index 100% rename from flutter/example/ios/Flutter/AppFrameworkInfo.plist rename to packages/flutter/example/ios/Flutter/AppFrameworkInfo.plist diff --git a/flutter/example/ios/Flutter/Debug.xcconfig b/packages/flutter/example/ios/Flutter/Debug.xcconfig similarity index 100% rename from flutter/example/ios/Flutter/Debug.xcconfig rename to packages/flutter/example/ios/Flutter/Debug.xcconfig diff --git a/flutter/example/ios/Flutter/Release.xcconfig b/packages/flutter/example/ios/Flutter/Release.xcconfig similarity index 100% rename from flutter/example/ios/Flutter/Release.xcconfig rename to packages/flutter/example/ios/Flutter/Release.xcconfig diff --git a/flutter/example/ios/Gemfile b/packages/flutter/example/ios/Gemfile similarity index 100% rename from flutter/example/ios/Gemfile rename to packages/flutter/example/ios/Gemfile diff --git a/flutter/example/ios/Gemfile.lock b/packages/flutter/example/ios/Gemfile.lock similarity index 100% rename from flutter/example/ios/Gemfile.lock rename to packages/flutter/example/ios/Gemfile.lock diff --git a/flutter/example/ios/Podfile b/packages/flutter/example/ios/Podfile similarity index 100% rename from flutter/example/ios/Podfile rename to packages/flutter/example/ios/Podfile diff --git a/flutter/example/ios/Runner.xcodeproj/project.pbxproj b/packages/flutter/example/ios/Runner.xcodeproj/project.pbxproj similarity index 100% rename from flutter/example/ios/Runner.xcodeproj/project.pbxproj rename to packages/flutter/example/ios/Runner.xcodeproj/project.pbxproj diff --git a/flutter/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/flutter/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from flutter/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to packages/flutter/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to packages/flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to packages/flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to packages/flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/flutter/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/packages/flutter/example/ios/Runner.xcworkspace/contents.xcworkspacedata similarity index 100% rename from flutter/example/ios/Runner.xcworkspace/contents.xcworkspacedata rename to packages/flutter/example/ios/Runner.xcworkspace/contents.xcworkspacedata diff --git a/flutter/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/flutter/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from flutter/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to packages/flutter/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/flutter/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/flutter/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from flutter/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to packages/flutter/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/flutter/example/ios/Runner/AppDelegate.swift b/packages/flutter/example/ios/Runner/AppDelegate.swift similarity index 100% rename from flutter/example/ios/Runner/AppDelegate.swift rename to packages/flutter/example/ios/Runner/AppDelegate.swift diff --git a/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png similarity index 100% rename from flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png rename to packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png diff --git a/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png similarity index 100% rename from flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png rename to packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png diff --git a/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png similarity index 100% rename from flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png rename to packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png diff --git a/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png similarity index 100% rename from flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png rename to packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png diff --git a/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png similarity index 100% rename from flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png rename to packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png diff --git a/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png similarity index 100% rename from flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png rename to packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png diff --git a/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png similarity index 100% rename from flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png rename to packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png diff --git a/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png similarity index 100% rename from flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png rename to packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png diff --git a/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png similarity index 100% rename from flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png rename to packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png diff --git a/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png similarity index 100% rename from flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png rename to packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png diff --git a/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png similarity index 100% rename from flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png rename to packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png diff --git a/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png similarity index 100% rename from flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png rename to packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png diff --git a/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png similarity index 100% rename from flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png rename to packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png diff --git a/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png similarity index 100% rename from flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png rename to packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png diff --git a/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png similarity index 100% rename from flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png rename to packages/flutter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png diff --git a/flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/packages/flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json similarity index 100% rename from flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json rename to packages/flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json diff --git a/flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/packages/flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png similarity index 100% rename from flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png rename to packages/flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png diff --git a/flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/packages/flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png similarity index 100% rename from flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png rename to packages/flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png diff --git a/flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/packages/flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png similarity index 100% rename from flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png rename to packages/flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png diff --git a/flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/packages/flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md similarity index 100% rename from flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md rename to packages/flutter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md diff --git a/flutter/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/packages/flutter/example/ios/Runner/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from flutter/example/ios/Runner/Base.lproj/LaunchScreen.storyboard rename to packages/flutter/example/ios/Runner/Base.lproj/LaunchScreen.storyboard diff --git a/flutter/example/ios/Runner/Base.lproj/Main.storyboard b/packages/flutter/example/ios/Runner/Base.lproj/Main.storyboard similarity index 100% rename from flutter/example/ios/Runner/Base.lproj/Main.storyboard rename to packages/flutter/example/ios/Runner/Base.lproj/Main.storyboard diff --git a/flutter/example/ios/Runner/Buggy.h b/packages/flutter/example/ios/Runner/Buggy.h similarity index 100% rename from flutter/example/ios/Runner/Buggy.h rename to packages/flutter/example/ios/Runner/Buggy.h diff --git a/flutter/example/ios/Runner/Buggy.m b/packages/flutter/example/ios/Runner/Buggy.m similarity index 100% rename from flutter/example/ios/Runner/Buggy.m rename to packages/flutter/example/ios/Runner/Buggy.m diff --git a/flutter/example/ios/Runner/Info.plist b/packages/flutter/example/ios/Runner/Info.plist similarity index 100% rename from flutter/example/ios/Runner/Info.plist rename to packages/flutter/example/ios/Runner/Info.plist diff --git a/flutter/example/ios/Runner/Runner-Bridging-Header.h b/packages/flutter/example/ios/Runner/Runner-Bridging-Header.h similarity index 100% rename from flutter/example/ios/Runner/Runner-Bridging-Header.h rename to packages/flutter/example/ios/Runner/Runner-Bridging-Header.h diff --git a/flutter/example/ios/Runner/Runner.entitlements b/packages/flutter/example/ios/Runner/Runner.entitlements similarity index 100% rename from flutter/example/ios/Runner/Runner.entitlements rename to packages/flutter/example/ios/Runner/Runner.entitlements diff --git a/flutter/example/ios/Runner/RunnerRelease.entitlements b/packages/flutter/example/ios/Runner/RunnerRelease.entitlements similarity index 100% rename from flutter/example/ios/Runner/RunnerRelease.entitlements rename to packages/flutter/example/ios/Runner/RunnerRelease.entitlements diff --git a/flutter/example/ios/RunnerTests/SentryFlutterTests.swift b/packages/flutter/example/ios/RunnerTests/SentryFlutterTests.swift similarity index 100% rename from flutter/example/ios/RunnerTests/SentryFlutterTests.swift rename to packages/flutter/example/ios/RunnerTests/SentryFlutterTests.swift diff --git a/flutter/example/ios/fastlane/Appfile b/packages/flutter/example/ios/fastlane/Appfile similarity index 100% rename from flutter/example/ios/fastlane/Appfile rename to packages/flutter/example/ios/fastlane/Appfile diff --git a/flutter/example/ios/fastlane/Fastfile b/packages/flutter/example/ios/fastlane/Fastfile similarity index 100% rename from flutter/example/ios/fastlane/Fastfile rename to packages/flutter/example/ios/fastlane/Fastfile diff --git a/flutter/example/ios/fastlane/Matchfile b/packages/flutter/example/ios/fastlane/Matchfile similarity index 100% rename from flutter/example/ios/fastlane/Matchfile rename to packages/flutter/example/ios/fastlane/Matchfile diff --git a/flutter/example/lib/auto_close_screen.dart b/packages/flutter/example/lib/auto_close_screen.dart similarity index 100% rename from flutter/example/lib/auto_close_screen.dart rename to packages/flutter/example/lib/auto_close_screen.dart diff --git a/flutter/example/lib/drift/connection/connection.dart b/packages/flutter/example/lib/drift/connection/connection.dart similarity index 100% rename from flutter/example/lib/drift/connection/connection.dart rename to packages/flutter/example/lib/drift/connection/connection.dart diff --git a/flutter/example/lib/drift/connection/native.dart b/packages/flutter/example/lib/drift/connection/native.dart similarity index 100% rename from flutter/example/lib/drift/connection/native.dart rename to packages/flutter/example/lib/drift/connection/native.dart diff --git a/flutter/example/lib/drift/connection/unsupported.dart b/packages/flutter/example/lib/drift/connection/unsupported.dart similarity index 100% rename from flutter/example/lib/drift/connection/unsupported.dart rename to packages/flutter/example/lib/drift/connection/unsupported.dart diff --git a/flutter/example/lib/drift/database.dart b/packages/flutter/example/lib/drift/database.dart similarity index 100% rename from flutter/example/lib/drift/database.dart rename to packages/flutter/example/lib/drift/database.dart diff --git a/flutter/example/lib/drift/database.g.dart b/packages/flutter/example/lib/drift/database.g.dart similarity index 100% rename from flutter/example/lib/drift/database.g.dart rename to packages/flutter/example/lib/drift/database.g.dart diff --git a/flutter/example/lib/isar/user.dart b/packages/flutter/example/lib/isar/user.dart similarity index 100% rename from flutter/example/lib/isar/user.dart rename to packages/flutter/example/lib/isar/user.dart diff --git a/flutter/example/lib/isar/user.g.dart b/packages/flutter/example/lib/isar/user.g.dart similarity index 100% rename from flutter/example/lib/isar/user.g.dart rename to packages/flutter/example/lib/isar/user.g.dart diff --git a/flutter/example/lib/main.dart b/packages/flutter/example/lib/main.dart similarity index 100% rename from flutter/example/lib/main.dart rename to packages/flutter/example/lib/main.dart diff --git a/flutter/example/linux/.gitignore b/packages/flutter/example/linux/.gitignore similarity index 100% rename from flutter/example/linux/.gitignore rename to packages/flutter/example/linux/.gitignore diff --git a/flutter/example/linux/CMakeLists.txt b/packages/flutter/example/linux/CMakeLists.txt similarity index 100% rename from flutter/example/linux/CMakeLists.txt rename to packages/flutter/example/linux/CMakeLists.txt diff --git a/flutter/example/linux/flutter/CMakeLists.txt b/packages/flutter/example/linux/flutter/CMakeLists.txt similarity index 100% rename from flutter/example/linux/flutter/CMakeLists.txt rename to packages/flutter/example/linux/flutter/CMakeLists.txt diff --git a/flutter/example/linux/main.cc b/packages/flutter/example/linux/main.cc similarity index 100% rename from flutter/example/linux/main.cc rename to packages/flutter/example/linux/main.cc diff --git a/flutter/example/linux/my_application.cc b/packages/flutter/example/linux/my_application.cc similarity index 100% rename from flutter/example/linux/my_application.cc rename to packages/flutter/example/linux/my_application.cc diff --git a/flutter/example/linux/my_application.h b/packages/flutter/example/linux/my_application.h similarity index 100% rename from flutter/example/linux/my_application.h rename to packages/flutter/example/linux/my_application.h diff --git a/flutter/example/macos/.gitignore b/packages/flutter/example/macos/.gitignore similarity index 100% rename from flutter/example/macos/.gitignore rename to packages/flutter/example/macos/.gitignore diff --git a/flutter/example/macos/Flutter/Flutter-Debug.xcconfig b/packages/flutter/example/macos/Flutter/Flutter-Debug.xcconfig similarity index 100% rename from flutter/example/macos/Flutter/Flutter-Debug.xcconfig rename to packages/flutter/example/macos/Flutter/Flutter-Debug.xcconfig diff --git a/flutter/example/macos/Flutter/Flutter-Release.xcconfig b/packages/flutter/example/macos/Flutter/Flutter-Release.xcconfig similarity index 100% rename from flutter/example/macos/Flutter/Flutter-Release.xcconfig rename to packages/flutter/example/macos/Flutter/Flutter-Release.xcconfig diff --git a/flutter/example/macos/Podfile b/packages/flutter/example/macos/Podfile similarity index 100% rename from flutter/example/macos/Podfile rename to packages/flutter/example/macos/Podfile diff --git a/flutter/example/macos/Runner.xcodeproj/project.pbxproj b/packages/flutter/example/macos/Runner.xcodeproj/project.pbxproj similarity index 100% rename from flutter/example/macos/Runner.xcodeproj/project.pbxproj rename to packages/flutter/example/macos/Runner.xcodeproj/project.pbxproj diff --git a/flutter/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/flutter/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from flutter/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to packages/flutter/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/flutter/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/flutter/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from flutter/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to packages/flutter/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/flutter/example/macos/Runner.xcworkspace/contents.xcworkspacedata b/packages/flutter/example/macos/Runner.xcworkspace/contents.xcworkspacedata similarity index 100% rename from flutter/example/macos/Runner.xcworkspace/contents.xcworkspacedata rename to packages/flutter/example/macos/Runner.xcworkspace/contents.xcworkspacedata diff --git a/flutter/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/flutter/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from flutter/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to packages/flutter/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/flutter/example/macos/Runner/AppDelegate.swift b/packages/flutter/example/macos/Runner/AppDelegate.swift similarity index 100% rename from flutter/example/macos/Runner/AppDelegate.swift rename to packages/flutter/example/macos/Runner/AppDelegate.swift diff --git a/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to packages/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/packages/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png similarity index 100% rename from flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png rename to packages/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png diff --git a/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/packages/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png similarity index 100% rename from flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png rename to packages/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png diff --git a/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/packages/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png similarity index 100% rename from flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png rename to packages/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png diff --git a/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/packages/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png similarity index 100% rename from flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png rename to packages/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png diff --git a/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/packages/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png similarity index 100% rename from flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png rename to packages/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png diff --git a/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/packages/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png similarity index 100% rename from flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png rename to packages/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png diff --git a/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/packages/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png similarity index 100% rename from flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png rename to packages/flutter/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png diff --git a/flutter/example/macos/Runner/Base.lproj/MainMenu.xib b/packages/flutter/example/macos/Runner/Base.lproj/MainMenu.xib similarity index 100% rename from flutter/example/macos/Runner/Base.lproj/MainMenu.xib rename to packages/flutter/example/macos/Runner/Base.lproj/MainMenu.xib diff --git a/flutter/example/macos/Runner/Buggy.h b/packages/flutter/example/macos/Runner/Buggy.h similarity index 100% rename from flutter/example/macos/Runner/Buggy.h rename to packages/flutter/example/macos/Runner/Buggy.h diff --git a/flutter/example/macos/Runner/Buggy.m b/packages/flutter/example/macos/Runner/Buggy.m similarity index 100% rename from flutter/example/macos/Runner/Buggy.m rename to packages/flutter/example/macos/Runner/Buggy.m diff --git a/flutter/example/macos/Runner/Configs/AppInfo.xcconfig b/packages/flutter/example/macos/Runner/Configs/AppInfo.xcconfig similarity index 100% rename from flutter/example/macos/Runner/Configs/AppInfo.xcconfig rename to packages/flutter/example/macos/Runner/Configs/AppInfo.xcconfig diff --git a/flutter/example/macos/Runner/Configs/Debug.xcconfig b/packages/flutter/example/macos/Runner/Configs/Debug.xcconfig similarity index 100% rename from flutter/example/macos/Runner/Configs/Debug.xcconfig rename to packages/flutter/example/macos/Runner/Configs/Debug.xcconfig diff --git a/flutter/example/macos/Runner/Configs/Release.xcconfig b/packages/flutter/example/macos/Runner/Configs/Release.xcconfig similarity index 100% rename from flutter/example/macos/Runner/Configs/Release.xcconfig rename to packages/flutter/example/macos/Runner/Configs/Release.xcconfig diff --git a/flutter/example/macos/Runner/Configs/Warnings.xcconfig b/packages/flutter/example/macos/Runner/Configs/Warnings.xcconfig similarity index 100% rename from flutter/example/macos/Runner/Configs/Warnings.xcconfig rename to packages/flutter/example/macos/Runner/Configs/Warnings.xcconfig diff --git a/flutter/example/macos/Runner/DebugProfile.entitlements b/packages/flutter/example/macos/Runner/DebugProfile.entitlements similarity index 100% rename from flutter/example/macos/Runner/DebugProfile.entitlements rename to packages/flutter/example/macos/Runner/DebugProfile.entitlements diff --git a/flutter/example/macos/Runner/Info.plist b/packages/flutter/example/macos/Runner/Info.plist similarity index 100% rename from flutter/example/macos/Runner/Info.plist rename to packages/flutter/example/macos/Runner/Info.plist diff --git a/flutter/example/macos/Runner/MainFlutterWindow.swift b/packages/flutter/example/macos/Runner/MainFlutterWindow.swift similarity index 100% rename from flutter/example/macos/Runner/MainFlutterWindow.swift rename to packages/flutter/example/macos/Runner/MainFlutterWindow.swift diff --git a/flutter/example/macos/Runner/Release.entitlements b/packages/flutter/example/macos/Runner/Release.entitlements similarity index 100% rename from flutter/example/macos/Runner/Release.entitlements rename to packages/flutter/example/macos/Runner/Release.entitlements diff --git a/flutter/example/macos/Runner/Runner-Bridging-Header.h b/packages/flutter/example/macos/Runner/Runner-Bridging-Header.h similarity index 100% rename from flutter/example/macos/Runner/Runner-Bridging-Header.h rename to packages/flutter/example/macos/Runner/Runner-Bridging-Header.h diff --git a/flutter/example/pubspec.yaml b/packages/flutter/example/pubspec.yaml similarity index 85% rename from flutter/example/pubspec.yaml rename to packages/flutter/example/pubspec.yaml index 7440bd0697..6609b8ffe1 100644 --- a/flutter/example/pubspec.yaml +++ b/packages/flutter/example/pubspec.yaml @@ -36,6 +36,17 @@ dependencies: hive: any # This gets constrained by `sentry_hive` sqlite3_flutter_libs: ^0.5.0 +dependency_overrides: + isar: + version: ^3.1.0 + hosted: https://pub.isar-community.dev/ + isar_flutter_libs: + version: ^3.1.0 + hosted: https://pub.isar-community.dev/ + isar_generator: + version: ^3.1.0 + hosted: https://pub.isar-community.dev/ + dev_dependencies: flutter_lints: ^2.0.0 sentry_dart_plugin: ^3.0.0 diff --git a/flutter/example/pubspec_overrides.yaml b/packages/flutter/example/pubspec_overrides.yaml similarity index 74% rename from flutter/example/pubspec_overrides.yaml rename to packages/flutter/example/pubspec_overrides.yaml index 8f3cdc6729..e76cae4bc5 100644 --- a/flutter/example/pubspec_overrides.yaml +++ b/packages/flutter/example/pubspec_overrides.yaml @@ -1,29 +1,29 @@ +# melos_managed_dependency_overrides: sentry,sentry_dio,sentry_drift,sentry_file,sentry_flutter,sentry_hive,sentry_isar,sentry_logging,sentry_sqflite,isar,isar_flutter_libs,isar_generator dependency_overrides: sentry: path: ../../dart - sentry_flutter: - path: ../ sentry_dio: path: ../../dio - sentry_logging: - path: ../../logging - sentry_sqflite: - path: ../../sqflite + sentry_drift: + path: ../../drift sentry_file: path: ../../file + sentry_flutter: + path: .. sentry_hive: path: ../../hive - sentry_drift: - path: ../../drift sentry_isar: path: ../../isar - # isar community fork is more stable + sentry_logging: + path: ../../logging + sentry_sqflite: + path: ../../sqflite isar: - version: ^3.1.0 hosted: https://pub.isar-community.dev/ - isar_flutter_libs: version: ^3.1.0 + isar_flutter_libs: hosted: https://pub.isar-community.dev/ - isar_generator: version: ^3.1.0 + isar_generator: hosted: https://pub.isar-community.dev/ + version: ^3.1.0 diff --git a/flutter/example/run.sh b/packages/flutter/example/run.sh similarity index 100% rename from flutter/example/run.sh rename to packages/flutter/example/run.sh diff --git a/flutter/example/web/favicon.png b/packages/flutter/example/web/favicon.png similarity index 100% rename from flutter/example/web/favicon.png rename to packages/flutter/example/web/favicon.png diff --git a/flutter/example/web/icons/Icon-192.png b/packages/flutter/example/web/icons/Icon-192.png similarity index 100% rename from flutter/example/web/icons/Icon-192.png rename to packages/flutter/example/web/icons/Icon-192.png diff --git a/flutter/example/web/icons/Icon-512.png b/packages/flutter/example/web/icons/Icon-512.png similarity index 100% rename from flutter/example/web/icons/Icon-512.png rename to packages/flutter/example/web/icons/Icon-512.png diff --git a/flutter/example/web/index.html b/packages/flutter/example/web/index.html similarity index 100% rename from flutter/example/web/index.html rename to packages/flutter/example/web/index.html diff --git a/flutter/example/web/manifest.json b/packages/flutter/example/web/manifest.json similarity index 100% rename from flutter/example/web/manifest.json rename to packages/flutter/example/web/manifest.json diff --git a/flutter/microbenchmarks/windows/.gitignore b/packages/flutter/example/windows/.gitignore similarity index 100% rename from flutter/microbenchmarks/windows/.gitignore rename to packages/flutter/example/windows/.gitignore diff --git a/flutter/example/windows/CMakeLists.txt b/packages/flutter/example/windows/CMakeLists.txt similarity index 97% rename from flutter/example/windows/CMakeLists.txt rename to packages/flutter/example/windows/CMakeLists.txt index 5a554e25d0..50a839d8b6 100644 --- a/flutter/example/windows/CMakeLists.txt +++ b/packages/flutter/example/windows/CMakeLists.txt @@ -1,108 +1,108 @@ -# Project-level configuration. -cmake_minimum_required(VERSION 3.14) -project(sentry_flutter_example LANGUAGES CXX) - -# The name of the executable created for the application. Change this to change -# the on-disk name of your application. -set(BINARY_NAME "sentry_flutter_example") - -# Explicitly opt in to modern CMake behaviors to avoid warnings with recent -# versions of CMake. -cmake_policy(VERSION 3.14...3.25) - -# Define build configuration option. -get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) -if(IS_MULTICONFIG) - set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" - CACHE STRING "" FORCE) -else() - if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) - set(CMAKE_BUILD_TYPE "Debug" CACHE - STRING "Flutter build mode" FORCE) - set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS - "Debug" "Profile" "Release") - endif() -endif() -# Define settings for the Profile build mode. -set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") -set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") -set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") -set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") - -# Use Unicode for all projects. -add_definitions(-DUNICODE -D_UNICODE) - -# Compilation settings that should be applied to most targets. -# -# Be cautious about adding new options here, as plugins use this function by -# default. In most cases, you should add new options to specific targets instead -# of modifying this function. -function(APPLY_STANDARD_SETTINGS TARGET) - target_compile_features(${TARGET} PUBLIC cxx_std_17) - target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") - target_compile_options(${TARGET} PRIVATE /EHsc) - target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") - target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") -endfunction() - -# Flutter library and tool build rules. -set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") -add_subdirectory(${FLUTTER_MANAGED_DIR}) - -# Application build; see runner/CMakeLists.txt. -add_subdirectory("runner") - - -# Generated plugin build rules, which manage building the plugins and adding -# them to the application. -include(flutter/generated_plugins.cmake) - - -# === Installation === -# Support files are copied into place next to the executable, so that it can -# run in place. This is done instead of making a separate bundle (as on Linux) -# so that building and running from within Visual Studio will work. -set(BUILD_BUNDLE_DIR "$") -# Make the "install" step default, as it's required to run. -set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) -if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) -endif() - -set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") -set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") - -install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" - COMPONENT Runtime) - -install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" - COMPONENT Runtime) - -install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) - -if(PLUGIN_BUNDLED_LIBRARIES) - install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" - DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) -endif() - -# Copy the native assets provided by the build.dart from all packages. -set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/") -install(DIRECTORY "${NATIVE_ASSETS_DIR}" - DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) - -# Fully re-copy the assets directory on each build to avoid having stale files -# from a previous install. -set(FLUTTER_ASSET_DIR_NAME "flutter_assets") -install(CODE " - file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") - " COMPONENT Runtime) -install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" - DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) - -# Install the AOT library on non-Debug builds only. -install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" - CONFIGURATIONS Profile;Release - COMPONENT Runtime) +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(sentry_flutter_example LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "sentry_flutter_example") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(VERSION 3.14...3.25) + +# Define build configuration option. +get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTICONFIG) + set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" + CACHE STRING "" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") + endif() +endif() +# Define settings for the Profile build mode. +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") +set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") + +# Use Unicode for all projects. +add_definitions(-DUNICODE -D_UNICODE) + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_17) + target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + CONFIGURATIONS Profile;Release + COMPONENT Runtime) diff --git a/flutter/example/windows/flutter/.gitignore b/packages/flutter/example/windows/flutter/.gitignore similarity index 100% rename from flutter/example/windows/flutter/.gitignore rename to packages/flutter/example/windows/flutter/.gitignore diff --git a/flutter/microbenchmarks/windows/flutter/CMakeLists.txt b/packages/flutter/example/windows/flutter/CMakeLists.txt similarity index 100% rename from flutter/microbenchmarks/windows/flutter/CMakeLists.txt rename to packages/flutter/example/windows/flutter/CMakeLists.txt diff --git a/flutter/microbenchmarks/windows/runner/CMakeLists.txt b/packages/flutter/example/windows/runner/CMakeLists.txt similarity index 100% rename from flutter/microbenchmarks/windows/runner/CMakeLists.txt rename to packages/flutter/example/windows/runner/CMakeLists.txt diff --git a/flutter/example/windows/runner/Runner.rc b/packages/flutter/example/windows/runner/Runner.rc similarity index 96% rename from flutter/example/windows/runner/Runner.rc rename to packages/flutter/example/windows/runner/Runner.rc index 90e64b7b0f..0a3a3d5b45 100644 --- a/flutter/example/windows/runner/Runner.rc +++ b/packages/flutter/example/windows/runner/Runner.rc @@ -1,121 +1,121 @@ -// Microsoft Visual C++ generated resource script. -// -#pragma code_page(65001) -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "winres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (United States) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""winres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_APP_ICON ICON "resources\\app_icon.ico" - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) -#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD -#else -#define VERSION_AS_NUMBER 1,0,0,0 -#endif - -#if defined(FLUTTER_VERSION) -#define VERSION_AS_STRING FLUTTER_VERSION -#else -#define VERSION_AS_STRING "1.0.0" -#endif - -VS_VERSION_INFO VERSIONINFO - FILEVERSION VERSION_AS_NUMBER - PRODUCTVERSION VERSION_AS_NUMBER - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG - FILEFLAGS VS_FF_DEBUG -#else - FILEFLAGS 0x0L -#endif - FILEOS VOS__WINDOWS32 - FILETYPE VFT_APP - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "com.example" "\0" - VALUE "FileDescription", "sentry_flutter_example" "\0" - VALUE "FileVersion", VERSION_AS_STRING "\0" - VALUE "InternalName", "sentry_flutter_example" "\0" - VALUE "LegalCopyright", "Copyright (C) 2024 com.example. All rights reserved." "\0" - VALUE "OriginalFilename", "sentry_flutter_example.exe" "\0" - VALUE "ProductName", "sentry_flutter_example" "\0" - VALUE "ProductVersion", VERSION_AS_STRING "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END - -#endif // English (United States) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD +#else +#define VERSION_AS_NUMBER 1,0,0,0 +#endif + +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "com.example" "\0" + VALUE "FileDescription", "sentry_flutter_example" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "sentry_flutter_example" "\0" + VALUE "LegalCopyright", "Copyright (C) 2024 com.example. All rights reserved." "\0" + VALUE "OriginalFilename", "sentry_flutter_example.exe" "\0" + VALUE "ProductName", "sentry_flutter_example" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/flutter/microbenchmarks/windows/runner/flutter_window.cpp b/packages/flutter/example/windows/runner/flutter_window.cpp similarity index 100% rename from flutter/microbenchmarks/windows/runner/flutter_window.cpp rename to packages/flutter/example/windows/runner/flutter_window.cpp diff --git a/flutter/microbenchmarks/windows/runner/flutter_window.h b/packages/flutter/example/windows/runner/flutter_window.h similarity index 100% rename from flutter/microbenchmarks/windows/runner/flutter_window.h rename to packages/flutter/example/windows/runner/flutter_window.h diff --git a/flutter/example/windows/runner/main.cpp b/packages/flutter/example/windows/runner/main.cpp similarity index 96% rename from flutter/example/windows/runner/main.cpp rename to packages/flutter/example/windows/runner/main.cpp index 08f9f5fc8f..0a6001c773 100644 --- a/flutter/example/windows/runner/main.cpp +++ b/packages/flutter/example/windows/runner/main.cpp @@ -1,43 +1,43 @@ -#include -#include -#include - -#include "flutter_window.h" -#include "utils.h" - -int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, - _In_ wchar_t *command_line, _In_ int show_command) { - // Attach to console when present (e.g., 'flutter run') or create a - // new console when running with a debugger. - // if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { - CreateAndAttachConsole(); - // } - - // Initialize COM, so that it is available for use in the library and/or - // plugins. - ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); - - flutter::DartProject project(L"data"); - - std::vector command_line_arguments = - GetCommandLineArguments(); - - project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); - - FlutterWindow window(project); - Win32Window::Point origin(10, 10); - Win32Window::Size size(1280, 720); - if (!window.Create(L"sentry_flutter_example", origin, size)) { - return EXIT_FAILURE; - } - window.SetQuitOnClose(true); - - ::MSG msg; - while (::GetMessage(&msg, nullptr, 0, 0)) { - ::TranslateMessage(&msg); - ::DispatchMessage(&msg); - } - - ::CoUninitialize(); - return EXIT_SUCCESS; -} +#include +#include +#include + +#include "flutter_window.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + // if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + // } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.Create(L"sentry_flutter_example", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + ::MSG msg; + while (::GetMessage(&msg, nullptr, 0, 0)) { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/flutter/microbenchmarks/windows/runner/resource.h b/packages/flutter/example/windows/runner/resource.h similarity index 100% rename from flutter/microbenchmarks/windows/runner/resource.h rename to packages/flutter/example/windows/runner/resource.h diff --git a/flutter/example/windows/runner/resources/app_icon.ico b/packages/flutter/example/windows/runner/resources/app_icon.ico similarity index 100% rename from flutter/example/windows/runner/resources/app_icon.ico rename to packages/flutter/example/windows/runner/resources/app_icon.ico diff --git a/flutter/example/windows/runner/runner.exe.manifest b/packages/flutter/example/windows/runner/runner.exe.manifest similarity index 97% rename from flutter/example/windows/runner/runner.exe.manifest rename to packages/flutter/example/windows/runner/runner.exe.manifest index 157e871fe8..a42ea7687c 100644 --- a/flutter/example/windows/runner/runner.exe.manifest +++ b/packages/flutter/example/windows/runner/runner.exe.manifest @@ -1,20 +1,20 @@ - - - - - PerMonitorV2 - - - - - - - - - - - - - - - + + + + + PerMonitorV2 + + + + + + + + + + + + + + + diff --git a/flutter/example/windows/runner/utils.cpp b/packages/flutter/example/windows/runner/utils.cpp similarity index 96% rename from flutter/example/windows/runner/utils.cpp rename to packages/flutter/example/windows/runner/utils.cpp index fc55c573b5..b2b08734db 100644 --- a/flutter/example/windows/runner/utils.cpp +++ b/packages/flutter/example/windows/runner/utils.cpp @@ -1,65 +1,65 @@ -#include "utils.h" - -#include -#include -#include -#include - -#include - -void CreateAndAttachConsole() { - if (::AllocConsole()) { - FILE *unused; - if (freopen_s(&unused, "CONOUT$", "w", stdout)) { - _dup2(_fileno(stdout), 1); - } - if (freopen_s(&unused, "CONOUT$", "w", stderr)) { - _dup2(_fileno(stdout), 2); - } - std::ios::sync_with_stdio(); - FlutterDesktopResyncOutputStreams(); - } -} - -std::vector GetCommandLineArguments() { - // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. - int argc; - wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); - if (argv == nullptr) { - return std::vector(); - } - - std::vector command_line_arguments; - - // Skip the first argument as it's the binary name. - for (int i = 1; i < argc; i++) { - command_line_arguments.push_back(Utf8FromUtf16(argv[i])); - } - - ::LocalFree(argv); - - return command_line_arguments; -} - -std::string Utf8FromUtf16(const wchar_t* utf16_string) { - if (utf16_string == nullptr) { - return std::string(); - } - int target_length = ::WideCharToMultiByte( - CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, - -1, nullptr, 0, nullptr, nullptr) - -1; // remove the trailing null character - int input_length = (int)wcslen(utf16_string); - std::string utf8_string; - if (target_length <= 0 || target_length > utf8_string.max_size()) { - return utf8_string; - } - utf8_string.resize(target_length); - int converted_length = ::WideCharToMultiByte( - CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, - input_length, utf8_string.data(), target_length, nullptr, nullptr); - if (converted_length == 0) { - return std::string(); - } - return utf8_string; -} +#include "utils.h" + +#include +#include +#include +#include + +#include + +void CreateAndAttachConsole() { + if (::AllocConsole()) { + FILE *unused; + if (freopen_s(&unused, "CONOUT$", "w", stdout)) { + _dup2(_fileno(stdout), 1); + } + if (freopen_s(&unused, "CONOUT$", "w", stderr)) { + _dup2(_fileno(stdout), 2); + } + std::ios::sync_with_stdio(); + FlutterDesktopResyncOutputStreams(); + } +} + +std::vector GetCommandLineArguments() { + // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. + int argc; + wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); + if (argv == nullptr) { + return std::vector(); + } + + std::vector command_line_arguments; + + // Skip the first argument as it's the binary name. + for (int i = 1; i < argc; i++) { + command_line_arguments.push_back(Utf8FromUtf16(argv[i])); + } + + ::LocalFree(argv); + + return command_line_arguments; +} + +std::string Utf8FromUtf16(const wchar_t* utf16_string) { + if (utf16_string == nullptr) { + return std::string(); + } + int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, nullptr, 0, nullptr, nullptr) + -1; // remove the trailing null character + int input_length = (int)wcslen(utf16_string); + std::string utf8_string; + if (target_length <= 0 || target_length > utf8_string.max_size()) { + return utf8_string; + } + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + input_length, utf8_string.data(), target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/flutter/microbenchmarks/windows/runner/utils.h b/packages/flutter/example/windows/runner/utils.h similarity index 100% rename from flutter/microbenchmarks/windows/runner/utils.h rename to packages/flutter/example/windows/runner/utils.h diff --git a/flutter/microbenchmarks/windows/runner/win32_window.cpp b/packages/flutter/example/windows/runner/win32_window.cpp similarity index 100% rename from flutter/microbenchmarks/windows/runner/win32_window.cpp rename to packages/flutter/example/windows/runner/win32_window.cpp diff --git a/flutter/microbenchmarks/windows/runner/win32_window.h b/packages/flutter/example/windows/runner/win32_window.h similarity index 100% rename from flutter/microbenchmarks/windows/runner/win32_window.h rename to packages/flutter/example/windows/runner/win32_window.h diff --git a/flutter/ffi-cocoa.yaml b/packages/flutter/ffi-cocoa.yaml similarity index 100% rename from flutter/ffi-cocoa.yaml rename to packages/flutter/ffi-cocoa.yaml diff --git a/flutter/ffi-jni.yaml b/packages/flutter/ffi-jni.yaml similarity index 100% rename from flutter/ffi-jni.yaml rename to packages/flutter/ffi-jni.yaml diff --git a/flutter/ffi-native.yaml b/packages/flutter/ffi-native.yaml similarity index 100% rename from flutter/ffi-native.yaml rename to packages/flutter/ffi-native.yaml diff --git a/flutter/ios/.gitignore b/packages/flutter/ios/.gitignore similarity index 100% rename from flutter/ios/.gitignore rename to packages/flutter/ios/.gitignore diff --git a/flutter/ios/sentry_flutter.podspec b/packages/flutter/ios/sentry_flutter.podspec similarity index 100% rename from flutter/ios/sentry_flutter.podspec rename to packages/flutter/ios/sentry_flutter.podspec diff --git a/flutter/ios/sentry_flutter/Package.swift b/packages/flutter/ios/sentry_flutter/Package.swift similarity index 100% rename from flutter/ios/sentry_flutter/Package.swift rename to packages/flutter/ios/sentry_flutter/Package.swift diff --git a/flutter/ios/sentry_flutter/Sources/sentry_flutter/SentryFlutter.swift b/packages/flutter/ios/sentry_flutter/Sources/sentry_flutter/SentryFlutter.swift similarity index 100% rename from flutter/ios/sentry_flutter/Sources/sentry_flutter/SentryFlutter.swift rename to packages/flutter/ios/sentry_flutter/Sources/sentry_flutter/SentryFlutter.swift diff --git a/flutter/ios/sentry_flutter/Sources/sentry_flutter/SentryFlutterPlugin.swift b/packages/flutter/ios/sentry_flutter/Sources/sentry_flutter/SentryFlutterPlugin.swift similarity index 100% rename from flutter/ios/sentry_flutter/Sources/sentry_flutter/SentryFlutterPlugin.swift rename to packages/flutter/ios/sentry_flutter/Sources/sentry_flutter/SentryFlutterPlugin.swift diff --git a/flutter/ios/sentry_flutter/Sources/sentry_flutter_objc/SentryFlutterReplayBreadcrumbConverter.m b/packages/flutter/ios/sentry_flutter/Sources/sentry_flutter_objc/SentryFlutterReplayBreadcrumbConverter.m similarity index 100% rename from flutter/ios/sentry_flutter/Sources/sentry_flutter_objc/SentryFlutterReplayBreadcrumbConverter.m rename to packages/flutter/ios/sentry_flutter/Sources/sentry_flutter_objc/SentryFlutterReplayBreadcrumbConverter.m diff --git a/flutter/ios/sentry_flutter/Sources/sentry_flutter_objc/SentryFlutterReplayScreenshotProvider.m b/packages/flutter/ios/sentry_flutter/Sources/sentry_flutter_objc/SentryFlutterReplayScreenshotProvider.m similarity index 100% rename from flutter/ios/sentry_flutter/Sources/sentry_flutter_objc/SentryFlutterReplayScreenshotProvider.m rename to packages/flutter/ios/sentry_flutter/Sources/sentry_flutter_objc/SentryFlutterReplayScreenshotProvider.m diff --git a/flutter/ios/sentry_flutter/Sources/sentry_flutter_objc/include/SentryFlutterReplayBreadcrumbConverter.h b/packages/flutter/ios/sentry_flutter/Sources/sentry_flutter_objc/include/SentryFlutterReplayBreadcrumbConverter.h similarity index 100% rename from flutter/ios/sentry_flutter/Sources/sentry_flutter_objc/include/SentryFlutterReplayBreadcrumbConverter.h rename to packages/flutter/ios/sentry_flutter/Sources/sentry_flutter_objc/include/SentryFlutterReplayBreadcrumbConverter.h diff --git a/flutter/ios/sentry_flutter/Sources/sentry_flutter_objc/include/SentryFlutterReplayScreenshotProvider.h b/packages/flutter/ios/sentry_flutter/Sources/sentry_flutter_objc/include/SentryFlutterReplayScreenshotProvider.h similarity index 100% rename from flutter/ios/sentry_flutter/Sources/sentry_flutter_objc/include/SentryFlutterReplayScreenshotProvider.h rename to packages/flutter/ios/sentry_flutter/Sources/sentry_flutter_objc/include/SentryFlutterReplayScreenshotProvider.h diff --git a/flutter/lib/sentry_flutter.dart b/packages/flutter/lib/sentry_flutter.dart similarity index 100% rename from flutter/lib/sentry_flutter.dart rename to packages/flutter/lib/sentry_flutter.dart diff --git a/flutter/lib/sentry_flutter_web.dart b/packages/flutter/lib/sentry_flutter_web.dart similarity index 100% rename from flutter/lib/sentry_flutter_web.dart rename to packages/flutter/lib/sentry_flutter_web.dart diff --git a/flutter/lib/src/binding_wrapper.dart b/packages/flutter/lib/src/binding_wrapper.dart similarity index 100% rename from flutter/lib/src/binding_wrapper.dart rename to packages/flutter/lib/src/binding_wrapper.dart diff --git a/flutter/lib/src/event_processor/android_platform_exception_event_processor.dart b/packages/flutter/lib/src/event_processor/android_platform_exception_event_processor.dart similarity index 100% rename from flutter/lib/src/event_processor/android_platform_exception_event_processor.dart rename to packages/flutter/lib/src/event_processor/android_platform_exception_event_processor.dart diff --git a/flutter/lib/src/event_processor/flutter_enricher_event_processor.dart b/packages/flutter/lib/src/event_processor/flutter_enricher_event_processor.dart similarity index 100% rename from flutter/lib/src/event_processor/flutter_enricher_event_processor.dart rename to packages/flutter/lib/src/event_processor/flutter_enricher_event_processor.dart diff --git a/flutter/lib/src/event_processor/flutter_exception_event_processor.dart b/packages/flutter/lib/src/event_processor/flutter_exception_event_processor.dart similarity index 100% rename from flutter/lib/src/event_processor/flutter_exception_event_processor.dart rename to packages/flutter/lib/src/event_processor/flutter_exception_event_processor.dart diff --git a/flutter/lib/src/event_processor/platform_exception_event_processor.dart b/packages/flutter/lib/src/event_processor/platform_exception_event_processor.dart similarity index 100% rename from flutter/lib/src/event_processor/platform_exception_event_processor.dart rename to packages/flutter/lib/src/event_processor/platform_exception_event_processor.dart diff --git a/flutter/lib/src/event_processor/replay_event_processor.dart b/packages/flutter/lib/src/event_processor/replay_event_processor.dart similarity index 100% rename from flutter/lib/src/event_processor/replay_event_processor.dart rename to packages/flutter/lib/src/event_processor/replay_event_processor.dart diff --git a/flutter/lib/src/event_processor/screenshot_event_processor.dart b/packages/flutter/lib/src/event_processor/screenshot_event_processor.dart similarity index 100% rename from flutter/lib/src/event_processor/screenshot_event_processor.dart rename to packages/flutter/lib/src/event_processor/screenshot_event_processor.dart diff --git a/flutter/lib/src/event_processor/url_filter/io_url_filter_event_processor.dart b/packages/flutter/lib/src/event_processor/url_filter/io_url_filter_event_processor.dart similarity index 100% rename from flutter/lib/src/event_processor/url_filter/io_url_filter_event_processor.dart rename to packages/flutter/lib/src/event_processor/url_filter/io_url_filter_event_processor.dart diff --git a/flutter/lib/src/event_processor/url_filter/url_filter_event_processor.dart b/packages/flutter/lib/src/event_processor/url_filter/url_filter_event_processor.dart similarity index 100% rename from flutter/lib/src/event_processor/url_filter/url_filter_event_processor.dart rename to packages/flutter/lib/src/event_processor/url_filter/url_filter_event_processor.dart diff --git a/flutter/lib/src/event_processor/url_filter/web_url_filter_event_processor.dart b/packages/flutter/lib/src/event_processor/url_filter/web_url_filter_event_processor.dart similarity index 100% rename from flutter/lib/src/event_processor/url_filter/web_url_filter_event_processor.dart rename to packages/flutter/lib/src/event_processor/url_filter/web_url_filter_event_processor.dart diff --git a/flutter/lib/src/event_processor/widget_event_processor.dart b/packages/flutter/lib/src/event_processor/widget_event_processor.dart similarity index 100% rename from flutter/lib/src/event_processor/widget_event_processor.dart rename to packages/flutter/lib/src/event_processor/widget_event_processor.dart diff --git a/flutter/lib/src/feedback/sentry_feedback_options.dart b/packages/flutter/lib/src/feedback/sentry_feedback_options.dart similarity index 100% rename from flutter/lib/src/feedback/sentry_feedback_options.dart rename to packages/flutter/lib/src/feedback/sentry_feedback_options.dart diff --git a/flutter/lib/src/feedback/sentry_feedback_widget.dart b/packages/flutter/lib/src/feedback/sentry_feedback_widget.dart similarity index 100% rename from flutter/lib/src/feedback/sentry_feedback_widget.dart rename to packages/flutter/lib/src/feedback/sentry_feedback_widget.dart diff --git a/flutter/lib/src/feedback/sentry_logo.dart b/packages/flutter/lib/src/feedback/sentry_logo.dart similarity index 100% rename from flutter/lib/src/feedback/sentry_logo.dart rename to packages/flutter/lib/src/feedback/sentry_logo.dart diff --git a/flutter/lib/src/file_system_transport.dart b/packages/flutter/lib/src/file_system_transport.dart similarity index 100% rename from flutter/lib/src/file_system_transport.dart rename to packages/flutter/lib/src/file_system_transport.dart diff --git a/flutter/lib/src/flutter_exception_type_identifier.dart b/packages/flutter/lib/src/flutter_exception_type_identifier.dart similarity index 100% rename from flutter/lib/src/flutter_exception_type_identifier.dart rename to packages/flutter/lib/src/flutter_exception_type_identifier.dart diff --git a/flutter/lib/src/flutter_sentry_attachment.dart b/packages/flutter/lib/src/flutter_sentry_attachment.dart similarity index 100% rename from flutter/lib/src/flutter_sentry_attachment.dart rename to packages/flutter/lib/src/flutter_sentry_attachment.dart diff --git a/flutter/lib/src/frame_callback_handler.dart b/packages/flutter/lib/src/frame_callback_handler.dart similarity index 100% rename from flutter/lib/src/frame_callback_handler.dart rename to packages/flutter/lib/src/frame_callback_handler.dart diff --git a/flutter/lib/src/frames_tracking/sentry_delayed_frames_tracker.dart b/packages/flutter/lib/src/frames_tracking/sentry_delayed_frames_tracker.dart similarity index 100% rename from flutter/lib/src/frames_tracking/sentry_delayed_frames_tracker.dart rename to packages/flutter/lib/src/frames_tracking/sentry_delayed_frames_tracker.dart diff --git a/flutter/lib/src/frames_tracking/span_frame_metrics_collector.dart b/packages/flutter/lib/src/frames_tracking/span_frame_metrics_collector.dart similarity index 100% rename from flutter/lib/src/frames_tracking/span_frame_metrics_collector.dart rename to packages/flutter/lib/src/frames_tracking/span_frame_metrics_collector.dart diff --git a/flutter/lib/src/integrations/connectivity/connectivity_integration.dart b/packages/flutter/lib/src/integrations/connectivity/connectivity_integration.dart similarity index 100% rename from flutter/lib/src/integrations/connectivity/connectivity_integration.dart rename to packages/flutter/lib/src/integrations/connectivity/connectivity_integration.dart diff --git a/flutter/lib/src/integrations/connectivity/connectivity_provider.dart b/packages/flutter/lib/src/integrations/connectivity/connectivity_provider.dart similarity index 100% rename from flutter/lib/src/integrations/connectivity/connectivity_provider.dart rename to packages/flutter/lib/src/integrations/connectivity/connectivity_provider.dart diff --git a/flutter/lib/src/integrations/connectivity/noop_connectivity_provider.dart b/packages/flutter/lib/src/integrations/connectivity/noop_connectivity_provider.dart similarity index 100% rename from flutter/lib/src/integrations/connectivity/noop_connectivity_provider.dart rename to packages/flutter/lib/src/integrations/connectivity/noop_connectivity_provider.dart diff --git a/flutter/lib/src/integrations/connectivity/web_connectivity_provider.dart b/packages/flutter/lib/src/integrations/connectivity/web_connectivity_provider.dart similarity index 100% rename from flutter/lib/src/integrations/connectivity/web_connectivity_provider.dart rename to packages/flutter/lib/src/integrations/connectivity/web_connectivity_provider.dart diff --git a/flutter/lib/src/integrations/debug_print_integration.dart b/packages/flutter/lib/src/integrations/debug_print_integration.dart similarity index 100% rename from flutter/lib/src/integrations/debug_print_integration.dart rename to packages/flutter/lib/src/integrations/debug_print_integration.dart diff --git a/flutter/lib/src/integrations/flutter_error_integration.dart b/packages/flutter/lib/src/integrations/flutter_error_integration.dart similarity index 100% rename from flutter/lib/src/integrations/flutter_error_integration.dart rename to packages/flutter/lib/src/integrations/flutter_error_integration.dart diff --git a/flutter/lib/src/integrations/flutter_framework_feature_flag_integration.dart b/packages/flutter/lib/src/integrations/flutter_framework_feature_flag_integration.dart similarity index 100% rename from flutter/lib/src/integrations/flutter_framework_feature_flag_integration.dart rename to packages/flutter/lib/src/integrations/flutter_framework_feature_flag_integration.dart diff --git a/flutter/lib/src/integrations/frames_tracking_integration.dart b/packages/flutter/lib/src/integrations/frames_tracking_integration.dart similarity index 100% rename from flutter/lib/src/integrations/frames_tracking_integration.dart rename to packages/flutter/lib/src/integrations/frames_tracking_integration.dart diff --git a/flutter/lib/src/integrations/generic_app_start_integration.dart b/packages/flutter/lib/src/integrations/generic_app_start_integration.dart similarity index 100% rename from flutter/lib/src/integrations/generic_app_start_integration.dart rename to packages/flutter/lib/src/integrations/generic_app_start_integration.dart diff --git a/flutter/lib/src/integrations/integrations.dart b/packages/flutter/lib/src/integrations/integrations.dart similarity index 100% rename from flutter/lib/src/integrations/integrations.dart rename to packages/flutter/lib/src/integrations/integrations.dart diff --git a/flutter/lib/src/integrations/load_contexts_integration.dart b/packages/flutter/lib/src/integrations/load_contexts_integration.dart similarity index 100% rename from flutter/lib/src/integrations/load_contexts_integration.dart rename to packages/flutter/lib/src/integrations/load_contexts_integration.dart diff --git a/flutter/lib/src/integrations/load_debug_images_integration.dart b/packages/flutter/lib/src/integrations/load_debug_images_integration.dart similarity index 100% rename from flutter/lib/src/integrations/load_debug_images_integration.dart rename to packages/flutter/lib/src/integrations/load_debug_images_integration.dart diff --git a/flutter/lib/src/integrations/load_release_integration.dart b/packages/flutter/lib/src/integrations/load_release_integration.dart similarity index 100% rename from flutter/lib/src/integrations/load_release_integration.dart rename to packages/flutter/lib/src/integrations/load_release_integration.dart diff --git a/flutter/lib/src/integrations/native_app_start_handler.dart b/packages/flutter/lib/src/integrations/native_app_start_handler.dart similarity index 100% rename from flutter/lib/src/integrations/native_app_start_handler.dart rename to packages/flutter/lib/src/integrations/native_app_start_handler.dart diff --git a/flutter/lib/src/integrations/native_app_start_integration.dart b/packages/flutter/lib/src/integrations/native_app_start_integration.dart similarity index 100% rename from flutter/lib/src/integrations/native_app_start_integration.dart rename to packages/flutter/lib/src/integrations/native_app_start_integration.dart diff --git a/flutter/lib/src/integrations/native_load_debug_images_integration.dart b/packages/flutter/lib/src/integrations/native_load_debug_images_integration.dart similarity index 100% rename from flutter/lib/src/integrations/native_load_debug_images_integration.dart rename to packages/flutter/lib/src/integrations/native_load_debug_images_integration.dart diff --git a/flutter/lib/src/integrations/native_sdk_integration.dart b/packages/flutter/lib/src/integrations/native_sdk_integration.dart similarity index 100% rename from flutter/lib/src/integrations/native_sdk_integration.dart rename to packages/flutter/lib/src/integrations/native_sdk_integration.dart diff --git a/flutter/lib/src/integrations/on_error_integration.dart b/packages/flutter/lib/src/integrations/on_error_integration.dart similarity index 100% rename from flutter/lib/src/integrations/on_error_integration.dart rename to packages/flutter/lib/src/integrations/on_error_integration.dart diff --git a/flutter/lib/src/integrations/screenshot_integration.dart b/packages/flutter/lib/src/integrations/screenshot_integration.dart similarity index 100% rename from flutter/lib/src/integrations/screenshot_integration.dart rename to packages/flutter/lib/src/integrations/screenshot_integration.dart diff --git a/flutter/lib/src/integrations/sdk_integration.dart b/packages/flutter/lib/src/integrations/sdk_integration.dart similarity index 100% rename from flutter/lib/src/integrations/sdk_integration.dart rename to packages/flutter/lib/src/integrations/sdk_integration.dart diff --git a/flutter/lib/src/integrations/thread_info_integration.dart b/packages/flutter/lib/src/integrations/thread_info_integration.dart similarity index 100% rename from flutter/lib/src/integrations/thread_info_integration.dart rename to packages/flutter/lib/src/integrations/thread_info_integration.dart diff --git a/flutter/lib/src/integrations/web_load_debug_images_integration.dart b/packages/flutter/lib/src/integrations/web_load_debug_images_integration.dart similarity index 100% rename from flutter/lib/src/integrations/web_load_debug_images_integration.dart rename to packages/flutter/lib/src/integrations/web_load_debug_images_integration.dart diff --git a/flutter/lib/src/integrations/web_sdk_integration.dart b/packages/flutter/lib/src/integrations/web_sdk_integration.dart similarity index 100% rename from flutter/lib/src/integrations/web_sdk_integration.dart rename to packages/flutter/lib/src/integrations/web_sdk_integration.dart diff --git a/flutter/lib/src/integrations/web_session_integration.dart b/packages/flutter/lib/src/integrations/web_session_integration.dart similarity index 100% rename from flutter/lib/src/integrations/web_session_integration.dart rename to packages/flutter/lib/src/integrations/web_session_integration.dart diff --git a/flutter/lib/src/integrations/widgets_binding_integration.dart b/packages/flutter/lib/src/integrations/widgets_binding_integration.dart similarity index 100% rename from flutter/lib/src/integrations/widgets_binding_integration.dart rename to packages/flutter/lib/src/integrations/widgets_binding_integration.dart diff --git a/flutter/lib/src/integrations/widgets_flutter_binding_integration.dart b/packages/flutter/lib/src/integrations/widgets_flutter_binding_integration.dart similarity index 100% rename from flutter/lib/src/integrations/widgets_flutter_binding_integration.dart rename to packages/flutter/lib/src/integrations/widgets_flutter_binding_integration.dart diff --git a/flutter/lib/src/isolate_helper.dart b/packages/flutter/lib/src/isolate_helper.dart similarity index 100% rename from flutter/lib/src/isolate_helper.dart rename to packages/flutter/lib/src/isolate_helper.dart diff --git a/flutter/lib/src/jvm/jvm_exception.dart b/packages/flutter/lib/src/jvm/jvm_exception.dart similarity index 100% rename from flutter/lib/src/jvm/jvm_exception.dart rename to packages/flutter/lib/src/jvm/jvm_exception.dart diff --git a/flutter/lib/src/jvm/jvm_frame.dart b/packages/flutter/lib/src/jvm/jvm_frame.dart similarity index 100% rename from flutter/lib/src/jvm/jvm_frame.dart rename to packages/flutter/lib/src/jvm/jvm_frame.dart diff --git a/flutter/lib/src/native/c/binding.dart b/packages/flutter/lib/src/native/c/binding.dart similarity index 100% rename from flutter/lib/src/native/c/binding.dart rename to packages/flutter/lib/src/native/c/binding.dart diff --git a/flutter/lib/src/native/c/sentry_native.dart b/packages/flutter/lib/src/native/c/sentry_native.dart similarity index 100% rename from flutter/lib/src/native/c/sentry_native.dart rename to packages/flutter/lib/src/native/c/sentry_native.dart diff --git a/flutter/lib/src/native/c/utils.dart b/packages/flutter/lib/src/native/c/utils.dart similarity index 100% rename from flutter/lib/src/native/c/utils.dart rename to packages/flutter/lib/src/native/c/utils.dart diff --git a/flutter/lib/src/native/cocoa/binding.dart b/packages/flutter/lib/src/native/cocoa/binding.dart similarity index 100% rename from flutter/lib/src/native/cocoa/binding.dart rename to packages/flutter/lib/src/native/cocoa/binding.dart diff --git a/flutter/lib/src/native/cocoa/cocoa_replay_recorder.dart b/packages/flutter/lib/src/native/cocoa/cocoa_replay_recorder.dart similarity index 100% rename from flutter/lib/src/native/cocoa/cocoa_replay_recorder.dart rename to packages/flutter/lib/src/native/cocoa/cocoa_replay_recorder.dart diff --git a/flutter/lib/src/native/cocoa/sentry_native_cocoa.dart b/packages/flutter/lib/src/native/cocoa/sentry_native_cocoa.dart similarity index 100% rename from flutter/lib/src/native/cocoa/sentry_native_cocoa.dart rename to packages/flutter/lib/src/native/cocoa/sentry_native_cocoa.dart diff --git a/flutter/lib/src/native/factory.dart b/packages/flutter/lib/src/native/factory.dart similarity index 100% rename from flutter/lib/src/native/factory.dart rename to packages/flutter/lib/src/native/factory.dart diff --git a/flutter/lib/src/native/factory_real.dart b/packages/flutter/lib/src/native/factory_real.dart similarity index 100% rename from flutter/lib/src/native/factory_real.dart rename to packages/flutter/lib/src/native/factory_real.dart diff --git a/flutter/lib/src/native/factory_web.dart b/packages/flutter/lib/src/native/factory_web.dart similarity index 100% rename from flutter/lib/src/native/factory_web.dart rename to packages/flutter/lib/src/native/factory_web.dart diff --git a/flutter/lib/src/native/java/android_replay_recorder.dart b/packages/flutter/lib/src/native/java/android_replay_recorder.dart similarity index 100% rename from flutter/lib/src/native/java/android_replay_recorder.dart rename to packages/flutter/lib/src/native/java/android_replay_recorder.dart diff --git a/flutter/lib/src/native/java/binding.dart b/packages/flutter/lib/src/native/java/binding.dart similarity index 100% rename from flutter/lib/src/native/java/binding.dart rename to packages/flutter/lib/src/native/java/binding.dart diff --git a/flutter/lib/src/native/java/sentry_native_java.dart b/packages/flutter/lib/src/native/java/sentry_native_java.dart similarity index 100% rename from flutter/lib/src/native/java/sentry_native_java.dart rename to packages/flutter/lib/src/native/java/sentry_native_java.dart diff --git a/flutter/lib/src/native/method_channel_helper.dart b/packages/flutter/lib/src/native/method_channel_helper.dart similarity index 100% rename from flutter/lib/src/native/method_channel_helper.dart rename to packages/flutter/lib/src/native/method_channel_helper.dart diff --git a/flutter/lib/src/native/native_app_start.dart b/packages/flutter/lib/src/native/native_app_start.dart similarity index 100% rename from flutter/lib/src/native/native_app_start.dart rename to packages/flutter/lib/src/native/native_app_start.dart diff --git a/flutter/lib/src/native/native_memory.dart b/packages/flutter/lib/src/native/native_memory.dart similarity index 100% rename from flutter/lib/src/native/native_memory.dart rename to packages/flutter/lib/src/native/native_memory.dart diff --git a/flutter/lib/src/native/native_scope_observer.dart b/packages/flutter/lib/src/native/native_scope_observer.dart similarity index 100% rename from flutter/lib/src/native/native_scope_observer.dart rename to packages/flutter/lib/src/native/native_scope_observer.dart diff --git a/flutter/lib/src/native/sentry_native_binding.dart b/packages/flutter/lib/src/native/sentry_native_binding.dart similarity index 100% rename from flutter/lib/src/native/sentry_native_binding.dart rename to packages/flutter/lib/src/native/sentry_native_binding.dart diff --git a/flutter/lib/src/native/sentry_native_channel.dart b/packages/flutter/lib/src/native/sentry_native_channel.dart similarity index 100% rename from flutter/lib/src/native/sentry_native_channel.dart rename to packages/flutter/lib/src/native/sentry_native_channel.dart diff --git a/flutter/lib/src/native/sentry_native_invoker.dart b/packages/flutter/lib/src/native/sentry_native_invoker.dart similarity index 100% rename from flutter/lib/src/native/sentry_native_invoker.dart rename to packages/flutter/lib/src/native/sentry_native_invoker.dart diff --git a/flutter/lib/src/native/sentry_safe_method_channel.dart b/packages/flutter/lib/src/native/sentry_safe_method_channel.dart similarity index 100% rename from flutter/lib/src/native/sentry_safe_method_channel.dart rename to packages/flutter/lib/src/native/sentry_safe_method_channel.dart diff --git a/flutter/lib/src/navigation/sentry_display.dart b/packages/flutter/lib/src/navigation/sentry_display.dart similarity index 100% rename from flutter/lib/src/navigation/sentry_display.dart rename to packages/flutter/lib/src/navigation/sentry_display.dart diff --git a/flutter/lib/src/navigation/sentry_display_widget.dart b/packages/flutter/lib/src/navigation/sentry_display_widget.dart similarity index 100% rename from flutter/lib/src/navigation/sentry_display_widget.dart rename to packages/flutter/lib/src/navigation/sentry_display_widget.dart diff --git a/flutter/lib/src/navigation/sentry_navigator_observer.dart b/packages/flutter/lib/src/navigation/sentry_navigator_observer.dart similarity index 100% rename from flutter/lib/src/navigation/sentry_navigator_observer.dart rename to packages/flutter/lib/src/navigation/sentry_navigator_observer.dart diff --git a/flutter/lib/src/navigation/time_to_display_tracker.dart b/packages/flutter/lib/src/navigation/time_to_display_tracker.dart similarity index 100% rename from flutter/lib/src/navigation/time_to_display_tracker.dart rename to packages/flutter/lib/src/navigation/time_to_display_tracker.dart diff --git a/flutter/lib/src/navigation/time_to_full_display_tracker.dart b/packages/flutter/lib/src/navigation/time_to_full_display_tracker.dart similarity index 100% rename from flutter/lib/src/navigation/time_to_full_display_tracker.dart rename to packages/flutter/lib/src/navigation/time_to_full_display_tracker.dart diff --git a/flutter/lib/src/navigation/time_to_initial_display_tracker.dart b/packages/flutter/lib/src/navigation/time_to_initial_display_tracker.dart similarity index 100% rename from flutter/lib/src/navigation/time_to_initial_display_tracker.dart rename to packages/flutter/lib/src/navigation/time_to_initial_display_tracker.dart diff --git a/flutter/lib/src/profiling.dart b/packages/flutter/lib/src/profiling.dart similarity index 100% rename from flutter/lib/src/profiling.dart rename to packages/flutter/lib/src/profiling.dart diff --git a/flutter/lib/src/renderer/io_renderer.dart b/packages/flutter/lib/src/renderer/io_renderer.dart similarity index 100% rename from flutter/lib/src/renderer/io_renderer.dart rename to packages/flutter/lib/src/renderer/io_renderer.dart diff --git a/flutter/lib/src/renderer/renderer.dart b/packages/flutter/lib/src/renderer/renderer.dart similarity index 100% rename from flutter/lib/src/renderer/renderer.dart rename to packages/flutter/lib/src/renderer/renderer.dart diff --git a/flutter/lib/src/renderer/unknown_renderer.dart b/packages/flutter/lib/src/renderer/unknown_renderer.dart similarity index 100% rename from flutter/lib/src/renderer/unknown_renderer.dart rename to packages/flutter/lib/src/renderer/unknown_renderer.dart diff --git a/flutter/lib/src/renderer/web_renderer.dart b/packages/flutter/lib/src/renderer/web_renderer.dart similarity index 100% rename from flutter/lib/src/renderer/web_renderer.dart rename to packages/flutter/lib/src/renderer/web_renderer.dart diff --git a/flutter/lib/src/replay/integration.dart b/packages/flutter/lib/src/replay/integration.dart similarity index 100% rename from flutter/lib/src/replay/integration.dart rename to packages/flutter/lib/src/replay/integration.dart diff --git a/flutter/lib/src/replay/replay_config.dart b/packages/flutter/lib/src/replay/replay_config.dart similarity index 100% rename from flutter/lib/src/replay/replay_config.dart rename to packages/flutter/lib/src/replay/replay_config.dart diff --git a/flutter/lib/src/replay/replay_quality.dart b/packages/flutter/lib/src/replay/replay_quality.dart similarity index 100% rename from flutter/lib/src/replay/replay_quality.dart rename to packages/flutter/lib/src/replay/replay_quality.dart diff --git a/flutter/lib/src/replay/replay_recorder.dart b/packages/flutter/lib/src/replay/replay_recorder.dart similarity index 100% rename from flutter/lib/src/replay/replay_recorder.dart rename to packages/flutter/lib/src/replay/replay_recorder.dart diff --git a/flutter/lib/src/replay/scheduled_recorder.dart b/packages/flutter/lib/src/replay/scheduled_recorder.dart similarity index 100% rename from flutter/lib/src/replay/scheduled_recorder.dart rename to packages/flutter/lib/src/replay/scheduled_recorder.dart diff --git a/flutter/lib/src/replay/scheduled_recorder_config.dart b/packages/flutter/lib/src/replay/scheduled_recorder_config.dart similarity index 100% rename from flutter/lib/src/replay/scheduled_recorder_config.dart rename to packages/flutter/lib/src/replay/scheduled_recorder_config.dart diff --git a/flutter/lib/src/replay/scheduler.dart b/packages/flutter/lib/src/replay/scheduler.dart similarity index 100% rename from flutter/lib/src/replay/scheduler.dart rename to packages/flutter/lib/src/replay/scheduler.dart diff --git a/flutter/lib/src/screenshot/masking_config.dart b/packages/flutter/lib/src/screenshot/masking_config.dart similarity index 100% rename from flutter/lib/src/screenshot/masking_config.dart rename to packages/flutter/lib/src/screenshot/masking_config.dart diff --git a/flutter/lib/src/screenshot/recorder.dart b/packages/flutter/lib/src/screenshot/recorder.dart similarity index 100% rename from flutter/lib/src/screenshot/recorder.dart rename to packages/flutter/lib/src/screenshot/recorder.dart diff --git a/flutter/lib/src/screenshot/recorder_config.dart b/packages/flutter/lib/src/screenshot/recorder_config.dart similarity index 100% rename from flutter/lib/src/screenshot/recorder_config.dart rename to packages/flutter/lib/src/screenshot/recorder_config.dart diff --git a/flutter/lib/src/screenshot/screenshot.dart b/packages/flutter/lib/src/screenshot/screenshot.dart similarity index 100% rename from flutter/lib/src/screenshot/screenshot.dart rename to packages/flutter/lib/src/screenshot/screenshot.dart diff --git a/flutter/lib/src/screenshot/screenshot_support.dart b/packages/flutter/lib/src/screenshot/screenshot_support.dart similarity index 100% rename from flutter/lib/src/screenshot/screenshot_support.dart rename to packages/flutter/lib/src/screenshot/screenshot_support.dart diff --git a/flutter/lib/src/screenshot/sentry_mask_widget.dart b/packages/flutter/lib/src/screenshot/sentry_mask_widget.dart similarity index 100% rename from flutter/lib/src/screenshot/sentry_mask_widget.dart rename to packages/flutter/lib/src/screenshot/sentry_mask_widget.dart diff --git a/flutter/lib/src/screenshot/sentry_screenshot_quality.dart b/packages/flutter/lib/src/screenshot/sentry_screenshot_quality.dart similarity index 100% rename from flutter/lib/src/screenshot/sentry_screenshot_quality.dart rename to packages/flutter/lib/src/screenshot/sentry_screenshot_quality.dart diff --git a/flutter/lib/src/screenshot/sentry_screenshot_widget.dart b/packages/flutter/lib/src/screenshot/sentry_screenshot_widget.dart similarity index 100% rename from flutter/lib/src/screenshot/sentry_screenshot_widget.dart rename to packages/flutter/lib/src/screenshot/sentry_screenshot_widget.dart diff --git a/flutter/lib/src/screenshot/sentry_unmask_widget.dart b/packages/flutter/lib/src/screenshot/sentry_unmask_widget.dart similarity index 100% rename from flutter/lib/src/screenshot/sentry_unmask_widget.dart rename to packages/flutter/lib/src/screenshot/sentry_unmask_widget.dart diff --git a/flutter/lib/src/screenshot/widget_filter.dart b/packages/flutter/lib/src/screenshot/widget_filter.dart similarity index 100% rename from flutter/lib/src/screenshot/widget_filter.dart rename to packages/flutter/lib/src/screenshot/widget_filter.dart diff --git a/flutter/lib/src/sentry_asset_bundle.dart b/packages/flutter/lib/src/sentry_asset_bundle.dart similarity index 100% rename from flutter/lib/src/sentry_asset_bundle.dart rename to packages/flutter/lib/src/sentry_asset_bundle.dart diff --git a/flutter/lib/src/sentry_flutter.dart b/packages/flutter/lib/src/sentry_flutter.dart similarity index 100% rename from flutter/lib/src/sentry_flutter.dart rename to packages/flutter/lib/src/sentry_flutter.dart diff --git a/flutter/lib/src/sentry_flutter_options.dart b/packages/flutter/lib/src/sentry_flutter_options.dart similarity index 100% rename from flutter/lib/src/sentry_flutter_options.dart rename to packages/flutter/lib/src/sentry_flutter_options.dart diff --git a/flutter/lib/src/sentry_privacy_options.dart b/packages/flutter/lib/src/sentry_privacy_options.dart similarity index 100% rename from flutter/lib/src/sentry_privacy_options.dart rename to packages/flutter/lib/src/sentry_privacy_options.dart diff --git a/flutter/lib/src/sentry_replay_options.dart b/packages/flutter/lib/src/sentry_replay_options.dart similarity index 100% rename from flutter/lib/src/sentry_replay_options.dart rename to packages/flutter/lib/src/sentry_replay_options.dart diff --git a/flutter/lib/src/sentry_widget.dart b/packages/flutter/lib/src/sentry_widget.dart similarity index 100% rename from flutter/lib/src/sentry_widget.dart rename to packages/flutter/lib/src/sentry_widget.dart diff --git a/flutter/lib/src/user_interaction/sentry_user_interaction_widget.dart b/packages/flutter/lib/src/user_interaction/sentry_user_interaction_widget.dart similarity index 100% rename from flutter/lib/src/user_interaction/sentry_user_interaction_widget.dart rename to packages/flutter/lib/src/user_interaction/sentry_user_interaction_widget.dart diff --git a/flutter/lib/src/user_interaction/user_interaction_info.dart b/packages/flutter/lib/src/user_interaction/user_interaction_info.dart similarity index 100% rename from flutter/lib/src/user_interaction/user_interaction_info.dart rename to packages/flutter/lib/src/user_interaction/user_interaction_info.dart diff --git a/flutter/lib/src/utils/debouncer.dart b/packages/flutter/lib/src/utils/debouncer.dart similarity index 100% rename from flutter/lib/src/utils/debouncer.dart rename to packages/flutter/lib/src/utils/debouncer.dart diff --git a/flutter/lib/src/utils/platform_dispatcher_wrapper.dart b/packages/flutter/lib/src/utils/platform_dispatcher_wrapper.dart similarity index 100% rename from flutter/lib/src/utils/platform_dispatcher_wrapper.dart rename to packages/flutter/lib/src/utils/platform_dispatcher_wrapper.dart diff --git a/flutter/lib/src/utils/timer_debouncer.dart b/packages/flutter/lib/src/utils/timer_debouncer.dart similarity index 100% rename from flutter/lib/src/utils/timer_debouncer.dart rename to packages/flutter/lib/src/utils/timer_debouncer.dart diff --git a/flutter/lib/src/version.dart b/packages/flutter/lib/src/version.dart similarity index 100% rename from flutter/lib/src/version.dart rename to packages/flutter/lib/src/version.dart diff --git a/flutter/lib/src/view_hierarchy/sentry_tree_walker.dart b/packages/flutter/lib/src/view_hierarchy/sentry_tree_walker.dart similarity index 100% rename from flutter/lib/src/view_hierarchy/sentry_tree_walker.dart rename to packages/flutter/lib/src/view_hierarchy/sentry_tree_walker.dart diff --git a/flutter/lib/src/view_hierarchy/view_hierarchy_event_processor.dart b/packages/flutter/lib/src/view_hierarchy/view_hierarchy_event_processor.dart similarity index 100% rename from flutter/lib/src/view_hierarchy/view_hierarchy_event_processor.dart rename to packages/flutter/lib/src/view_hierarchy/view_hierarchy_event_processor.dart diff --git a/flutter/lib/src/view_hierarchy/view_hierarchy_integration.dart b/packages/flutter/lib/src/view_hierarchy/view_hierarchy_integration.dart similarity index 100% rename from flutter/lib/src/view_hierarchy/view_hierarchy_integration.dart rename to packages/flutter/lib/src/view_hierarchy/view_hierarchy_integration.dart diff --git a/flutter/lib/src/web/javascript_transport.dart b/packages/flutter/lib/src/web/javascript_transport.dart similarity index 100% rename from flutter/lib/src/web/javascript_transport.dart rename to packages/flutter/lib/src/web/javascript_transport.dart diff --git a/flutter/lib/src/web/noop_sentry_js_binding.dart b/packages/flutter/lib/src/web/noop_sentry_js_binding.dart similarity index 100% rename from flutter/lib/src/web/noop_sentry_js_binding.dart rename to packages/flutter/lib/src/web/noop_sentry_js_binding.dart diff --git a/flutter/lib/src/web/script_loader/noop_script_dom_api.dart b/packages/flutter/lib/src/web/script_loader/noop_script_dom_api.dart similarity index 100% rename from flutter/lib/src/web/script_loader/noop_script_dom_api.dart rename to packages/flutter/lib/src/web/script_loader/noop_script_dom_api.dart diff --git a/flutter/lib/src/web/script_loader/script_dom_api.dart b/packages/flutter/lib/src/web/script_loader/script_dom_api.dart similarity index 100% rename from flutter/lib/src/web/script_loader/script_dom_api.dart rename to packages/flutter/lib/src/web/script_loader/script_dom_api.dart diff --git a/flutter/lib/src/web/script_loader/sentry_script_loader.dart b/packages/flutter/lib/src/web/script_loader/sentry_script_loader.dart similarity index 100% rename from flutter/lib/src/web/script_loader/sentry_script_loader.dart rename to packages/flutter/lib/src/web/script_loader/sentry_script_loader.dart diff --git a/flutter/lib/src/web/script_loader/web_script_dom_api.dart b/packages/flutter/lib/src/web/script_loader/web_script_dom_api.dart similarity index 100% rename from flutter/lib/src/web/script_loader/web_script_dom_api.dart rename to packages/flutter/lib/src/web/script_loader/web_script_dom_api.dart diff --git a/flutter/lib/src/web/sentry_js_binding.dart b/packages/flutter/lib/src/web/sentry_js_binding.dart similarity index 100% rename from flutter/lib/src/web/sentry_js_binding.dart rename to packages/flutter/lib/src/web/sentry_js_binding.dart diff --git a/flutter/lib/src/web/sentry_js_bundle.dart b/packages/flutter/lib/src/web/sentry_js_bundle.dart similarity index 100% rename from flutter/lib/src/web/sentry_js_bundle.dart rename to packages/flutter/lib/src/web/sentry_js_bundle.dart diff --git a/flutter/lib/src/web/sentry_js_sdk_version.dart b/packages/flutter/lib/src/web/sentry_js_sdk_version.dart similarity index 100% rename from flutter/lib/src/web/sentry_js_sdk_version.dart rename to packages/flutter/lib/src/web/sentry_js_sdk_version.dart diff --git a/flutter/lib/src/web/sentry_web.dart b/packages/flutter/lib/src/web/sentry_web.dart similarity index 100% rename from flutter/lib/src/web/sentry_web.dart rename to packages/flutter/lib/src/web/sentry_web.dart diff --git a/flutter/lib/src/web/web_sentry_js_binding.dart b/packages/flutter/lib/src/web/web_sentry_js_binding.dart similarity index 100% rename from flutter/lib/src/web/web_sentry_js_binding.dart rename to packages/flutter/lib/src/web/web_sentry_js_binding.dart diff --git a/flutter/lib/src/web/web_session_handler.dart b/packages/flutter/lib/src/web/web_session_handler.dart similarity index 100% rename from flutter/lib/src/web/web_session_handler.dart rename to packages/flutter/lib/src/web/web_session_handler.dart diff --git a/flutter/lib/src/widget_utils.dart b/packages/flutter/lib/src/widget_utils.dart similarity index 100% rename from flutter/lib/src/widget_utils.dart rename to packages/flutter/lib/src/widget_utils.dart diff --git a/flutter/lib/src/widgets_binding_observer.dart b/packages/flutter/lib/src/widgets_binding_observer.dart similarity index 100% rename from flutter/lib/src/widgets_binding_observer.dart rename to packages/flutter/lib/src/widgets_binding_observer.dart diff --git a/flutter/linux/CMakeLists.txt b/packages/flutter/linux/CMakeLists.txt similarity index 100% rename from flutter/linux/CMakeLists.txt rename to packages/flutter/linux/CMakeLists.txt diff --git a/flutter/linux/sentry_flutter/sentry_flutter_plugin.h b/packages/flutter/linux/sentry_flutter/sentry_flutter_plugin.h similarity index 100% rename from flutter/linux/sentry_flutter/sentry_flutter_plugin.h rename to packages/flutter/linux/sentry_flutter/sentry_flutter_plugin.h diff --git a/flutter/macos/sentry_flutter.podspec b/packages/flutter/macos/sentry_flutter.podspec similarity index 100% rename from flutter/macos/sentry_flutter.podspec rename to packages/flutter/macos/sentry_flutter.podspec diff --git a/flutter/macos/sentry_flutter/Package.swift b/packages/flutter/macos/sentry_flutter/Package.swift similarity index 100% rename from flutter/macos/sentry_flutter/Package.swift rename to packages/flutter/macos/sentry_flutter/Package.swift diff --git a/flutter/macos/sentry_flutter/Sources/sentry_flutter/SentryFlutter.swift b/packages/flutter/macos/sentry_flutter/Sources/sentry_flutter/SentryFlutter.swift similarity index 100% rename from flutter/macos/sentry_flutter/Sources/sentry_flutter/SentryFlutter.swift rename to packages/flutter/macos/sentry_flutter/Sources/sentry_flutter/SentryFlutter.swift diff --git a/flutter/macos/sentry_flutter/Sources/sentry_flutter/SentryFlutterPlugin.swift b/packages/flutter/macos/sentry_flutter/Sources/sentry_flutter/SentryFlutterPlugin.swift similarity index 100% rename from flutter/macos/sentry_flutter/Sources/sentry_flutter/SentryFlutterPlugin.swift rename to packages/flutter/macos/sentry_flutter/Sources/sentry_flutter/SentryFlutterPlugin.swift diff --git a/flutter/macos/sentry_flutter/Sources/sentry_flutter_objc/SentryFlutterReplayBreadcrumbConverter.m b/packages/flutter/macos/sentry_flutter/Sources/sentry_flutter_objc/SentryFlutterReplayBreadcrumbConverter.m similarity index 100% rename from flutter/macos/sentry_flutter/Sources/sentry_flutter_objc/SentryFlutterReplayBreadcrumbConverter.m rename to packages/flutter/macos/sentry_flutter/Sources/sentry_flutter_objc/SentryFlutterReplayBreadcrumbConverter.m diff --git a/flutter/macos/sentry_flutter/Sources/sentry_flutter_objc/SentryFlutterReplayScreenshotProvider.m b/packages/flutter/macos/sentry_flutter/Sources/sentry_flutter_objc/SentryFlutterReplayScreenshotProvider.m similarity index 100% rename from flutter/macos/sentry_flutter/Sources/sentry_flutter_objc/SentryFlutterReplayScreenshotProvider.m rename to packages/flutter/macos/sentry_flutter/Sources/sentry_flutter_objc/SentryFlutterReplayScreenshotProvider.m diff --git a/flutter/macos/sentry_flutter/Sources/sentry_flutter_objc/include/SentryFlutterReplayBreadcrumbConverter.h b/packages/flutter/macos/sentry_flutter/Sources/sentry_flutter_objc/include/SentryFlutterReplayBreadcrumbConverter.h similarity index 100% rename from flutter/macos/sentry_flutter/Sources/sentry_flutter_objc/include/SentryFlutterReplayBreadcrumbConverter.h rename to packages/flutter/macos/sentry_flutter/Sources/sentry_flutter_objc/include/SentryFlutterReplayBreadcrumbConverter.h diff --git a/flutter/macos/sentry_flutter/Sources/sentry_flutter_objc/include/SentryFlutterReplayScreenshotProvider.h b/packages/flutter/macos/sentry_flutter/Sources/sentry_flutter_objc/include/SentryFlutterReplayScreenshotProvider.h similarity index 100% rename from flutter/macos/sentry_flutter/Sources/sentry_flutter_objc/include/SentryFlutterReplayScreenshotProvider.h rename to packages/flutter/macos/sentry_flutter/Sources/sentry_flutter_objc/include/SentryFlutterReplayScreenshotProvider.h diff --git a/flutter/microbenchmarks/.gitignore b/packages/flutter/microbenchmarks/.gitignore similarity index 100% rename from flutter/microbenchmarks/.gitignore rename to packages/flutter/microbenchmarks/.gitignore diff --git a/flutter/microbenchmarks/.metadata b/packages/flutter/microbenchmarks/.metadata similarity index 100% rename from flutter/microbenchmarks/.metadata rename to packages/flutter/microbenchmarks/.metadata diff --git a/flutter/microbenchmarks/README.md b/packages/flutter/microbenchmarks/README.md similarity index 100% rename from flutter/microbenchmarks/README.md rename to packages/flutter/microbenchmarks/README.md diff --git a/flutter/microbenchmarks/analysis_options.yaml b/packages/flutter/microbenchmarks/analysis_options.yaml similarity index 100% rename from flutter/microbenchmarks/analysis_options.yaml rename to packages/flutter/microbenchmarks/analysis_options.yaml diff --git a/flutter/microbenchmarks/android/.gitignore b/packages/flutter/microbenchmarks/android/.gitignore similarity index 100% rename from flutter/microbenchmarks/android/.gitignore rename to packages/flutter/microbenchmarks/android/.gitignore diff --git a/flutter/microbenchmarks/android/app/build.gradle b/packages/flutter/microbenchmarks/android/app/build.gradle similarity index 100% rename from flutter/microbenchmarks/android/app/build.gradle rename to packages/flutter/microbenchmarks/android/app/build.gradle diff --git a/flutter/microbenchmarks/android/app/src/debug/AndroidManifest.xml b/packages/flutter/microbenchmarks/android/app/src/debug/AndroidManifest.xml similarity index 100% rename from flutter/microbenchmarks/android/app/src/debug/AndroidManifest.xml rename to packages/flutter/microbenchmarks/android/app/src/debug/AndroidManifest.xml diff --git a/flutter/microbenchmarks/android/app/src/main/AndroidManifest.xml b/packages/flutter/microbenchmarks/android/app/src/main/AndroidManifest.xml similarity index 100% rename from flutter/microbenchmarks/android/app/src/main/AndroidManifest.xml rename to packages/flutter/microbenchmarks/android/app/src/main/AndroidManifest.xml diff --git a/flutter/microbenchmarks/android/app/src/main/kotlin/com/example/microbenchmarks/MainActivity.kt b/packages/flutter/microbenchmarks/android/app/src/main/kotlin/com/example/microbenchmarks/MainActivity.kt similarity index 100% rename from flutter/microbenchmarks/android/app/src/main/kotlin/com/example/microbenchmarks/MainActivity.kt rename to packages/flutter/microbenchmarks/android/app/src/main/kotlin/com/example/microbenchmarks/MainActivity.kt diff --git a/flutter/microbenchmarks/android/app/src/main/res/drawable-v21/launch_background.xml b/packages/flutter/microbenchmarks/android/app/src/main/res/drawable-v21/launch_background.xml similarity index 100% rename from flutter/microbenchmarks/android/app/src/main/res/drawable-v21/launch_background.xml rename to packages/flutter/microbenchmarks/android/app/src/main/res/drawable-v21/launch_background.xml diff --git a/flutter/microbenchmarks/android/app/src/main/res/drawable/launch_background.xml b/packages/flutter/microbenchmarks/android/app/src/main/res/drawable/launch_background.xml similarity index 100% rename from flutter/microbenchmarks/android/app/src/main/res/drawable/launch_background.xml rename to packages/flutter/microbenchmarks/android/app/src/main/res/drawable/launch_background.xml diff --git a/flutter/microbenchmarks/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/flutter/microbenchmarks/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from flutter/microbenchmarks/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to packages/flutter/microbenchmarks/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/flutter/microbenchmarks/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/flutter/microbenchmarks/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from flutter/microbenchmarks/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to packages/flutter/microbenchmarks/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/flutter/microbenchmarks/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/flutter/microbenchmarks/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from flutter/microbenchmarks/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to packages/flutter/microbenchmarks/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/flutter/microbenchmarks/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/flutter/microbenchmarks/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from flutter/microbenchmarks/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to packages/flutter/microbenchmarks/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/flutter/microbenchmarks/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/flutter/microbenchmarks/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from flutter/microbenchmarks/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to packages/flutter/microbenchmarks/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/flutter/microbenchmarks/android/app/src/main/res/values-night/styles.xml b/packages/flutter/microbenchmarks/android/app/src/main/res/values-night/styles.xml similarity index 100% rename from flutter/microbenchmarks/android/app/src/main/res/values-night/styles.xml rename to packages/flutter/microbenchmarks/android/app/src/main/res/values-night/styles.xml diff --git a/flutter/microbenchmarks/android/app/src/main/res/values/styles.xml b/packages/flutter/microbenchmarks/android/app/src/main/res/values/styles.xml similarity index 100% rename from flutter/microbenchmarks/android/app/src/main/res/values/styles.xml rename to packages/flutter/microbenchmarks/android/app/src/main/res/values/styles.xml diff --git a/flutter/microbenchmarks/android/app/src/profile/AndroidManifest.xml b/packages/flutter/microbenchmarks/android/app/src/profile/AndroidManifest.xml similarity index 100% rename from flutter/microbenchmarks/android/app/src/profile/AndroidManifest.xml rename to packages/flutter/microbenchmarks/android/app/src/profile/AndroidManifest.xml diff --git a/flutter/microbenchmarks/android/build.gradle b/packages/flutter/microbenchmarks/android/build.gradle similarity index 100% rename from flutter/microbenchmarks/android/build.gradle rename to packages/flutter/microbenchmarks/android/build.gradle diff --git a/flutter/microbenchmarks/android/gradle.properties b/packages/flutter/microbenchmarks/android/gradle.properties similarity index 100% rename from flutter/microbenchmarks/android/gradle.properties rename to packages/flutter/microbenchmarks/android/gradle.properties diff --git a/flutter/microbenchmarks/android/gradle/wrapper/gradle-wrapper.properties b/packages/flutter/microbenchmarks/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from flutter/microbenchmarks/android/gradle/wrapper/gradle-wrapper.properties rename to packages/flutter/microbenchmarks/android/gradle/wrapper/gradle-wrapper.properties diff --git a/flutter/microbenchmarks/android/settings.gradle b/packages/flutter/microbenchmarks/android/settings.gradle similarity index 100% rename from flutter/microbenchmarks/android/settings.gradle rename to packages/flutter/microbenchmarks/android/settings.gradle diff --git a/flutter/microbenchmarks/ios/.gitignore b/packages/flutter/microbenchmarks/ios/.gitignore similarity index 100% rename from flutter/microbenchmarks/ios/.gitignore rename to packages/flutter/microbenchmarks/ios/.gitignore diff --git a/flutter/microbenchmarks/ios/Flutter/AppFrameworkInfo.plist b/packages/flutter/microbenchmarks/ios/Flutter/AppFrameworkInfo.plist similarity index 100% rename from flutter/microbenchmarks/ios/Flutter/AppFrameworkInfo.plist rename to packages/flutter/microbenchmarks/ios/Flutter/AppFrameworkInfo.plist diff --git a/flutter/microbenchmarks/ios/Flutter/Debug.xcconfig b/packages/flutter/microbenchmarks/ios/Flutter/Debug.xcconfig similarity index 100% rename from flutter/microbenchmarks/ios/Flutter/Debug.xcconfig rename to packages/flutter/microbenchmarks/ios/Flutter/Debug.xcconfig diff --git a/flutter/microbenchmarks/ios/Flutter/Release.xcconfig b/packages/flutter/microbenchmarks/ios/Flutter/Release.xcconfig similarity index 100% rename from flutter/microbenchmarks/ios/Flutter/Release.xcconfig rename to packages/flutter/microbenchmarks/ios/Flutter/Release.xcconfig diff --git a/flutter/microbenchmarks/ios/Podfile b/packages/flutter/microbenchmarks/ios/Podfile similarity index 100% rename from flutter/microbenchmarks/ios/Podfile rename to packages/flutter/microbenchmarks/ios/Podfile diff --git a/flutter/microbenchmarks/ios/Runner.xcodeproj/project.pbxproj b/packages/flutter/microbenchmarks/ios/Runner.xcodeproj/project.pbxproj similarity index 100% rename from flutter/microbenchmarks/ios/Runner.xcodeproj/project.pbxproj rename to packages/flutter/microbenchmarks/ios/Runner.xcodeproj/project.pbxproj diff --git a/flutter/ios/sentry_flutter/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/packages/flutter/microbenchmarks/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from flutter/ios/sentry_flutter/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata rename to packages/flutter/microbenchmarks/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/flutter/microbenchmarks/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/flutter/microbenchmarks/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from flutter/microbenchmarks/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to packages/flutter/microbenchmarks/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/flutter/microbenchmarks/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/flutter/microbenchmarks/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from flutter/microbenchmarks/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to packages/flutter/microbenchmarks/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/flutter/microbenchmarks/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/flutter/microbenchmarks/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from flutter/microbenchmarks/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to packages/flutter/microbenchmarks/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/flutter/microbenchmarks/ios/Runner.xcworkspace/contents.xcworkspacedata b/packages/flutter/microbenchmarks/ios/Runner.xcworkspace/contents.xcworkspacedata similarity index 100% rename from flutter/microbenchmarks/ios/Runner.xcworkspace/contents.xcworkspacedata rename to packages/flutter/microbenchmarks/ios/Runner.xcworkspace/contents.xcworkspacedata diff --git a/flutter/microbenchmarks/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/flutter/microbenchmarks/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from flutter/microbenchmarks/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to packages/flutter/microbenchmarks/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/flutter/microbenchmarks/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/flutter/microbenchmarks/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from flutter/microbenchmarks/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to packages/flutter/microbenchmarks/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/flutter/microbenchmarks/ios/Runner/AppDelegate.swift b/packages/flutter/microbenchmarks/ios/Runner/AppDelegate.swift similarity index 100% rename from flutter/microbenchmarks/ios/Runner/AppDelegate.swift rename to packages/flutter/microbenchmarks/ios/Runner/AppDelegate.swift diff --git a/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png rename to packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png diff --git a/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png rename to packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png diff --git a/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png rename to packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png diff --git a/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png rename to packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png diff --git a/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png rename to packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png diff --git a/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png rename to packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png diff --git a/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png rename to packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png diff --git a/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png rename to packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png diff --git a/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png rename to packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png diff --git a/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png rename to packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png diff --git a/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png rename to packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png diff --git a/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png rename to packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png diff --git a/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png rename to packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png diff --git a/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png rename to packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png diff --git a/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png rename to packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png diff --git a/flutter/microbenchmarks/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json rename to packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json diff --git a/flutter/microbenchmarks/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png rename to packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png diff --git a/flutter/microbenchmarks/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png rename to packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png diff --git a/flutter/microbenchmarks/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png rename to packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png diff --git a/flutter/microbenchmarks/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md rename to packages/flutter/microbenchmarks/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md diff --git a/flutter/microbenchmarks/ios/Runner/Base.lproj/LaunchScreen.storyboard b/packages/flutter/microbenchmarks/ios/Runner/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Base.lproj/LaunchScreen.storyboard rename to packages/flutter/microbenchmarks/ios/Runner/Base.lproj/LaunchScreen.storyboard diff --git a/flutter/microbenchmarks/ios/Runner/Base.lproj/Main.storyboard b/packages/flutter/microbenchmarks/ios/Runner/Base.lproj/Main.storyboard similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Base.lproj/Main.storyboard rename to packages/flutter/microbenchmarks/ios/Runner/Base.lproj/Main.storyboard diff --git a/flutter/microbenchmarks/ios/Runner/Info.plist b/packages/flutter/microbenchmarks/ios/Runner/Info.plist similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Info.plist rename to packages/flutter/microbenchmarks/ios/Runner/Info.plist diff --git a/flutter/microbenchmarks/ios/Runner/Runner-Bridging-Header.h b/packages/flutter/microbenchmarks/ios/Runner/Runner-Bridging-Header.h similarity index 100% rename from flutter/microbenchmarks/ios/Runner/Runner-Bridging-Header.h rename to packages/flutter/microbenchmarks/ios/Runner/Runner-Bridging-Header.h diff --git a/flutter/microbenchmarks/ios/RunnerTests/RunnerTests.swift b/packages/flutter/microbenchmarks/ios/RunnerTests/RunnerTests.swift similarity index 100% rename from flutter/microbenchmarks/ios/RunnerTests/RunnerTests.swift rename to packages/flutter/microbenchmarks/ios/RunnerTests/RunnerTests.swift diff --git a/flutter/microbenchmarks/lib/main.dart b/packages/flutter/microbenchmarks/lib/main.dart similarity index 100% rename from flutter/microbenchmarks/lib/main.dart rename to packages/flutter/microbenchmarks/lib/main.dart diff --git a/flutter/microbenchmarks/lib/src/image_bench.dart b/packages/flutter/microbenchmarks/lib/src/image_bench.dart similarity index 100% rename from flutter/microbenchmarks/lib/src/image_bench.dart rename to packages/flutter/microbenchmarks/lib/src/image_bench.dart diff --git a/flutter/microbenchmarks/lib/src/jni_bench.dart b/packages/flutter/microbenchmarks/lib/src/jni_bench.dart similarity index 100% rename from flutter/microbenchmarks/lib/src/jni_bench.dart rename to packages/flutter/microbenchmarks/lib/src/jni_bench.dart diff --git a/flutter/microbenchmarks/lib/src/memory_bench.dart b/packages/flutter/microbenchmarks/lib/src/memory_bench.dart similarity index 100% rename from flutter/microbenchmarks/lib/src/memory_bench.dart rename to packages/flutter/microbenchmarks/lib/src/memory_bench.dart diff --git a/flutter/microbenchmarks/linux/.gitignore b/packages/flutter/microbenchmarks/linux/.gitignore similarity index 100% rename from flutter/microbenchmarks/linux/.gitignore rename to packages/flutter/microbenchmarks/linux/.gitignore diff --git a/flutter/microbenchmarks/linux/CMakeLists.txt b/packages/flutter/microbenchmarks/linux/CMakeLists.txt similarity index 100% rename from flutter/microbenchmarks/linux/CMakeLists.txt rename to packages/flutter/microbenchmarks/linux/CMakeLists.txt diff --git a/flutter/microbenchmarks/linux/flutter/CMakeLists.txt b/packages/flutter/microbenchmarks/linux/flutter/CMakeLists.txt similarity index 100% rename from flutter/microbenchmarks/linux/flutter/CMakeLists.txt rename to packages/flutter/microbenchmarks/linux/flutter/CMakeLists.txt diff --git a/flutter/microbenchmarks/linux/flutter/generated_plugin_registrant.cc b/packages/flutter/microbenchmarks/linux/flutter/generated_plugin_registrant.cc similarity index 100% rename from flutter/microbenchmarks/linux/flutter/generated_plugin_registrant.cc rename to packages/flutter/microbenchmarks/linux/flutter/generated_plugin_registrant.cc diff --git a/flutter/microbenchmarks/linux/flutter/generated_plugin_registrant.h b/packages/flutter/microbenchmarks/linux/flutter/generated_plugin_registrant.h similarity index 100% rename from flutter/microbenchmarks/linux/flutter/generated_plugin_registrant.h rename to packages/flutter/microbenchmarks/linux/flutter/generated_plugin_registrant.h diff --git a/flutter/microbenchmarks/linux/flutter/generated_plugins.cmake b/packages/flutter/microbenchmarks/linux/flutter/generated_plugins.cmake similarity index 100% rename from flutter/microbenchmarks/linux/flutter/generated_plugins.cmake rename to packages/flutter/microbenchmarks/linux/flutter/generated_plugins.cmake diff --git a/flutter/microbenchmarks/linux/runner/CMakeLists.txt b/packages/flutter/microbenchmarks/linux/runner/CMakeLists.txt similarity index 100% rename from flutter/microbenchmarks/linux/runner/CMakeLists.txt rename to packages/flutter/microbenchmarks/linux/runner/CMakeLists.txt diff --git a/flutter/microbenchmarks/linux/runner/main.cc b/packages/flutter/microbenchmarks/linux/runner/main.cc similarity index 100% rename from flutter/microbenchmarks/linux/runner/main.cc rename to packages/flutter/microbenchmarks/linux/runner/main.cc diff --git a/flutter/microbenchmarks/linux/runner/my_application.cc b/packages/flutter/microbenchmarks/linux/runner/my_application.cc similarity index 100% rename from flutter/microbenchmarks/linux/runner/my_application.cc rename to packages/flutter/microbenchmarks/linux/runner/my_application.cc diff --git a/flutter/microbenchmarks/linux/runner/my_application.h b/packages/flutter/microbenchmarks/linux/runner/my_application.h similarity index 100% rename from flutter/microbenchmarks/linux/runner/my_application.h rename to packages/flutter/microbenchmarks/linux/runner/my_application.h diff --git a/flutter/microbenchmarks/macos/.gitignore b/packages/flutter/microbenchmarks/macos/.gitignore similarity index 100% rename from flutter/microbenchmarks/macos/.gitignore rename to packages/flutter/microbenchmarks/macos/.gitignore diff --git a/flutter/microbenchmarks/macos/Flutter/Flutter-Debug.xcconfig b/packages/flutter/microbenchmarks/macos/Flutter/Flutter-Debug.xcconfig similarity index 100% rename from flutter/microbenchmarks/macos/Flutter/Flutter-Debug.xcconfig rename to packages/flutter/microbenchmarks/macos/Flutter/Flutter-Debug.xcconfig diff --git a/flutter/microbenchmarks/macos/Flutter/Flutter-Release.xcconfig b/packages/flutter/microbenchmarks/macos/Flutter/Flutter-Release.xcconfig similarity index 100% rename from flutter/microbenchmarks/macos/Flutter/Flutter-Release.xcconfig rename to packages/flutter/microbenchmarks/macos/Flutter/Flutter-Release.xcconfig diff --git a/flutter/microbenchmarks/macos/Podfile b/packages/flutter/microbenchmarks/macos/Podfile similarity index 100% rename from flutter/microbenchmarks/macos/Podfile rename to packages/flutter/microbenchmarks/macos/Podfile diff --git a/flutter/microbenchmarks/macos/Runner.xcodeproj/project.pbxproj b/packages/flutter/microbenchmarks/macos/Runner.xcodeproj/project.pbxproj similarity index 100% rename from flutter/microbenchmarks/macos/Runner.xcodeproj/project.pbxproj rename to packages/flutter/microbenchmarks/macos/Runner.xcodeproj/project.pbxproj diff --git a/flutter/microbenchmarks/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/flutter/microbenchmarks/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from flutter/microbenchmarks/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to packages/flutter/microbenchmarks/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/flutter/microbenchmarks/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/flutter/microbenchmarks/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from flutter/microbenchmarks/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to packages/flutter/microbenchmarks/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/flutter/microbenchmarks/macos/Runner.xcworkspace/contents.xcworkspacedata b/packages/flutter/microbenchmarks/macos/Runner.xcworkspace/contents.xcworkspacedata similarity index 100% rename from flutter/microbenchmarks/macos/Runner.xcworkspace/contents.xcworkspacedata rename to packages/flutter/microbenchmarks/macos/Runner.xcworkspace/contents.xcworkspacedata diff --git a/flutter/microbenchmarks/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/flutter/microbenchmarks/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from flutter/microbenchmarks/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to packages/flutter/microbenchmarks/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/flutter/microbenchmarks/macos/Runner/AppDelegate.swift b/packages/flutter/microbenchmarks/macos/Runner/AppDelegate.swift similarity index 100% rename from flutter/microbenchmarks/macos/Runner/AppDelegate.swift rename to packages/flutter/microbenchmarks/macos/Runner/AppDelegate.swift diff --git a/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to packages/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/packages/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png similarity index 100% rename from flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png rename to packages/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png diff --git a/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/packages/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png similarity index 100% rename from flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png rename to packages/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png diff --git a/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/packages/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png similarity index 100% rename from flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png rename to packages/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png diff --git a/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/packages/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png similarity index 100% rename from flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png rename to packages/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png diff --git a/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/packages/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png similarity index 100% rename from flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png rename to packages/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png diff --git a/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/packages/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png similarity index 100% rename from flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png rename to packages/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png diff --git a/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/packages/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png similarity index 100% rename from flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png rename to packages/flutter/microbenchmarks/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png diff --git a/flutter/microbenchmarks/macos/Runner/Base.lproj/MainMenu.xib b/packages/flutter/microbenchmarks/macos/Runner/Base.lproj/MainMenu.xib similarity index 100% rename from flutter/microbenchmarks/macos/Runner/Base.lproj/MainMenu.xib rename to packages/flutter/microbenchmarks/macos/Runner/Base.lproj/MainMenu.xib diff --git a/flutter/microbenchmarks/macos/Runner/Configs/AppInfo.xcconfig b/packages/flutter/microbenchmarks/macos/Runner/Configs/AppInfo.xcconfig similarity index 100% rename from flutter/microbenchmarks/macos/Runner/Configs/AppInfo.xcconfig rename to packages/flutter/microbenchmarks/macos/Runner/Configs/AppInfo.xcconfig diff --git a/flutter/microbenchmarks/macos/Runner/Configs/Debug.xcconfig b/packages/flutter/microbenchmarks/macos/Runner/Configs/Debug.xcconfig similarity index 100% rename from flutter/microbenchmarks/macos/Runner/Configs/Debug.xcconfig rename to packages/flutter/microbenchmarks/macos/Runner/Configs/Debug.xcconfig diff --git a/flutter/microbenchmarks/macos/Runner/Configs/Release.xcconfig b/packages/flutter/microbenchmarks/macos/Runner/Configs/Release.xcconfig similarity index 100% rename from flutter/microbenchmarks/macos/Runner/Configs/Release.xcconfig rename to packages/flutter/microbenchmarks/macos/Runner/Configs/Release.xcconfig diff --git a/flutter/microbenchmarks/macos/Runner/Configs/Warnings.xcconfig b/packages/flutter/microbenchmarks/macos/Runner/Configs/Warnings.xcconfig similarity index 100% rename from flutter/microbenchmarks/macos/Runner/Configs/Warnings.xcconfig rename to packages/flutter/microbenchmarks/macos/Runner/Configs/Warnings.xcconfig diff --git a/flutter/microbenchmarks/macos/Runner/DebugProfile.entitlements b/packages/flutter/microbenchmarks/macos/Runner/DebugProfile.entitlements similarity index 100% rename from flutter/microbenchmarks/macos/Runner/DebugProfile.entitlements rename to packages/flutter/microbenchmarks/macos/Runner/DebugProfile.entitlements diff --git a/flutter/microbenchmarks/macos/Runner/Info.plist b/packages/flutter/microbenchmarks/macos/Runner/Info.plist similarity index 100% rename from flutter/microbenchmarks/macos/Runner/Info.plist rename to packages/flutter/microbenchmarks/macos/Runner/Info.plist diff --git a/flutter/microbenchmarks/macos/Runner/MainFlutterWindow.swift b/packages/flutter/microbenchmarks/macos/Runner/MainFlutterWindow.swift similarity index 100% rename from flutter/microbenchmarks/macos/Runner/MainFlutterWindow.swift rename to packages/flutter/microbenchmarks/macos/Runner/MainFlutterWindow.swift diff --git a/flutter/microbenchmarks/macos/Runner/Release.entitlements b/packages/flutter/microbenchmarks/macos/Runner/Release.entitlements similarity index 100% rename from flutter/microbenchmarks/macos/Runner/Release.entitlements rename to packages/flutter/microbenchmarks/macos/Runner/Release.entitlements diff --git a/flutter/microbenchmarks/macos/RunnerTests/RunnerTests.swift b/packages/flutter/microbenchmarks/macos/RunnerTests/RunnerTests.swift similarity index 100% rename from flutter/microbenchmarks/macos/RunnerTests/RunnerTests.swift rename to packages/flutter/microbenchmarks/macos/RunnerTests/RunnerTests.swift diff --git a/flutter/microbenchmarks/pubspec.yaml b/packages/flutter/microbenchmarks/pubspec.yaml similarity index 100% rename from flutter/microbenchmarks/pubspec.yaml rename to packages/flutter/microbenchmarks/pubspec.yaml diff --git a/packages/flutter/microbenchmarks/pubspec_overrides.yaml b/packages/flutter/microbenchmarks/pubspec_overrides.yaml new file mode 100644 index 0000000000..20369303f2 --- /dev/null +++ b/packages/flutter/microbenchmarks/pubspec_overrides.yaml @@ -0,0 +1,6 @@ +# melos_managed_dependency_overrides: sentry,sentry_flutter +dependency_overrides: + sentry: + path: ../../dart + sentry_flutter: + path: .. diff --git a/flutter/microbenchmarks/web/favicon.png b/packages/flutter/microbenchmarks/web/favicon.png similarity index 100% rename from flutter/microbenchmarks/web/favicon.png rename to packages/flutter/microbenchmarks/web/favicon.png diff --git a/flutter/microbenchmarks/web/icons/Icon-192.png b/packages/flutter/microbenchmarks/web/icons/Icon-192.png similarity index 100% rename from flutter/microbenchmarks/web/icons/Icon-192.png rename to packages/flutter/microbenchmarks/web/icons/Icon-192.png diff --git a/flutter/microbenchmarks/web/icons/Icon-512.png b/packages/flutter/microbenchmarks/web/icons/Icon-512.png similarity index 100% rename from flutter/microbenchmarks/web/icons/Icon-512.png rename to packages/flutter/microbenchmarks/web/icons/Icon-512.png diff --git a/flutter/microbenchmarks/web/icons/Icon-maskable-192.png b/packages/flutter/microbenchmarks/web/icons/Icon-maskable-192.png similarity index 100% rename from flutter/microbenchmarks/web/icons/Icon-maskable-192.png rename to packages/flutter/microbenchmarks/web/icons/Icon-maskable-192.png diff --git a/flutter/microbenchmarks/web/icons/Icon-maskable-512.png b/packages/flutter/microbenchmarks/web/icons/Icon-maskable-512.png similarity index 100% rename from flutter/microbenchmarks/web/icons/Icon-maskable-512.png rename to packages/flutter/microbenchmarks/web/icons/Icon-maskable-512.png diff --git a/flutter/microbenchmarks/web/index.html b/packages/flutter/microbenchmarks/web/index.html similarity index 100% rename from flutter/microbenchmarks/web/index.html rename to packages/flutter/microbenchmarks/web/index.html diff --git a/flutter/microbenchmarks/web/manifest.json b/packages/flutter/microbenchmarks/web/manifest.json similarity index 100% rename from flutter/microbenchmarks/web/manifest.json rename to packages/flutter/microbenchmarks/web/manifest.json diff --git a/flutter/example/windows/.gitignore b/packages/flutter/microbenchmarks/windows/.gitignore similarity index 94% rename from flutter/example/windows/.gitignore rename to packages/flutter/microbenchmarks/windows/.gitignore index ec4098aa65..d492d0d98c 100644 --- a/flutter/example/windows/.gitignore +++ b/packages/flutter/microbenchmarks/windows/.gitignore @@ -1,17 +1,17 @@ -flutter/ephemeral/ - -# Visual Studio user-specific files. -*.suo -*.user -*.userosscache -*.sln.docstates - -# Visual Studio build-related files. -x64/ -x86/ - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/flutter/microbenchmarks/windows/CMakeLists.txt b/packages/flutter/microbenchmarks/windows/CMakeLists.txt similarity index 100% rename from flutter/microbenchmarks/windows/CMakeLists.txt rename to packages/flutter/microbenchmarks/windows/CMakeLists.txt diff --git a/flutter/example/windows/flutter/CMakeLists.txt b/packages/flutter/microbenchmarks/windows/flutter/CMakeLists.txt similarity index 97% rename from flutter/example/windows/flutter/CMakeLists.txt rename to packages/flutter/microbenchmarks/windows/flutter/CMakeLists.txt index efb62ebe7d..903f4899d6 100644 --- a/flutter/example/windows/flutter/CMakeLists.txt +++ b/packages/flutter/microbenchmarks/windows/flutter/CMakeLists.txt @@ -1,109 +1,109 @@ -# This file controls Flutter-level build steps. It should not be edited. -cmake_minimum_required(VERSION 3.14) - -set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") - -# Configuration provided via flutter tool. -include(${EPHEMERAL_DIR}/generated_config.cmake) - -# TODO: Move the rest of this into files in ephemeral. See -# https://github.com/flutter/flutter/issues/57146. -set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") - -# Set fallback configurations for older versions of the flutter tool. -if (NOT DEFINED FLUTTER_TARGET_PLATFORM) - set(FLUTTER_TARGET_PLATFORM "windows-x64") -endif() - -# === Flutter Library === -set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") - -# Published to parent scope for install step. -set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) -set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) -set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) -set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) - -list(APPEND FLUTTER_LIBRARY_HEADERS - "flutter_export.h" - "flutter_windows.h" - "flutter_messenger.h" - "flutter_plugin_registrar.h" - "flutter_texture_registrar.h" -) -list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") -add_library(flutter INTERFACE) -target_include_directories(flutter INTERFACE - "${EPHEMERAL_DIR}" -) -target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") -add_dependencies(flutter flutter_assemble) - -# === Wrapper === -list(APPEND CPP_WRAPPER_SOURCES_CORE - "core_implementations.cc" - "standard_codec.cc" -) -list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") -list(APPEND CPP_WRAPPER_SOURCES_PLUGIN - "plugin_registrar.cc" -) -list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") -list(APPEND CPP_WRAPPER_SOURCES_APP - "flutter_engine.cc" - "flutter_view_controller.cc" -) -list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") - -# Wrapper sources needed for a plugin. -add_library(flutter_wrapper_plugin STATIC - ${CPP_WRAPPER_SOURCES_CORE} - ${CPP_WRAPPER_SOURCES_PLUGIN} -) -apply_standard_settings(flutter_wrapper_plugin) -set_target_properties(flutter_wrapper_plugin PROPERTIES - POSITION_INDEPENDENT_CODE ON) -set_target_properties(flutter_wrapper_plugin PROPERTIES - CXX_VISIBILITY_PRESET hidden) -target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) -target_include_directories(flutter_wrapper_plugin PUBLIC - "${WRAPPER_ROOT}/include" -) -add_dependencies(flutter_wrapper_plugin flutter_assemble) - -# Wrapper sources needed for the runner. -add_library(flutter_wrapper_app STATIC - ${CPP_WRAPPER_SOURCES_CORE} - ${CPP_WRAPPER_SOURCES_APP} -) -apply_standard_settings(flutter_wrapper_app) -target_link_libraries(flutter_wrapper_app PUBLIC flutter) -target_include_directories(flutter_wrapper_app PUBLIC - "${WRAPPER_ROOT}/include" -) -add_dependencies(flutter_wrapper_app flutter_assemble) - -# === Flutter tool backend === -# _phony_ is a non-existent file to force this command to run every time, -# since currently there's no way to get a full input/output list from the -# flutter tool. -set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") -set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) -add_custom_command( - OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} - ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} - ${CPP_WRAPPER_SOURCES_APP} - ${PHONY_OUTPUT} - COMMAND ${CMAKE_COMMAND} -E env - ${FLUTTER_TOOL_ENVIRONMENT} - "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" - ${FLUTTER_TARGET_PLATFORM} $ - VERBATIM -) -add_custom_target(flutter_assemble DEPENDS - "${FLUTTER_LIBRARY}" - ${FLUTTER_LIBRARY_HEADERS} - ${CPP_WRAPPER_SOURCES_CORE} - ${CPP_WRAPPER_SOURCES_PLUGIN} - ${CPP_WRAPPER_SOURCES_APP} -) +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.14) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + ${FLUTTER_TARGET_PLATFORM} $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/flutter/microbenchmarks/windows/flutter/generated_plugin_registrant.cc b/packages/flutter/microbenchmarks/windows/flutter/generated_plugin_registrant.cc similarity index 100% rename from flutter/microbenchmarks/windows/flutter/generated_plugin_registrant.cc rename to packages/flutter/microbenchmarks/windows/flutter/generated_plugin_registrant.cc diff --git a/flutter/microbenchmarks/windows/flutter/generated_plugin_registrant.h b/packages/flutter/microbenchmarks/windows/flutter/generated_plugin_registrant.h similarity index 100% rename from flutter/microbenchmarks/windows/flutter/generated_plugin_registrant.h rename to packages/flutter/microbenchmarks/windows/flutter/generated_plugin_registrant.h diff --git a/flutter/microbenchmarks/windows/flutter/generated_plugins.cmake b/packages/flutter/microbenchmarks/windows/flutter/generated_plugins.cmake similarity index 100% rename from flutter/microbenchmarks/windows/flutter/generated_plugins.cmake rename to packages/flutter/microbenchmarks/windows/flutter/generated_plugins.cmake diff --git a/flutter/example/windows/runner/CMakeLists.txt b/packages/flutter/microbenchmarks/windows/runner/CMakeLists.txt similarity index 97% rename from flutter/example/windows/runner/CMakeLists.txt rename to packages/flutter/microbenchmarks/windows/runner/CMakeLists.txt index 2041a04410..394917c053 100644 --- a/flutter/example/windows/runner/CMakeLists.txt +++ b/packages/flutter/microbenchmarks/windows/runner/CMakeLists.txt @@ -1,40 +1,40 @@ -cmake_minimum_required(VERSION 3.14) -project(runner LANGUAGES CXX) - -# Define the application target. To change its name, change BINARY_NAME in the -# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer -# work. -# -# Any new source files that you add to the application should be added here. -add_executable(${BINARY_NAME} WIN32 - "flutter_window.cpp" - "main.cpp" - "utils.cpp" - "win32_window.cpp" - "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" - "Runner.rc" - "runner.exe.manifest" -) - -# Apply the standard set of build settings. This can be removed for applications -# that need different build settings. -apply_standard_settings(${BINARY_NAME}) - -# Add preprocessor definitions for the build version. -target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") -target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") -target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") -target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") -target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") - -# Disable Windows macros that collide with C++ standard library functions. -target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") - -# Add dependency libraries and include directories. Add any application-specific -# dependencies here. -target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) -target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") -target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") - -# Run the Flutter tool portions of the build. This must not be removed. -add_dependencies(${BINARY_NAME} flutter_assemble) +cmake_minimum_required(VERSION 3.14) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} WIN32 + "flutter_window.cpp" + "main.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + +# Disable Windows macros that collide with C++ standard library functions. +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") + +# Add dependency libraries and include directories. Add any application-specific +# dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/flutter/microbenchmarks/windows/runner/Runner.rc b/packages/flutter/microbenchmarks/windows/runner/Runner.rc similarity index 100% rename from flutter/microbenchmarks/windows/runner/Runner.rc rename to packages/flutter/microbenchmarks/windows/runner/Runner.rc diff --git a/flutter/example/windows/runner/flutter_window.cpp b/packages/flutter/microbenchmarks/windows/runner/flutter_window.cpp similarity index 96% rename from flutter/example/windows/runner/flutter_window.cpp rename to packages/flutter/microbenchmarks/windows/runner/flutter_window.cpp index c819cb083f..955ee3038f 100644 --- a/flutter/example/windows/runner/flutter_window.cpp +++ b/packages/flutter/microbenchmarks/windows/runner/flutter_window.cpp @@ -1,71 +1,71 @@ -#include "flutter_window.h" - -#include - -#include "flutter/generated_plugin_registrant.h" - -FlutterWindow::FlutterWindow(const flutter::DartProject& project) - : project_(project) {} - -FlutterWindow::~FlutterWindow() {} - -bool FlutterWindow::OnCreate() { - if (!Win32Window::OnCreate()) { - return false; - } - - RECT frame = GetClientArea(); - - // The size here must match the window dimensions to avoid unnecessary surface - // creation / destruction in the startup path. - flutter_controller_ = std::make_unique( - frame.right - frame.left, frame.bottom - frame.top, project_); - // Ensure that basic setup of the controller was successful. - if (!flutter_controller_->engine() || !flutter_controller_->view()) { - return false; - } - RegisterPlugins(flutter_controller_->engine()); - SetChildContent(flutter_controller_->view()->GetNativeWindow()); - - flutter_controller_->engine()->SetNextFrameCallback([&]() { - this->Show(); - }); - - // Flutter can complete the first frame before the "show window" callback is - // registered. The following call ensures a frame is pending to ensure the - // window is shown. It is a no-op if the first frame hasn't completed yet. - flutter_controller_->ForceRedraw(); - - return true; -} - -void FlutterWindow::OnDestroy() { - if (flutter_controller_) { - flutter_controller_ = nullptr; - } - - Win32Window::OnDestroy(); -} - -LRESULT -FlutterWindow::MessageHandler(HWND hwnd, UINT const message, - WPARAM const wparam, - LPARAM const lparam) noexcept { - // Give Flutter, including plugins, an opportunity to handle window messages. - if (flutter_controller_) { - std::optional result = - flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, - lparam); - if (result) { - return *result; - } - } - - switch (message) { - case WM_FONTCHANGE: - flutter_controller_->engine()->ReloadSystemFonts(); - break; - } - - return Win32Window::MessageHandler(hwnd, message, wparam, lparam); -} +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(const flutter::DartProject& project) + : project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + + flutter_controller_->engine()->SetNextFrameCallback([&]() { + this->Show(); + }); + + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opportunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/flutter/example/windows/runner/flutter_window.h b/packages/flutter/microbenchmarks/windows/runner/flutter_window.h similarity index 96% rename from flutter/example/windows/runner/flutter_window.h rename to packages/flutter/microbenchmarks/windows/runner/flutter_window.h index 28c23839b9..6da0652f05 100644 --- a/flutter/example/windows/runner/flutter_window.h +++ b/packages/flutter/microbenchmarks/windows/runner/flutter_window.h @@ -1,33 +1,33 @@ -#ifndef RUNNER_FLUTTER_WINDOW_H_ -#define RUNNER_FLUTTER_WINDOW_H_ - -#include -#include - -#include - -#include "win32_window.h" - -// A window that does nothing but host a Flutter view. -class FlutterWindow : public Win32Window { - public: - // Creates a new FlutterWindow hosting a Flutter view running |project|. - explicit FlutterWindow(const flutter::DartProject& project); - virtual ~FlutterWindow(); - - protected: - // Win32Window: - bool OnCreate() override; - void OnDestroy() override; - LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, - LPARAM const lparam) noexcept override; - - private: - // The project to run. - flutter::DartProject project_; - - // The Flutter instance hosted by this window. - std::unique_ptr flutter_controller_; -}; - -#endif // RUNNER_FLUTTER_WINDOW_H_ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow hosting a Flutter view running |project|. + explicit FlutterWindow(const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/flutter/microbenchmarks/windows/runner/main.cpp b/packages/flutter/microbenchmarks/windows/runner/main.cpp similarity index 100% rename from flutter/microbenchmarks/windows/runner/main.cpp rename to packages/flutter/microbenchmarks/windows/runner/main.cpp diff --git a/flutter/example/windows/runner/resource.h b/packages/flutter/microbenchmarks/windows/runner/resource.h similarity index 96% rename from flutter/example/windows/runner/resource.h rename to packages/flutter/microbenchmarks/windows/runner/resource.h index ddc7f3efc0..66a65d1e4a 100644 --- a/flutter/example/windows/runner/resource.h +++ b/packages/flutter/microbenchmarks/windows/runner/resource.h @@ -1,16 +1,16 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by Runner.rc -// -#define IDI_APP_ICON 101 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 102 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/flutter/microbenchmarks/windows/runner/resources/app_icon.ico b/packages/flutter/microbenchmarks/windows/runner/resources/app_icon.ico similarity index 100% rename from flutter/microbenchmarks/windows/runner/resources/app_icon.ico rename to packages/flutter/microbenchmarks/windows/runner/resources/app_icon.ico diff --git a/flutter/microbenchmarks/windows/runner/runner.exe.manifest b/packages/flutter/microbenchmarks/windows/runner/runner.exe.manifest similarity index 100% rename from flutter/microbenchmarks/windows/runner/runner.exe.manifest rename to packages/flutter/microbenchmarks/windows/runner/runner.exe.manifest diff --git a/flutter/microbenchmarks/windows/runner/utils.cpp b/packages/flutter/microbenchmarks/windows/runner/utils.cpp similarity index 100% rename from flutter/microbenchmarks/windows/runner/utils.cpp rename to packages/flutter/microbenchmarks/windows/runner/utils.cpp diff --git a/flutter/example/windows/runner/utils.h b/packages/flutter/microbenchmarks/windows/runner/utils.h similarity index 97% rename from flutter/example/windows/runner/utils.h rename to packages/flutter/microbenchmarks/windows/runner/utils.h index 3f0e05cba3..3879d54755 100644 --- a/flutter/example/windows/runner/utils.h +++ b/packages/flutter/microbenchmarks/windows/runner/utils.h @@ -1,19 +1,19 @@ -#ifndef RUNNER_UTILS_H_ -#define RUNNER_UTILS_H_ - -#include -#include - -// Creates a console for the process, and redirects stdout and stderr to -// it for both the runner and the Flutter library. -void CreateAndAttachConsole(); - -// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string -// encoded in UTF-8. Returns an empty std::string on failure. -std::string Utf8FromUtf16(const wchar_t* utf16_string); - -// Gets the command line arguments passed in as a std::vector, -// encoded in UTF-8. Returns an empty std::vector on failure. -std::vector GetCommandLineArguments(); - -#endif // RUNNER_UTILS_H_ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/flutter/example/windows/runner/win32_window.cpp b/packages/flutter/microbenchmarks/windows/runner/win32_window.cpp similarity index 96% rename from flutter/example/windows/runner/win32_window.cpp rename to packages/flutter/microbenchmarks/windows/runner/win32_window.cpp index b5ba2a099f..60608d0fe5 100644 --- a/flutter/example/windows/runner/win32_window.cpp +++ b/packages/flutter/microbenchmarks/windows/runner/win32_window.cpp @@ -1,288 +1,288 @@ -#include "win32_window.h" - -#include -#include - -#include "resource.h" - -namespace { - -/// Window attribute that enables dark mode window decorations. -/// -/// Redefined in case the developer's machine has a Windows SDK older than -/// version 10.0.22000.0. -/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute -#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE -#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 -#endif - -constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; - -/// Registry key for app theme preference. -/// -/// A value of 0 indicates apps should use dark mode. A non-zero or missing -/// value indicates apps should use light mode. -constexpr const wchar_t kGetPreferredBrightnessRegKey[] = - L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; -constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; - -// The number of Win32Window objects that currently exist. -static int g_active_window_count = 0; - -using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); - -// Scale helper to convert logical scaler values to physical using passed in -// scale factor -int Scale(int source, double scale_factor) { - return static_cast(source * scale_factor); -} - -// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. -// This API is only needed for PerMonitor V1 awareness mode. -void EnableFullDpiSupportIfAvailable(HWND hwnd) { - HMODULE user32_module = LoadLibraryA("User32.dll"); - if (!user32_module) { - return; - } - auto enable_non_client_dpi_scaling = - reinterpret_cast( - GetProcAddress(user32_module, "EnableNonClientDpiScaling")); - if (enable_non_client_dpi_scaling != nullptr) { - enable_non_client_dpi_scaling(hwnd); - } - FreeLibrary(user32_module); -} - -} // namespace - -// Manages the Win32Window's window class registration. -class WindowClassRegistrar { - public: - ~WindowClassRegistrar() = default; - - // Returns the singleton registrar instance. - static WindowClassRegistrar* GetInstance() { - if (!instance_) { - instance_ = new WindowClassRegistrar(); - } - return instance_; - } - - // Returns the name of the window class, registering the class if it hasn't - // previously been registered. - const wchar_t* GetWindowClass(); - - // Unregisters the window class. Should only be called if there are no - // instances of the window. - void UnregisterWindowClass(); - - private: - WindowClassRegistrar() = default; - - static WindowClassRegistrar* instance_; - - bool class_registered_ = false; -}; - -WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; - -const wchar_t* WindowClassRegistrar::GetWindowClass() { - if (!class_registered_) { - WNDCLASS window_class{}; - window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); - window_class.lpszClassName = kWindowClassName; - window_class.style = CS_HREDRAW | CS_VREDRAW; - window_class.cbClsExtra = 0; - window_class.cbWndExtra = 0; - window_class.hInstance = GetModuleHandle(nullptr); - window_class.hIcon = - LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); - window_class.hbrBackground = 0; - window_class.lpszMenuName = nullptr; - window_class.lpfnWndProc = Win32Window::WndProc; - RegisterClass(&window_class); - class_registered_ = true; - } - return kWindowClassName; -} - -void WindowClassRegistrar::UnregisterWindowClass() { - UnregisterClass(kWindowClassName, nullptr); - class_registered_ = false; -} - -Win32Window::Win32Window() { - ++g_active_window_count; -} - -Win32Window::~Win32Window() { - --g_active_window_count; - Destroy(); -} - -bool Win32Window::Create(const std::wstring& title, - const Point& origin, - const Size& size) { - Destroy(); - - const wchar_t* window_class = - WindowClassRegistrar::GetInstance()->GetWindowClass(); - - const POINT target_point = {static_cast(origin.x), - static_cast(origin.y)}; - HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); - UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); - double scale_factor = dpi / 96.0; - - HWND window = CreateWindow( - window_class, title.c_str(), WS_OVERLAPPEDWINDOW, - Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), - Scale(size.width, scale_factor), Scale(size.height, scale_factor), - nullptr, nullptr, GetModuleHandle(nullptr), this); - - if (!window) { - return false; - } - - UpdateTheme(window); - - return OnCreate(); -} - -bool Win32Window::Show() { - return ShowWindow(window_handle_, SW_SHOWNORMAL); -} - -// static -LRESULT CALLBACK Win32Window::WndProc(HWND const window, - UINT const message, - WPARAM const wparam, - LPARAM const lparam) noexcept { - if (message == WM_NCCREATE) { - auto window_struct = reinterpret_cast(lparam); - SetWindowLongPtr(window, GWLP_USERDATA, - reinterpret_cast(window_struct->lpCreateParams)); - - auto that = static_cast(window_struct->lpCreateParams); - EnableFullDpiSupportIfAvailable(window); - that->window_handle_ = window; - } else if (Win32Window* that = GetThisFromHandle(window)) { - return that->MessageHandler(window, message, wparam, lparam); - } - - return DefWindowProc(window, message, wparam, lparam); -} - -LRESULT -Win32Window::MessageHandler(HWND hwnd, - UINT const message, - WPARAM const wparam, - LPARAM const lparam) noexcept { - switch (message) { - case WM_DESTROY: - window_handle_ = nullptr; - Destroy(); - if (quit_on_close_) { - PostQuitMessage(0); - } - return 0; - - case WM_DPICHANGED: { - auto newRectSize = reinterpret_cast(lparam); - LONG newWidth = newRectSize->right - newRectSize->left; - LONG newHeight = newRectSize->bottom - newRectSize->top; - - SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, - newHeight, SWP_NOZORDER | SWP_NOACTIVATE); - - return 0; - } - case WM_SIZE: { - RECT rect = GetClientArea(); - if (child_content_ != nullptr) { - // Size and position the child window. - MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, - rect.bottom - rect.top, TRUE); - } - return 0; - } - - case WM_ACTIVATE: - if (child_content_ != nullptr) { - SetFocus(child_content_); - } - return 0; - - case WM_DWMCOLORIZATIONCOLORCHANGED: - UpdateTheme(hwnd); - return 0; - } - - return DefWindowProc(window_handle_, message, wparam, lparam); -} - -void Win32Window::Destroy() { - OnDestroy(); - - if (window_handle_) { - DestroyWindow(window_handle_); - window_handle_ = nullptr; - } - if (g_active_window_count == 0) { - WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); - } -} - -Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { - return reinterpret_cast( - GetWindowLongPtr(window, GWLP_USERDATA)); -} - -void Win32Window::SetChildContent(HWND content) { - child_content_ = content; - SetParent(content, window_handle_); - RECT frame = GetClientArea(); - - MoveWindow(content, frame.left, frame.top, frame.right - frame.left, - frame.bottom - frame.top, true); - - SetFocus(child_content_); -} - -RECT Win32Window::GetClientArea() { - RECT frame; - GetClientRect(window_handle_, &frame); - return frame; -} - -HWND Win32Window::GetHandle() { - return window_handle_; -} - -void Win32Window::SetQuitOnClose(bool quit_on_close) { - quit_on_close_ = quit_on_close; -} - -bool Win32Window::OnCreate() { - // No-op; provided for subclasses. - return true; -} - -void Win32Window::OnDestroy() { - // No-op; provided for subclasses. -} - -void Win32Window::UpdateTheme(HWND const window) { - DWORD light_mode; - DWORD light_mode_size = sizeof(light_mode); - LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, - kGetPreferredBrightnessRegValue, - RRF_RT_REG_DWORD, nullptr, &light_mode, - &light_mode_size); - - if (result == ERROR_SUCCESS) { - BOOL enable_dark_mode = light_mode == 0; - DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, - &enable_dark_mode, sizeof(enable_dark_mode)); - } -} +#include "win32_window.h" + +#include +#include + +#include "resource.h" + +namespace { + +/// Window attribute that enables dark mode window decorations. +/// +/// Redefined in case the developer's machine has a Windows SDK older than +/// version 10.0.22000.0. +/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute +#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE +#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 +#endif + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +/// Registry key for app theme preference. +/// +/// A value of 0 indicates apps should use dark mode. A non-zero or missing +/// value indicates apps should use light mode. +constexpr const wchar_t kGetPreferredBrightnessRegKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; +constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; + +// The number of Win32Window objects that currently exist. +static int g_active_window_count = 0; + +using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); + +// Scale helper to convert logical scaler values to physical using passed in +// scale factor +int Scale(int source, double scale_factor) { + return static_cast(source * scale_factor); +} + +// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. +// This API is only needed for PerMonitor V1 awareness mode. +void EnableFullDpiSupportIfAvailable(HWND hwnd) { + HMODULE user32_module = LoadLibraryA("User32.dll"); + if (!user32_module) { + return; + } + auto enable_non_client_dpi_scaling = + reinterpret_cast( + GetProcAddress(user32_module, "EnableNonClientDpiScaling")); + if (enable_non_client_dpi_scaling != nullptr) { + enable_non_client_dpi_scaling(hwnd); + } + FreeLibrary(user32_module); +} + +} // namespace + +// Manages the Win32Window's window class registration. +class WindowClassRegistrar { + public: + ~WindowClassRegistrar() = default; + + // Returns the singleton registrar instance. + static WindowClassRegistrar* GetInstance() { + if (!instance_) { + instance_ = new WindowClassRegistrar(); + } + return instance_; + } + + // Returns the name of the window class, registering the class if it hasn't + // previously been registered. + const wchar_t* GetWindowClass(); + + // Unregisters the window class. Should only be called if there are no + // instances of the window. + void UnregisterWindowClass(); + + private: + WindowClassRegistrar() = default; + + static WindowClassRegistrar* instance_; + + bool class_registered_ = false; +}; + +WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; + +const wchar_t* WindowClassRegistrar::GetWindowClass() { + if (!class_registered_) { + WNDCLASS window_class{}; + window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); + window_class.lpszClassName = kWindowClassName; + window_class.style = CS_HREDRAW | CS_VREDRAW; + window_class.cbClsExtra = 0; + window_class.cbWndExtra = 0; + window_class.hInstance = GetModuleHandle(nullptr); + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); + window_class.hbrBackground = 0; + window_class.lpszMenuName = nullptr; + window_class.lpfnWndProc = Win32Window::WndProc; + RegisterClass(&window_class); + class_registered_ = true; + } + return kWindowClassName; +} + +void WindowClassRegistrar::UnregisterWindowClass() { + UnregisterClass(kWindowClassName, nullptr); + class_registered_ = false; +} + +Win32Window::Win32Window() { + ++g_active_window_count; +} + +Win32Window::~Win32Window() { + --g_active_window_count; + Destroy(); +} + +bool Win32Window::Create(const std::wstring& title, + const Point& origin, + const Size& size) { + Destroy(); + + const wchar_t* window_class = + WindowClassRegistrar::GetInstance()->GetWindowClass(); + + const POINT target_point = {static_cast(origin.x), + static_cast(origin.y)}; + HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); + UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); + double scale_factor = dpi / 96.0; + + HWND window = CreateWindow( + window_class, title.c_str(), WS_OVERLAPPEDWINDOW, + Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), + Scale(size.width, scale_factor), Scale(size.height, scale_factor), + nullptr, nullptr, GetModuleHandle(nullptr), this); + + if (!window) { + return false; + } + + UpdateTheme(window); + + return OnCreate(); +} + +bool Win32Window::Show() { + return ShowWindow(window_handle_, SW_SHOWNORMAL); +} + +// static +LRESULT CALLBACK Win32Window::WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + if (message == WM_NCCREATE) { + auto window_struct = reinterpret_cast(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(window_struct->lpCreateParams); + EnableFullDpiSupportIfAvailable(window); + that->window_handle_ = window; + } else if (Win32Window* that = GetThisFromHandle(window)) { + return that->MessageHandler(window, message, wparam, lparam); + } + + return DefWindowProc(window, message, wparam, lparam); +} + +LRESULT +Win32Window::MessageHandler(HWND hwnd, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + switch (message) { + case WM_DESTROY: + window_handle_ = nullptr; + Destroy(); + if (quit_on_close_) { + PostQuitMessage(0); + } + return 0; + + case WM_DPICHANGED: { + auto newRectSize = reinterpret_cast(lparam); + LONG newWidth = newRectSize->right - newRectSize->left; + LONG newHeight = newRectSize->bottom - newRectSize->top; + + SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, + newHeight, SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; + } + case WM_SIZE: { + RECT rect = GetClientArea(); + if (child_content_ != nullptr) { + // Size and position the child window. + MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top, TRUE); + } + return 0; + } + + case WM_ACTIVATE: + if (child_content_ != nullptr) { + SetFocus(child_content_); + } + return 0; + + case WM_DWMCOLORIZATIONCOLORCHANGED: + UpdateTheme(hwnd); + return 0; + } + + return DefWindowProc(window_handle_, message, wparam, lparam); +} + +void Win32Window::Destroy() { + OnDestroy(); + + if (window_handle_) { + DestroyWindow(window_handle_); + window_handle_ = nullptr; + } + if (g_active_window_count == 0) { + WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); + } +} + +Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { + return reinterpret_cast( + GetWindowLongPtr(window, GWLP_USERDATA)); +} + +void Win32Window::SetChildContent(HWND content) { + child_content_ = content; + SetParent(content, window_handle_); + RECT frame = GetClientArea(); + + MoveWindow(content, frame.left, frame.top, frame.right - frame.left, + frame.bottom - frame.top, true); + + SetFocus(child_content_); +} + +RECT Win32Window::GetClientArea() { + RECT frame; + GetClientRect(window_handle_, &frame); + return frame; +} + +HWND Win32Window::GetHandle() { + return window_handle_; +} + +void Win32Window::SetQuitOnClose(bool quit_on_close) { + quit_on_close_ = quit_on_close; +} + +bool Win32Window::OnCreate() { + // No-op; provided for subclasses. + return true; +} + +void Win32Window::OnDestroy() { + // No-op; provided for subclasses. +} + +void Win32Window::UpdateTheme(HWND const window) { + DWORD light_mode; + DWORD light_mode_size = sizeof(light_mode); + LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, + kGetPreferredBrightnessRegValue, + RRF_RT_REG_DWORD, nullptr, &light_mode, + &light_mode_size); + + if (result == ERROR_SUCCESS) { + BOOL enable_dark_mode = light_mode == 0; + DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, + &enable_dark_mode, sizeof(enable_dark_mode)); + } +} diff --git a/flutter/example/windows/runner/win32_window.h b/packages/flutter/microbenchmarks/windows/runner/win32_window.h similarity index 97% rename from flutter/example/windows/runner/win32_window.h rename to packages/flutter/microbenchmarks/windows/runner/win32_window.h index 49b847f075..e901dde684 100644 --- a/flutter/example/windows/runner/win32_window.h +++ b/packages/flutter/microbenchmarks/windows/runner/win32_window.h @@ -1,102 +1,102 @@ -#ifndef RUNNER_WIN32_WINDOW_H_ -#define RUNNER_WIN32_WINDOW_H_ - -#include - -#include -#include -#include - -// A class abstraction for a high DPI-aware Win32 Window. Intended to be -// inherited from by classes that wish to specialize with custom -// rendering and input handling -class Win32Window { - public: - struct Point { - unsigned int x; - unsigned int y; - Point(unsigned int x, unsigned int y) : x(x), y(y) {} - }; - - struct Size { - unsigned int width; - unsigned int height; - Size(unsigned int width, unsigned int height) - : width(width), height(height) {} - }; - - Win32Window(); - virtual ~Win32Window(); - - // Creates a win32 window with |title| that is positioned and sized using - // |origin| and |size|. New windows are created on the default monitor. Window - // sizes are specified to the OS in physical pixels, hence to ensure a - // consistent size this function will scale the inputted width and height as - // as appropriate for the default monitor. The window is invisible until - // |Show| is called. Returns true if the window was created successfully. - bool Create(const std::wstring& title, const Point& origin, const Size& size); - - // Show the current window. Returns true if the window was successfully shown. - bool Show(); - - // Release OS resources associated with window. - void Destroy(); - - // Inserts |content| into the window tree. - void SetChildContent(HWND content); - - // Returns the backing Window handle to enable clients to set icon and other - // window properties. Returns nullptr if the window has been destroyed. - HWND GetHandle(); - - // If true, closing this window will quit the application. - void SetQuitOnClose(bool quit_on_close); - - // Return a RECT representing the bounds of the current client area. - RECT GetClientArea(); - - protected: - // Processes and route salient window messages for mouse handling, - // size change and DPI. Delegates handling of these to member overloads that - // inheriting classes can handle. - virtual LRESULT MessageHandler(HWND window, - UINT const message, - WPARAM const wparam, - LPARAM const lparam) noexcept; - - // Called when CreateAndShow is called, allowing subclass window-related - // setup. Subclasses should return false if setup fails. - virtual bool OnCreate(); - - // Called when Destroy is called. - virtual void OnDestroy(); - - private: - friend class WindowClassRegistrar; - - // OS callback called by message pump. Handles the WM_NCCREATE message which - // is passed when the non-client area is being created and enables automatic - // non-client DPI scaling so that the non-client area automatically - // responds to changes in DPI. All other messages are handled by - // MessageHandler. - static LRESULT CALLBACK WndProc(HWND const window, - UINT const message, - WPARAM const wparam, - LPARAM const lparam) noexcept; - - // Retrieves a class instance pointer for |window| - static Win32Window* GetThisFromHandle(HWND const window) noexcept; - - // Update the window frame's theme to match the system theme. - static void UpdateTheme(HWND const window); - - bool quit_on_close_ = false; - - // window handle for top level window. - HWND window_handle_ = nullptr; - - // window handle for hosted content. - HWND child_content_ = nullptr; -}; - -#endif // RUNNER_WIN32_WINDOW_H_ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates a win32 window with |title| that is positioned and sized using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size this function will scale the inputted width and height as + // as appropriate for the default monitor. The window is invisible until + // |Show| is called. Returns true if the window was created successfully. + bool Create(const std::wstring& title, const Point& origin, const Size& size); + + // Show the current window. Returns true if the window was successfully shown. + bool Show(); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + // Update the window frame's theme to match the system theme. + static void UpdateTheme(HWND const window); + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_ diff --git a/flutter/pubspec.yaml b/packages/flutter/pubspec.yaml similarity index 100% rename from flutter/pubspec.yaml rename to packages/flutter/pubspec.yaml diff --git a/packages/flutter/pubspec_overrides.yaml b/packages/flutter/pubspec_overrides.yaml new file mode 100644 index 0000000000..04ac16fe75 --- /dev/null +++ b/packages/flutter/pubspec_overrides.yaml @@ -0,0 +1,4 @@ +# melos_managed_dependency_overrides: sentry +dependency_overrides: + sentry: + path: ../dart diff --git a/flutter/scripts/generate-cocoa-bindings.sh b/packages/flutter/scripts/generate-cocoa-bindings.sh similarity index 100% rename from flutter/scripts/generate-cocoa-bindings.sh rename to packages/flutter/scripts/generate-cocoa-bindings.sh diff --git a/flutter/scripts/generate-jni-bindings.sh b/packages/flutter/scripts/generate-jni-bindings.sh similarity index 100% rename from flutter/scripts/generate-jni-bindings.sh rename to packages/flutter/scripts/generate-jni-bindings.sh diff --git a/flutter/scripts/generate-native-bindings.ps1 b/packages/flutter/scripts/generate-native-bindings.ps1 similarity index 100% rename from flutter/scripts/generate-native-bindings.ps1 rename to packages/flutter/scripts/generate-native-bindings.ps1 diff --git a/flutter/scripts/update-android.sh b/packages/flutter/scripts/update-android.sh similarity index 100% rename from flutter/scripts/update-android.sh rename to packages/flutter/scripts/update-android.sh diff --git a/flutter/scripts/update-cocoa.sh b/packages/flutter/scripts/update-cocoa.sh similarity index 100% rename from flutter/scripts/update-cocoa.sh rename to packages/flutter/scripts/update-cocoa.sh diff --git a/flutter/scripts/update-js.sh b/packages/flutter/scripts/update-js.sh similarity index 95% rename from flutter/scripts/update-js.sh rename to packages/flutter/scripts/update-js.sh index a17500a47a..de2a8c6998 100755 --- a/flutter/scripts/update-js.sh +++ b/packages/flutter/scripts/update-js.sh @@ -11,7 +11,7 @@ set -euo pipefail # set-version X – updates the version to X, refreshes integrity hashes and # regenerates the Dart constant file used by the web runtime -VERSION_DART_FILE="$(git rev-parse --show-toplevel)/flutter/lib/src/web/sentry_js_sdk_version.dart" +VERSION_DART_FILE="$(git rev-parse --show-toplevel)/packages/flutter/lib/src/web/sentry_js_sdk_version.dart" get_current_version() { awk -F"'" '/sentryJsSdkVersion/ { print $2 }' "$VERSION_DART_FILE" diff --git a/flutter/scripts/update-native.sh b/packages/flutter/scripts/update-native.sh similarity index 100% rename from flutter/scripts/update-native.sh rename to packages/flutter/scripts/update-native.sh diff --git a/flutter/sentry-native/CMakeCache.txt b/packages/flutter/sentry-native/CMakeCache.txt similarity index 100% rename from flutter/sentry-native/CMakeCache.txt rename to packages/flutter/sentry-native/CMakeCache.txt diff --git a/flutter/sentry-native/sentry-native.cmake b/packages/flutter/sentry-native/sentry-native.cmake similarity index 100% rename from flutter/sentry-native/sentry-native.cmake rename to packages/flutter/sentry-native/sentry-native.cmake diff --git a/flutter/test/android_platform_exception_event_processor_test.dart b/packages/flutter/test/android_platform_exception_event_processor_test.dart similarity index 100% rename from flutter/test/android_platform_exception_event_processor_test.dart rename to packages/flutter/test/android_platform_exception_event_processor_test.dart diff --git a/flutter/test/binding.dart b/packages/flutter/test/binding.dart similarity index 100% rename from flutter/test/binding.dart rename to packages/flutter/test/binding.dart diff --git a/flutter/test/event_processor/flutter_enricher_event_processor_test.dart b/packages/flutter/test/event_processor/flutter_enricher_event_processor_test.dart similarity index 100% rename from flutter/test/event_processor/flutter_enricher_event_processor_test.dart rename to packages/flutter/test/event_processor/flutter_enricher_event_processor_test.dart diff --git a/flutter/test/event_processor/flutter_exception_event_processor_test.dart b/packages/flutter/test/event_processor/flutter_exception_event_processor_test.dart similarity index 100% rename from flutter/test/event_processor/flutter_exception_event_processor_test.dart rename to packages/flutter/test/event_processor/flutter_exception_event_processor_test.dart diff --git a/flutter/test/event_processor/platform_exception_event_processor_test.dart b/packages/flutter/test/event_processor/platform_exception_event_processor_test.dart similarity index 100% rename from flutter/test/event_processor/platform_exception_event_processor_test.dart rename to packages/flutter/test/event_processor/platform_exception_event_processor_test.dart diff --git a/flutter/test/event_processor/screenshot_event_processor_test.dart b/packages/flutter/test/event_processor/screenshot_event_processor_test.dart similarity index 100% rename from flutter/test/event_processor/screenshot_event_processor_test.dart rename to packages/flutter/test/event_processor/screenshot_event_processor_test.dart diff --git a/flutter/test/event_processor/url_filter/io_filter_event_processor_test.dart b/packages/flutter/test/event_processor/url_filter/io_filter_event_processor_test.dart similarity index 100% rename from flutter/test/event_processor/url_filter/io_filter_event_processor_test.dart rename to packages/flutter/test/event_processor/url_filter/io_filter_event_processor_test.dart diff --git a/flutter/test/event_processor/url_filter/web_url_filter_event_processor_test.dart b/packages/flutter/test/event_processor/url_filter/web_url_filter_event_processor_test.dart similarity index 100% rename from flutter/test/event_processor/url_filter/web_url_filter_event_processor_test.dart rename to packages/flutter/test/event_processor/url_filter/web_url_filter_event_processor_test.dart diff --git a/flutter/test/event_processor/widget_event_processor_test.dart b/packages/flutter/test/event_processor/widget_event_processor_test.dart similarity index 100% rename from flutter/test/event_processor/widget_event_processor_test.dart rename to packages/flutter/test/event_processor/widget_event_processor_test.dart diff --git a/flutter/test/fake_frame_callback_handler.dart b/packages/flutter/test/fake_frame_callback_handler.dart similarity index 100% rename from flutter/test/fake_frame_callback_handler.dart rename to packages/flutter/test/fake_frame_callback_handler.dart diff --git a/flutter/test/feedback/sentry_feedback_widget_test.dart b/packages/flutter/test/feedback/sentry_feedback_widget_test.dart similarity index 100% rename from flutter/test/feedback/sentry_feedback_widget_test.dart rename to packages/flutter/test/feedback/sentry_feedback_widget_test.dart diff --git a/flutter/test/file_system_transport_test.dart b/packages/flutter/test/file_system_transport_test.dart similarity index 100% rename from flutter/test/file_system_transport_test.dart rename to packages/flutter/test/file_system_transport_test.dart diff --git a/flutter/test/flutter_sentry_attachment_test.dart b/packages/flutter/test/flutter_sentry_attachment_test.dart similarity index 100% rename from flutter/test/flutter_sentry_attachment_test.dart rename to packages/flutter/test/flutter_sentry_attachment_test.dart diff --git a/flutter/test/flutter_version_test.dart b/packages/flutter/test/flutter_version_test.dart similarity index 100% rename from flutter/test/flutter_version_test.dart rename to packages/flutter/test/flutter_version_test.dart diff --git a/flutter/test/frame_tracking/frames_tracking_integration_test.dart b/packages/flutter/test/frame_tracking/frames_tracking_integration_test.dart similarity index 100% rename from flutter/test/frame_tracking/frames_tracking_integration_test.dart rename to packages/flutter/test/frame_tracking/frames_tracking_integration_test.dart diff --git a/flutter/test/frame_tracking/sentry_delayed_frames_tracker_test.dart b/packages/flutter/test/frame_tracking/sentry_delayed_frames_tracker_test.dart similarity index 100% rename from flutter/test/frame_tracking/sentry_delayed_frames_tracker_test.dart rename to packages/flutter/test/frame_tracking/sentry_delayed_frames_tracker_test.dart diff --git a/flutter/test/frame_tracking/span_frame_metrics_collector_test.dart b/packages/flutter/test/frame_tracking/span_frame_metrics_collector_test.dart similarity index 100% rename from flutter/test/frame_tracking/span_frame_metrics_collector_test.dart rename to packages/flutter/test/frame_tracking/span_frame_metrics_collector_test.dart diff --git a/flutter/test/frame_tracking/span_frame_metrics_test.dart b/packages/flutter/test/frame_tracking/span_frame_metrics_test.dart similarity index 100% rename from flutter/test/frame_tracking/span_frame_metrics_test.dart rename to packages/flutter/test/frame_tracking/span_frame_metrics_test.dart diff --git a/flutter/test/initialization_test.dart b/packages/flutter/test/initialization_test.dart similarity index 100% rename from flutter/test/initialization_test.dart rename to packages/flutter/test/initialization_test.dart diff --git a/flutter/test/integrations/connectivity_integration_test.dart b/packages/flutter/test/integrations/connectivity_integration_test.dart similarity index 100% rename from flutter/test/integrations/connectivity_integration_test.dart rename to packages/flutter/test/integrations/connectivity_integration_test.dart diff --git a/flutter/test/integrations/debug_print_integration_test.dart b/packages/flutter/test/integrations/debug_print_integration_test.dart similarity index 100% rename from flutter/test/integrations/debug_print_integration_test.dart rename to packages/flutter/test/integrations/debug_print_integration_test.dart diff --git a/flutter/test/integrations/fixture.dart b/packages/flutter/test/integrations/fixture.dart similarity index 100% rename from flutter/test/integrations/fixture.dart rename to packages/flutter/test/integrations/fixture.dart diff --git a/flutter/test/integrations/flutter_error_integration_test.dart b/packages/flutter/test/integrations/flutter_error_integration_test.dart similarity index 100% rename from flutter/test/integrations/flutter_error_integration_test.dart rename to packages/flutter/test/integrations/flutter_error_integration_test.dart diff --git a/flutter/test/integrations/flutter_framework_feature_flag_integration_test.dart b/packages/flutter/test/integrations/flutter_framework_feature_flag_integration_test.dart similarity index 100% rename from flutter/test/integrations/flutter_framework_feature_flag_integration_test.dart rename to packages/flutter/test/integrations/flutter_framework_feature_flag_integration_test.dart diff --git a/flutter/test/integrations/generic_app_start_integration_test.dart b/packages/flutter/test/integrations/generic_app_start_integration_test.dart similarity index 100% rename from flutter/test/integrations/generic_app_start_integration_test.dart rename to packages/flutter/test/integrations/generic_app_start_integration_test.dart diff --git a/flutter/test/integrations/init_native_sdk_test.dart b/packages/flutter/test/integrations/init_native_sdk_test.dart similarity index 100% rename from flutter/test/integrations/init_native_sdk_test.dart rename to packages/flutter/test/integrations/init_native_sdk_test.dart diff --git a/flutter/test/integrations/load_contexts_integration_test.dart b/packages/flutter/test/integrations/load_contexts_integration_test.dart similarity index 100% rename from flutter/test/integrations/load_contexts_integration_test.dart rename to packages/flutter/test/integrations/load_contexts_integration_test.dart diff --git a/flutter/test/integrations/load_contexts_integrations_test.dart b/packages/flutter/test/integrations/load_contexts_integrations_test.dart similarity index 100% rename from flutter/test/integrations/load_contexts_integrations_test.dart rename to packages/flutter/test/integrations/load_contexts_integrations_test.dart diff --git a/flutter/test/integrations/load_native_debug_images_integration_test.dart b/packages/flutter/test/integrations/load_native_debug_images_integration_test.dart similarity index 100% rename from flutter/test/integrations/load_native_debug_images_integration_test.dart rename to packages/flutter/test/integrations/load_native_debug_images_integration_test.dart diff --git a/flutter/test/integrations/load_release_integration_test.dart b/packages/flutter/test/integrations/load_release_integration_test.dart similarity index 100% rename from flutter/test/integrations/load_release_integration_test.dart rename to packages/flutter/test/integrations/load_release_integration_test.dart diff --git a/flutter/test/integrations/mock_platform_dispatcher.dart b/packages/flutter/test/integrations/mock_platform_dispatcher.dart similarity index 100% rename from flutter/test/integrations/mock_platform_dispatcher.dart rename to packages/flutter/test/integrations/mock_platform_dispatcher.dart diff --git a/flutter/test/integrations/native_app_start_handler_test.dart b/packages/flutter/test/integrations/native_app_start_handler_test.dart similarity index 100% rename from flutter/test/integrations/native_app_start_handler_test.dart rename to packages/flutter/test/integrations/native_app_start_handler_test.dart diff --git a/flutter/test/integrations/native_app_start_integration_test.dart b/packages/flutter/test/integrations/native_app_start_integration_test.dart similarity index 100% rename from flutter/test/integrations/native_app_start_integration_test.dart rename to packages/flutter/test/integrations/native_app_start_integration_test.dart diff --git a/flutter/test/integrations/native_sdk_integration_test.dart b/packages/flutter/test/integrations/native_sdk_integration_test.dart similarity index 100% rename from flutter/test/integrations/native_sdk_integration_test.dart rename to packages/flutter/test/integrations/native_sdk_integration_test.dart diff --git a/flutter/test/integrations/not_initialized_widgets_binding_on_error_integration_test.dart b/packages/flutter/test/integrations/not_initialized_widgets_binding_on_error_integration_test.dart similarity index 100% rename from flutter/test/integrations/not_initialized_widgets_binding_on_error_integration_test.dart rename to packages/flutter/test/integrations/not_initialized_widgets_binding_on_error_integration_test.dart diff --git a/flutter/test/integrations/not_initialized_widgets_binding_test.dart b/packages/flutter/test/integrations/not_initialized_widgets_binding_test.dart similarity index 100% rename from flutter/test/integrations/not_initialized_widgets_binding_test.dart rename to packages/flutter/test/integrations/not_initialized_widgets_binding_test.dart diff --git a/flutter/test/integrations/on_error_integration_test.dart b/packages/flutter/test/integrations/on_error_integration_test.dart similarity index 100% rename from flutter/test/integrations/on_error_integration_test.dart rename to packages/flutter/test/integrations/on_error_integration_test.dart diff --git a/flutter/test/integrations/screenshot_integration_test.dart b/packages/flutter/test/integrations/screenshot_integration_test.dart similarity index 100% rename from flutter/test/integrations/screenshot_integration_test.dart rename to packages/flutter/test/integrations/screenshot_integration_test.dart diff --git a/flutter/test/integrations/thread_info_integration_test.dart b/packages/flutter/test/integrations/thread_info_integration_test.dart similarity index 100% rename from flutter/test/integrations/thread_info_integration_test.dart rename to packages/flutter/test/integrations/thread_info_integration_test.dart diff --git a/flutter/test/integrations/web_sdk_integration_test.dart b/packages/flutter/test/integrations/web_sdk_integration_test.dart similarity index 100% rename from flutter/test/integrations/web_sdk_integration_test.dart rename to packages/flutter/test/integrations/web_sdk_integration_test.dart diff --git a/flutter/test/integrations/web_session_integration_test.dart b/packages/flutter/test/integrations/web_session_integration_test.dart similarity index 100% rename from flutter/test/integrations/web_session_integration_test.dart rename to packages/flutter/test/integrations/web_session_integration_test.dart diff --git a/flutter/test/integrations/widgets_binding_integration_test.dart b/packages/flutter/test/integrations/widgets_binding_integration_test.dart similarity index 100% rename from flutter/test/integrations/widgets_binding_integration_test.dart rename to packages/flutter/test/integrations/widgets_binding_integration_test.dart diff --git a/flutter/test/integrations/widgets_flutter_binding_integration_test.dart b/packages/flutter/test/integrations/widgets_flutter_binding_integration_test.dart similarity index 100% rename from flutter/test/integrations/widgets_flutter_binding_integration_test.dart rename to packages/flutter/test/integrations/widgets_flutter_binding_integration_test.dart diff --git a/flutter/test/jvm/jvm_exception_test.dart b/packages/flutter/test/jvm/jvm_exception_test.dart similarity index 100% rename from flutter/test/jvm/jvm_exception_test.dart rename to packages/flutter/test/jvm/jvm_exception_test.dart diff --git a/flutter/test/jvm/jvm_frame_test.dart b/packages/flutter/test/jvm/jvm_frame_test.dart similarity index 100% rename from flutter/test/jvm/jvm_frame_test.dart rename to packages/flutter/test/jvm/jvm_frame_test.dart diff --git a/flutter/test/method_channel_helper_test.dart b/packages/flutter/test/method_channel_helper_test.dart similarity index 100% rename from flutter/test/method_channel_helper_test.dart rename to packages/flutter/test/method_channel_helper_test.dart diff --git a/flutter/test/mocks.dart b/packages/flutter/test/mocks.dart similarity index 100% rename from flutter/test/mocks.dart rename to packages/flutter/test/mocks.dart diff --git a/flutter/test/mocks.mocks.dart b/packages/flutter/test/mocks.mocks.dart similarity index 100% rename from flutter/test/mocks.mocks.dart rename to packages/flutter/test/mocks.mocks.dart diff --git a/flutter/test/native_memory_test.dart b/packages/flutter/test/native_memory_test.dart similarity index 100% rename from flutter/test/native_memory_test.dart rename to packages/flutter/test/native_memory_test.dart diff --git a/flutter/test/native_memory_web_mock.dart b/packages/flutter/test/native_memory_web_mock.dart similarity index 100% rename from flutter/test/native_memory_web_mock.dart rename to packages/flutter/test/native_memory_web_mock.dart diff --git a/flutter/test/native_scope_observer_test.dart b/packages/flutter/test/native_scope_observer_test.dart similarity index 100% rename from flutter/test/native_scope_observer_test.dart rename to packages/flutter/test/native_scope_observer_test.dart diff --git a/flutter/test/navigation/sentry_display_test.dart b/packages/flutter/test/navigation/sentry_display_test.dart similarity index 100% rename from flutter/test/navigation/sentry_display_test.dart rename to packages/flutter/test/navigation/sentry_display_test.dart diff --git a/flutter/test/navigation/sentry_display_widget_test.dart b/packages/flutter/test/navigation/sentry_display_widget_test.dart similarity index 100% rename from flutter/test/navigation/sentry_display_widget_test.dart rename to packages/flutter/test/navigation/sentry_display_widget_test.dart diff --git a/flutter/test/navigation/sentry_navigator_observer_test.dart b/packages/flutter/test/navigation/sentry_navigator_observer_test.dart similarity index 100% rename from flutter/test/navigation/sentry_navigator_observer_test.dart rename to packages/flutter/test/navigation/sentry_navigator_observer_test.dart diff --git a/flutter/test/navigation/sentry_navigator_observer_traces_test.dart b/packages/flutter/test/navigation/sentry_navigator_observer_traces_test.dart similarity index 100% rename from flutter/test/navigation/sentry_navigator_observer_traces_test.dart rename to packages/flutter/test/navigation/sentry_navigator_observer_traces_test.dart diff --git a/flutter/test/navigation/time_to_display_tracker_test.dart b/packages/flutter/test/navigation/time_to_display_tracker_test.dart similarity index 100% rename from flutter/test/navigation/time_to_display_tracker_test.dart rename to packages/flutter/test/navigation/time_to_display_tracker_test.dart diff --git a/flutter/test/navigation/time_to_full_display_tracker_test.dart b/packages/flutter/test/navigation/time_to_full_display_tracker_test.dart similarity index 100% rename from flutter/test/navigation/time_to_full_display_tracker_test.dart rename to packages/flutter/test/navigation/time_to_full_display_tracker_test.dart diff --git a/flutter/test/navigation/time_to_initial_display_tracker_test.dart b/packages/flutter/test/navigation/time_to_initial_display_tracker_test.dart similarity index 100% rename from flutter/test/navigation/time_to_initial_display_tracker_test.dart rename to packages/flutter/test/navigation/time_to_initial_display_tracker_test.dart diff --git a/flutter/test/no_such_method_provider.dart b/packages/flutter/test/no_such_method_provider.dart similarity index 100% rename from flutter/test/no_such_method_provider.dart rename to packages/flutter/test/no_such_method_provider.dart diff --git a/flutter/test/profiling_test.dart b/packages/flutter/test/profiling_test.dart similarity index 100% rename from flutter/test/profiling_test.dart rename to packages/flutter/test/profiling_test.dart diff --git a/flutter/test/replay/android_replay_recorder_web.dart b/packages/flutter/test/replay/android_replay_recorder_web.dart similarity index 100% rename from flutter/test/replay/android_replay_recorder_web.dart rename to packages/flutter/test/replay/android_replay_recorder_web.dart diff --git a/flutter/test/replay/replay_event_processor_test.dart b/packages/flutter/test/replay/replay_event_processor_test.dart similarity index 100% rename from flutter/test/replay/replay_event_processor_test.dart rename to packages/flutter/test/replay/replay_event_processor_test.dart diff --git a/flutter/test/replay/replay_integration_test.dart b/packages/flutter/test/replay/replay_integration_test.dart similarity index 100% rename from flutter/test/replay/replay_integration_test.dart rename to packages/flutter/test/replay/replay_integration_test.dart diff --git a/flutter/test/replay/replay_native_test.dart b/packages/flutter/test/replay/replay_native_test.dart similarity index 100% rename from flutter/test/replay/replay_native_test.dart rename to packages/flutter/test/replay/replay_native_test.dart diff --git a/flutter/test/replay/replay_test_util.dart b/packages/flutter/test/replay/replay_test_util.dart similarity index 100% rename from flutter/test/replay/replay_test_util.dart rename to packages/flutter/test/replay/replay_test_util.dart diff --git a/flutter/test/replay/scheduled_recorder_test.dart b/packages/flutter/test/replay/scheduled_recorder_test.dart similarity index 100% rename from flutter/test/replay/scheduled_recorder_test.dart rename to packages/flutter/test/replay/scheduled_recorder_test.dart diff --git a/flutter/test/replay/scheduler_test.dart b/packages/flutter/test/replay/scheduler_test.dart similarity index 100% rename from flutter/test/replay/scheduler_test.dart rename to packages/flutter/test/replay/scheduler_test.dart diff --git a/flutter/test/screenshot/masking_config_test.dart b/packages/flutter/test/screenshot/masking_config_test.dart similarity index 100% rename from flutter/test/screenshot/masking_config_test.dart rename to packages/flutter/test/screenshot/masking_config_test.dart diff --git a/flutter/test/screenshot/recorder_config_test.dart b/packages/flutter/test/screenshot/recorder_config_test.dart similarity index 100% rename from flutter/test/screenshot/recorder_config_test.dart rename to packages/flutter/test/screenshot/recorder_config_test.dart diff --git a/flutter/test/screenshot/recorder_test.dart b/packages/flutter/test/screenshot/recorder_test.dart similarity index 100% rename from flutter/test/screenshot/recorder_test.dart rename to packages/flutter/test/screenshot/recorder_test.dart diff --git a/flutter/test/screenshot/screenshot_support_test.dart b/packages/flutter/test/screenshot/screenshot_support_test.dart similarity index 100% rename from flutter/test/screenshot/screenshot_support_test.dart rename to packages/flutter/test/screenshot/screenshot_support_test.dart diff --git a/flutter/test/screenshot/sentry_screenshot_quality_test.dart b/packages/flutter/test/screenshot/sentry_screenshot_quality_test.dart similarity index 100% rename from flutter/test/screenshot/sentry_screenshot_quality_test.dart rename to packages/flutter/test/screenshot/sentry_screenshot_quality_test.dart diff --git a/flutter/test/screenshot/sentry_screenshot_widget_test.dart b/packages/flutter/test/screenshot/sentry_screenshot_widget_test.dart similarity index 100% rename from flutter/test/screenshot/sentry_screenshot_widget_test.dart rename to packages/flutter/test/screenshot/sentry_screenshot_widget_test.dart diff --git a/flutter/test/screenshot/sentry_screenshot_widget_test.mocks.dart b/packages/flutter/test/screenshot/sentry_screenshot_widget_test.mocks.dart similarity index 100% rename from flutter/test/screenshot/sentry_screenshot_widget_test.mocks.dart rename to packages/flutter/test/screenshot/sentry_screenshot_widget_test.mocks.dart diff --git a/flutter/test/screenshot/test_widget.dart b/packages/flutter/test/screenshot/test_widget.dart similarity index 100% rename from flutter/test/screenshot/test_widget.dart rename to packages/flutter/test/screenshot/test_widget.dart diff --git a/flutter/test/screenshot/widget_filter_test.dart b/packages/flutter/test/screenshot/widget_filter_test.dart similarity index 100% rename from flutter/test/screenshot/widget_filter_test.dart rename to packages/flutter/test/screenshot/widget_filter_test.dart diff --git a/flutter/test/sentry_asset_bundle_test.dart b/packages/flutter/test/sentry_asset_bundle_test.dart similarity index 100% rename from flutter/test/sentry_asset_bundle_test.dart rename to packages/flutter/test/sentry_asset_bundle_test.dart diff --git a/flutter/test/sentry_flutter_options_test.dart b/packages/flutter/test/sentry_flutter_options_test.dart similarity index 100% rename from flutter/test/sentry_flutter_options_test.dart rename to packages/flutter/test/sentry_flutter_options_test.dart diff --git a/flutter/test/sentry_flutter_test.dart b/packages/flutter/test/sentry_flutter_test.dart similarity index 100% rename from flutter/test/sentry_flutter_test.dart rename to packages/flutter/test/sentry_flutter_test.dart diff --git a/flutter/test/sentry_flutter_util.dart b/packages/flutter/test/sentry_flutter_util.dart similarity index 100% rename from flutter/test/sentry_flutter_util.dart rename to packages/flutter/test/sentry_flutter_util.dart diff --git a/flutter/test/sentry_native/sentry_native_test.dart b/packages/flutter/test/sentry_native/sentry_native_test.dart similarity index 100% rename from flutter/test/sentry_native/sentry_native_test.dart rename to packages/flutter/test/sentry_native/sentry_native_test.dart diff --git a/flutter/test/sentry_native/sentry_native_test_ffi.dart b/packages/flutter/test/sentry_native/sentry_native_test_ffi.dart similarity index 100% rename from flutter/test/sentry_native/sentry_native_test_ffi.dart rename to packages/flutter/test/sentry_native/sentry_native_test_ffi.dart diff --git a/flutter/test/sentry_native/sentry_native_test_web.dart b/packages/flutter/test/sentry_native/sentry_native_test_web.dart similarity index 100% rename from flutter/test/sentry_native/sentry_native_test_web.dart rename to packages/flutter/test/sentry_native/sentry_native_test_web.dart diff --git a/flutter/test/sentry_native_channel_test.dart b/packages/flutter/test/sentry_native_channel_test.dart similarity index 100% rename from flutter/test/sentry_native_channel_test.dart rename to packages/flutter/test/sentry_native_channel_test.dart diff --git a/flutter/test/sentry_widget_test.dart b/packages/flutter/test/sentry_widget_test.dart similarity index 100% rename from flutter/test/sentry_widget_test.dart rename to packages/flutter/test/sentry_widget_test.dart diff --git a/flutter/test/sentry_widgets_binding_mixin_test.dart b/packages/flutter/test/sentry_widgets_binding_mixin_test.dart similarity index 100% rename from flutter/test/sentry_widgets_binding_mixin_test.dart rename to packages/flutter/test/sentry_widgets_binding_mixin_test.dart diff --git a/flutter/test/sentry_widgets_flutter_binding_test.dart b/packages/flutter/test/sentry_widgets_flutter_binding_test.dart similarity index 100% rename from flutter/test/sentry_widgets_flutter_binding_test.dart rename to packages/flutter/test/sentry_widgets_flutter_binding_test.dart diff --git a/flutter/test/user_interaction/sentry_user_interaction_widget_test.dart b/packages/flutter/test/user_interaction/sentry_user_interaction_widget_test.dart similarity index 100% rename from flutter/test/user_interaction/sentry_user_interaction_widget_test.dart rename to packages/flutter/test/user_interaction/sentry_user_interaction_widget_test.dart diff --git a/flutter/test/utils/debouncer_test.dart b/packages/flutter/test/utils/debouncer_test.dart similarity index 100% rename from flutter/test/utils/debouncer_test.dart rename to packages/flutter/test/utils/debouncer_test.dart diff --git a/flutter/test/version_test.dart b/packages/flutter/test/version_test.dart similarity index 100% rename from flutter/test/version_test.dart rename to packages/flutter/test/version_test.dart diff --git a/flutter/test/view_hierarchy/sentry_tree_walker_test.dart b/packages/flutter/test/view_hierarchy/sentry_tree_walker_test.dart similarity index 100% rename from flutter/test/view_hierarchy/sentry_tree_walker_test.dart rename to packages/flutter/test/view_hierarchy/sentry_tree_walker_test.dart diff --git a/flutter/test/view_hierarchy/view_hierarchy_event_processor_test.dart b/packages/flutter/test/view_hierarchy/view_hierarchy_event_processor_test.dart similarity index 100% rename from flutter/test/view_hierarchy/view_hierarchy_event_processor_test.dart rename to packages/flutter/test/view_hierarchy/view_hierarchy_event_processor_test.dart diff --git a/flutter/test/view_hierarchy/view_hierarchy_integration_test.dart b/packages/flutter/test/view_hierarchy/view_hierarchy_integration_test.dart similarity index 100% rename from flutter/test/view_hierarchy/view_hierarchy_integration_test.dart rename to packages/flutter/test/view_hierarchy/view_hierarchy_integration_test.dart diff --git a/flutter/test/web/sentry_js_bundles_test.dart b/packages/flutter/test/web/sentry_js_bundles_test.dart similarity index 100% rename from flutter/test/web/sentry_js_bundles_test.dart rename to packages/flutter/test/web/sentry_js_bundles_test.dart diff --git a/flutter/test/web/sentry_script_loader_test.dart b/packages/flutter/test/web/sentry_script_loader_test.dart similarity index 100% rename from flutter/test/web/sentry_script_loader_test.dart rename to packages/flutter/test/web/sentry_script_loader_test.dart diff --git a/flutter/test/web/sentry_script_loader_tt_custom_test.dart b/packages/flutter/test/web/sentry_script_loader_tt_custom_test.dart similarity index 100% rename from flutter/test/web/sentry_script_loader_tt_custom_test.dart rename to packages/flutter/test/web/sentry_script_loader_tt_custom_test.dart diff --git a/flutter/test/web/sentry_script_loader_tt_forbidden_test.dart b/packages/flutter/test/web/sentry_script_loader_tt_forbidden_test.dart similarity index 100% rename from flutter/test/web/sentry_script_loader_tt_forbidden_test.dart rename to packages/flutter/test/web/sentry_script_loader_tt_forbidden_test.dart diff --git a/flutter/test/web/sentry_web_test.dart b/packages/flutter/test/web/sentry_web_test.dart similarity index 100% rename from flutter/test/web/sentry_web_test.dart rename to packages/flutter/test/web/sentry_web_test.dart diff --git a/flutter/test/web/utils.dart b/packages/flutter/test/web/utils.dart similarity index 100% rename from flutter/test/web/utils.dart rename to packages/flutter/test/web/utils.dart diff --git a/flutter/test/web/web_sentry_js_binding_test.dart b/packages/flutter/test/web/web_sentry_js_binding_test.dart similarity index 100% rename from flutter/test/web/web_sentry_js_binding_test.dart rename to packages/flutter/test/web/web_sentry_js_binding_test.dart diff --git a/flutter/test/web/web_session_handler_test.dart b/packages/flutter/test/web/web_session_handler_test.dart similarity index 100% rename from flutter/test/web/web_session_handler_test.dart rename to packages/flutter/test/web/web_session_handler_test.dart diff --git a/flutter/test/widgets_binding_observer_test.dart b/packages/flutter/test/widgets_binding_observer_test.dart similarity index 100% rename from flutter/test/widgets_binding_observer_test.dart rename to packages/flutter/test/widgets_binding_observer_test.dart diff --git a/flutter/tool/presubmit.sh b/packages/flutter/tool/presubmit.sh similarity index 100% rename from flutter/tool/presubmit.sh rename to packages/flutter/tool/presubmit.sh diff --git a/flutter/windows/.gitignore b/packages/flutter/windows/.gitignore similarity index 94% rename from flutter/windows/.gitignore rename to packages/flutter/windows/.gitignore index 808064a0fa..b3eb2be169 100644 --- a/flutter/windows/.gitignore +++ b/packages/flutter/windows/.gitignore @@ -1,17 +1,17 @@ -flutter/ - -# Visual Studio user-specific files. -*.suo -*.user -*.userosscache -*.sln.docstates - -# Visual Studio build-related files. -x64/ -x86/ - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ +flutter/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/flutter/windows/CMakeLists.txt b/packages/flutter/windows/CMakeLists.txt similarity index 97% rename from flutter/windows/CMakeLists.txt rename to packages/flutter/windows/CMakeLists.txt index 9b1fcbcc5e..d8064dc4b9 100644 --- a/flutter/windows/CMakeLists.txt +++ b/packages/flutter/windows/CMakeLists.txt @@ -1,19 +1,19 @@ -# The Flutter tooling requires that developers have a version of Visual Studio -# installed that includes CMake 3.14 or later. You should not increase this -# version, as doing so will cause the plugin to fail to compile for some -# customers of the plugin. -cmake_minimum_required(VERSION 3.14) - -if(FLUTTER_TARGET_PLATFORM EQUAL "windows-arm64") - set(native_backend "breakpad") -else() - set(native_backend "crashpad") -endif() - -set(SENTRY_BACKEND ${native_backend} CACHE STRING "The sentry backend responsible for reporting crashes" FORCE) - -include("${CMAKE_CURRENT_SOURCE_DIR}/../sentry-native/sentry-native.cmake") - -# Even though sentry_flutter doesn't actually provide a useful plugin, we need to accommodate the Flutter tooling. -# sentry_flutter/sentry_flutter_plugin.h is included by the flutter-tool generated plugin registrar: -target_include_directories(sentry INTERFACE ${CMAKE_CURRENT_LIST_DIR}) +# The Flutter tooling requires that developers have a version of Visual Studio +# installed that includes CMake 3.14 or later. You should not increase this +# version, as doing so will cause the plugin to fail to compile for some +# customers of the plugin. +cmake_minimum_required(VERSION 3.14) + +if(FLUTTER_TARGET_PLATFORM EQUAL "windows-arm64") + set(native_backend "breakpad") +else() + set(native_backend "crashpad") +endif() + +set(SENTRY_BACKEND ${native_backend} CACHE STRING "The sentry backend responsible for reporting crashes" FORCE) + +include("${CMAKE_CURRENT_SOURCE_DIR}/../sentry-native/sentry-native.cmake") + +# Even though sentry_flutter doesn't actually provide a useful plugin, we need to accommodate the Flutter tooling. +# sentry_flutter/sentry_flutter_plugin.h is included by the flutter-tool generated plugin registrar: +target_include_directories(sentry INTERFACE ${CMAKE_CURRENT_LIST_DIR}) diff --git a/flutter/windows/sentry_flutter/sentry_flutter_plugin.h b/packages/flutter/windows/sentry_flutter/sentry_flutter_plugin.h similarity index 100% rename from flutter/windows/sentry_flutter/sentry_flutter_plugin.h rename to packages/flutter/windows/sentry_flutter/sentry_flutter_plugin.h diff --git a/hive/.gitignore b/packages/hive/.gitignore similarity index 100% rename from hive/.gitignore rename to packages/hive/.gitignore diff --git a/packages/hive/CHANGELOG.md b/packages/hive/CHANGELOG.md new file mode 120000 index 0000000000..699cc9e7b7 --- /dev/null +++ b/packages/hive/CHANGELOG.md @@ -0,0 +1 @@ +../../CHANGELOG.md \ No newline at end of file diff --git a/hive/LICENSE b/packages/hive/LICENSE similarity index 100% rename from hive/LICENSE rename to packages/hive/LICENSE diff --git a/hive/README.md b/packages/hive/README.md similarity index 100% rename from hive/README.md rename to packages/hive/README.md diff --git a/hive/analysis_options.yaml b/packages/hive/analysis_options.yaml similarity index 100% rename from hive/analysis_options.yaml rename to packages/hive/analysis_options.yaml diff --git a/hive/boxes_bad_keys.hive b/packages/hive/boxes_bad_keys.hive similarity index 100% rename from hive/boxes_bad_keys.hive rename to packages/hive/boxes_bad_keys.hive diff --git a/hive/dartdoc_options.yaml b/packages/hive/dartdoc_options.yaml similarity index 100% rename from hive/dartdoc_options.yaml rename to packages/hive/dartdoc_options.yaml diff --git a/hive/example/example.dart b/packages/hive/example/example.dart similarity index 100% rename from hive/example/example.dart rename to packages/hive/example/example.dart diff --git a/hive/lib/sentry_hive.dart b/packages/hive/lib/sentry_hive.dart similarity index 100% rename from hive/lib/sentry_hive.dart rename to packages/hive/lib/sentry_hive.dart diff --git a/hive/lib/src/default_compaction_strategy.dart b/packages/hive/lib/src/default_compaction_strategy.dart similarity index 100% rename from hive/lib/src/default_compaction_strategy.dart rename to packages/hive/lib/src/default_compaction_strategy.dart diff --git a/hive/lib/src/default_key_comparator.dart b/packages/hive/lib/src/default_key_comparator.dart similarity index 100% rename from hive/lib/src/default_key_comparator.dart rename to packages/hive/lib/src/default_key_comparator.dart diff --git a/hive/lib/src/sentry_box.dart b/packages/hive/lib/src/sentry_box.dart similarity index 100% rename from hive/lib/src/sentry_box.dart rename to packages/hive/lib/src/sentry_box.dart diff --git a/hive/lib/src/sentry_box_base.dart b/packages/hive/lib/src/sentry_box_base.dart similarity index 100% rename from hive/lib/src/sentry_box_base.dart rename to packages/hive/lib/src/sentry_box_base.dart diff --git a/hive/lib/src/sentry_box_collection.dart b/packages/hive/lib/src/sentry_box_collection.dart similarity index 100% rename from hive/lib/src/sentry_box_collection.dart rename to packages/hive/lib/src/sentry_box_collection.dart diff --git a/hive/lib/src/sentry_hive_impl.dart b/packages/hive/lib/src/sentry_hive_impl.dart similarity index 100% rename from hive/lib/src/sentry_hive_impl.dart rename to packages/hive/lib/src/sentry_hive_impl.dart diff --git a/hive/lib/src/sentry_hive_interface.dart b/packages/hive/lib/src/sentry_hive_interface.dart similarity index 100% rename from hive/lib/src/sentry_hive_interface.dart rename to packages/hive/lib/src/sentry_hive_interface.dart diff --git a/hive/lib/src/sentry_lazy_box.dart b/packages/hive/lib/src/sentry_lazy_box.dart similarity index 100% rename from hive/lib/src/sentry_lazy_box.dart rename to packages/hive/lib/src/sentry_lazy_box.dart diff --git a/hive/lib/src/sentry_span_helper.dart b/packages/hive/lib/src/sentry_span_helper.dart similarity index 100% rename from hive/lib/src/sentry_span_helper.dart rename to packages/hive/lib/src/sentry_span_helper.dart diff --git a/hive/lib/src/version.dart b/packages/hive/lib/src/version.dart similarity index 100% rename from hive/lib/src/version.dart rename to packages/hive/lib/src/version.dart diff --git a/hive/people-box-collection_bad_keys.hive b/packages/hive/people-box-collection_bad_keys.hive similarity index 100% rename from hive/people-box-collection_bad_keys.hive rename to packages/hive/people-box-collection_bad_keys.hive diff --git a/hive/pubspec.yaml b/packages/hive/pubspec.yaml similarity index 100% rename from hive/pubspec.yaml rename to packages/hive/pubspec.yaml diff --git a/packages/hive/pubspec_overrides.yaml b/packages/hive/pubspec_overrides.yaml new file mode 100644 index 0000000000..04ac16fe75 --- /dev/null +++ b/packages/hive/pubspec_overrides.yaml @@ -0,0 +1,4 @@ +# melos_managed_dependency_overrides: sentry +dependency_overrides: + sentry: + path: ../dart diff --git a/hive/test/mocks/mocks.dart b/packages/hive/test/mocks/mocks.dart similarity index 100% rename from hive/test/mocks/mocks.dart rename to packages/hive/test/mocks/mocks.dart diff --git a/hive/test/mocks/mocks.mocks.dart b/packages/hive/test/mocks/mocks.mocks.dart similarity index 100% rename from hive/test/mocks/mocks.mocks.dart rename to packages/hive/test/mocks/mocks.mocks.dart diff --git a/hive/test/person.dart b/packages/hive/test/person.dart similarity index 100% rename from hive/test/person.dart rename to packages/hive/test/person.dart diff --git a/hive/test/sentry_box_base_test.dart b/packages/hive/test/sentry_box_base_test.dart similarity index 100% rename from hive/test/sentry_box_base_test.dart rename to packages/hive/test/sentry_box_base_test.dart diff --git a/hive/test/sentry_box_collection_test.dart b/packages/hive/test/sentry_box_collection_test.dart similarity index 100% rename from hive/test/sentry_box_collection_test.dart rename to packages/hive/test/sentry_box_collection_test.dart diff --git a/hive/test/sentry_hive_impl_test.dart b/packages/hive/test/sentry_hive_impl_test.dart similarity index 100% rename from hive/test/sentry_hive_impl_test.dart rename to packages/hive/test/sentry_hive_impl_test.dart diff --git a/hive/test/sentry_lazy_box_test.dart b/packages/hive/test/sentry_lazy_box_test.dart similarity index 100% rename from hive/test/sentry_lazy_box_test.dart rename to packages/hive/test/sentry_lazy_box_test.dart diff --git a/hive/test/utils.dart b/packages/hive/test/utils.dart similarity index 100% rename from hive/test/utils.dart rename to packages/hive/test/utils.dart diff --git a/isar/.gitignore b/packages/isar/.gitignore similarity index 100% rename from isar/.gitignore rename to packages/isar/.gitignore diff --git a/isar/.metadata b/packages/isar/.metadata similarity index 100% rename from isar/.metadata rename to packages/isar/.metadata diff --git a/packages/isar/CHANGELOG.md b/packages/isar/CHANGELOG.md new file mode 120000 index 0000000000..699cc9e7b7 --- /dev/null +++ b/packages/isar/CHANGELOG.md @@ -0,0 +1 @@ +../../CHANGELOG.md \ No newline at end of file diff --git a/isar/LICENSE b/packages/isar/LICENSE similarity index 100% rename from isar/LICENSE rename to packages/isar/LICENSE diff --git a/isar/README.md b/packages/isar/README.md similarity index 100% rename from isar/README.md rename to packages/isar/README.md diff --git a/isar/analysis_options.yaml b/packages/isar/analysis_options.yaml similarity index 100% rename from isar/analysis_options.yaml rename to packages/isar/analysis_options.yaml diff --git a/isar/dartdoc_options.yaml b/packages/isar/dartdoc_options.yaml similarity index 100% rename from isar/dartdoc_options.yaml rename to packages/isar/dartdoc_options.yaml diff --git a/isar/example/main.dart b/packages/isar/example/main.dart similarity index 100% rename from isar/example/main.dart rename to packages/isar/example/main.dart diff --git a/isar/example/user.dart b/packages/isar/example/user.dart similarity index 100% rename from isar/example/user.dart rename to packages/isar/example/user.dart diff --git a/isar/example/user.g.dart b/packages/isar/example/user.g.dart similarity index 100% rename from isar/example/user.g.dart rename to packages/isar/example/user.g.dart diff --git a/isar/lib/sentry_isar.dart b/packages/isar/lib/sentry_isar.dart similarity index 100% rename from isar/lib/sentry_isar.dart rename to packages/isar/lib/sentry_isar.dart diff --git a/isar/lib/src/sentry_isar.dart b/packages/isar/lib/src/sentry_isar.dart similarity index 100% rename from isar/lib/src/sentry_isar.dart rename to packages/isar/lib/src/sentry_isar.dart diff --git a/isar/lib/src/sentry_isar_collection.dart b/packages/isar/lib/src/sentry_isar_collection.dart similarity index 100% rename from isar/lib/src/sentry_isar_collection.dart rename to packages/isar/lib/src/sentry_isar_collection.dart diff --git a/isar/lib/src/sentry_span_helper.dart b/packages/isar/lib/src/sentry_span_helper.dart similarity index 100% rename from isar/lib/src/sentry_span_helper.dart rename to packages/isar/lib/src/sentry_span_helper.dart diff --git a/isar/lib/src/version.dart b/packages/isar/lib/src/version.dart similarity index 100% rename from isar/lib/src/version.dart rename to packages/isar/lib/src/version.dart diff --git a/isar/pubspec.yaml b/packages/isar/pubspec.yaml similarity index 100% rename from isar/pubspec.yaml rename to packages/isar/pubspec.yaml diff --git a/packages/isar/pubspec_overrides.yaml b/packages/isar/pubspec_overrides.yaml new file mode 100644 index 0000000000..04ac16fe75 --- /dev/null +++ b/packages/isar/pubspec_overrides.yaml @@ -0,0 +1,4 @@ +# melos_managed_dependency_overrides: sentry +dependency_overrides: + sentry: + path: ../dart diff --git a/isar/test/mocks/mocks.dart b/packages/isar/test/mocks/mocks.dart similarity index 100% rename from isar/test/mocks/mocks.dart rename to packages/isar/test/mocks/mocks.dart diff --git a/isar/test/mocks/mocks.mocks.dart b/packages/isar/test/mocks/mocks.mocks.dart similarity index 100% rename from isar/test/mocks/mocks.mocks.dart rename to packages/isar/test/mocks/mocks.mocks.dart diff --git a/isar/test/person.dart b/packages/isar/test/person.dart similarity index 100% rename from isar/test/person.dart rename to packages/isar/test/person.dart diff --git a/isar/test/person.g.dart b/packages/isar/test/person.g.dart similarity index 100% rename from isar/test/person.g.dart rename to packages/isar/test/person.g.dart diff --git a/isar/test/sentry_isar_collection_test.dart b/packages/isar/test/sentry_isar_collection_test.dart similarity index 100% rename from isar/test/sentry_isar_collection_test.dart rename to packages/isar/test/sentry_isar_collection_test.dart diff --git a/isar/test/sentry_isar_test.dart b/packages/isar/test/sentry_isar_test.dart similarity index 100% rename from isar/test/sentry_isar_test.dart rename to packages/isar/test/sentry_isar_test.dart diff --git a/isar/test/utils.dart b/packages/isar/test/utils.dart similarity index 100% rename from isar/test/utils.dart rename to packages/isar/test/utils.dart diff --git a/link/.gitignore b/packages/link/.gitignore similarity index 100% rename from link/.gitignore rename to packages/link/.gitignore diff --git a/packages/link/CHANGELOG.md b/packages/link/CHANGELOG.md new file mode 120000 index 0000000000..699cc9e7b7 --- /dev/null +++ b/packages/link/CHANGELOG.md @@ -0,0 +1 @@ +../../CHANGELOG.md \ No newline at end of file diff --git a/link/CHANGELOG_OLD.md b/packages/link/CHANGELOG_OLD.md similarity index 100% rename from link/CHANGELOG_OLD.md rename to packages/link/CHANGELOG_OLD.md diff --git a/link/LICENSE b/packages/link/LICENSE similarity index 100% rename from link/LICENSE rename to packages/link/LICENSE diff --git a/link/README.md b/packages/link/README.md similarity index 100% rename from link/README.md rename to packages/link/README.md diff --git a/link/analysis_options.yaml b/packages/link/analysis_options.yaml similarity index 100% rename from link/analysis_options.yaml rename to packages/link/analysis_options.yaml diff --git a/logging/dartdoc_options.yaml b/packages/link/dartdoc_options.yaml similarity index 100% rename from logging/dartdoc_options.yaml rename to packages/link/dartdoc_options.yaml diff --git a/link/example/example.dart b/packages/link/example/example.dart similarity index 100% rename from link/example/example.dart rename to packages/link/example/example.dart diff --git a/link/lib/sentry_link.dart b/packages/link/lib/sentry_link.dart similarity index 100% rename from link/lib/sentry_link.dart rename to packages/link/lib/sentry_link.dart diff --git a/link/lib/src/extension.dart b/packages/link/lib/src/extension.dart similarity index 100% rename from link/lib/src/extension.dart rename to packages/link/lib/src/extension.dart diff --git a/link/lib/src/extractors.dart b/packages/link/lib/src/extractors.dart similarity index 100% rename from link/lib/src/extractors.dart rename to packages/link/lib/src/extractors.dart diff --git a/link/lib/src/graph_gl_filter.dart b/packages/link/lib/src/graph_gl_filter.dart similarity index 100% rename from link/lib/src/graph_gl_filter.dart rename to packages/link/lib/src/graph_gl_filter.dart diff --git a/link/lib/src/sentry_breadcrumb_link.dart b/packages/link/lib/src/sentry_breadcrumb_link.dart similarity index 100% rename from link/lib/src/sentry_breadcrumb_link.dart rename to packages/link/lib/src/sentry_breadcrumb_link.dart diff --git a/link/lib/src/sentry_gql.dart b/packages/link/lib/src/sentry_gql.dart similarity index 100% rename from link/lib/src/sentry_gql.dart rename to packages/link/lib/src/sentry_gql.dart diff --git a/link/lib/src/sentry_link.dart b/packages/link/lib/src/sentry_link.dart similarity index 100% rename from link/lib/src/sentry_link.dart rename to packages/link/lib/src/sentry_link.dart diff --git a/link/lib/src/sentry_request_serializer.dart b/packages/link/lib/src/sentry_request_serializer.dart similarity index 100% rename from link/lib/src/sentry_request_serializer.dart rename to packages/link/lib/src/sentry_request_serializer.dart diff --git a/link/lib/src/sentry_response_parser.dart b/packages/link/lib/src/sentry_response_parser.dart similarity index 100% rename from link/lib/src/sentry_response_parser.dart rename to packages/link/lib/src/sentry_response_parser.dart diff --git a/link/lib/src/sentry_tracing_link.dart b/packages/link/lib/src/sentry_tracing_link.dart similarity index 100% rename from link/lib/src/sentry_tracing_link.dart rename to packages/link/lib/src/sentry_tracing_link.dart diff --git a/link/pubspec.yaml b/packages/link/pubspec.yaml similarity index 100% rename from link/pubspec.yaml rename to packages/link/pubspec.yaml diff --git a/packages/link/pubspec_overrides.yaml b/packages/link/pubspec_overrides.yaml new file mode 100644 index 0000000000..04ac16fe75 --- /dev/null +++ b/packages/link/pubspec_overrides.yaml @@ -0,0 +1,4 @@ +# melos_managed_dependency_overrides: sentry +dependency_overrides: + sentry: + path: ../dart diff --git a/link/screenshot.png b/packages/link/screenshot.png similarity index 100% rename from link/screenshot.png rename to packages/link/screenshot.png diff --git a/link/test/graph_gl_filter_test.dart b/packages/link/test/graph_gl_filter_test.dart similarity index 100% rename from link/test/graph_gl_filter_test.dart rename to packages/link/test/graph_gl_filter_test.dart diff --git a/link/test/link_exception_extractor_test.dart b/packages/link/test/link_exception_extractor_test.dart similarity index 100% rename from link/test/link_exception_extractor_test.dart rename to packages/link/test/link_exception_extractor_test.dart diff --git a/logging/.gitignore b/packages/logging/.gitignore similarity index 100% rename from logging/.gitignore rename to packages/logging/.gitignore diff --git a/packages/logging/CHANGELOG.md b/packages/logging/CHANGELOG.md new file mode 120000 index 0000000000..699cc9e7b7 --- /dev/null +++ b/packages/logging/CHANGELOG.md @@ -0,0 +1 @@ +../../CHANGELOG.md \ No newline at end of file diff --git a/logging/LICENSE b/packages/logging/LICENSE similarity index 100% rename from logging/LICENSE rename to packages/logging/LICENSE diff --git a/logging/README.md b/packages/logging/README.md similarity index 100% rename from logging/README.md rename to packages/logging/README.md diff --git a/logging/analysis_options.yaml b/packages/logging/analysis_options.yaml similarity index 100% rename from logging/analysis_options.yaml rename to packages/logging/analysis_options.yaml diff --git a/logging/class-diagram.svg b/packages/logging/class-diagram.svg similarity index 100% rename from logging/class-diagram.svg rename to packages/logging/class-diagram.svg diff --git a/sqflite/dartdoc_options.yaml b/packages/logging/dartdoc_options.yaml similarity index 100% rename from sqflite/dartdoc_options.yaml rename to packages/logging/dartdoc_options.yaml diff --git a/logging/example/sentry_logging_example.dart b/packages/logging/example/sentry_logging_example.dart similarity index 100% rename from logging/example/sentry_logging_example.dart rename to packages/logging/example/sentry_logging_example.dart diff --git a/logging/lib/sentry_logging.dart b/packages/logging/lib/sentry_logging.dart similarity index 100% rename from logging/lib/sentry_logging.dart rename to packages/logging/lib/sentry_logging.dart diff --git a/logging/lib/src/extension.dart b/packages/logging/lib/src/extension.dart similarity index 100% rename from logging/lib/src/extension.dart rename to packages/logging/lib/src/extension.dart diff --git a/logging/lib/src/logging_integration.dart b/packages/logging/lib/src/logging_integration.dart similarity index 100% rename from logging/lib/src/logging_integration.dart rename to packages/logging/lib/src/logging_integration.dart diff --git a/logging/lib/src/version.dart b/packages/logging/lib/src/version.dart similarity index 100% rename from logging/lib/src/version.dart rename to packages/logging/lib/src/version.dart diff --git a/logging/pubspec.yaml b/packages/logging/pubspec.yaml similarity index 100% rename from logging/pubspec.yaml rename to packages/logging/pubspec.yaml diff --git a/packages/logging/pubspec_overrides.yaml b/packages/logging/pubspec_overrides.yaml new file mode 100644 index 0000000000..04ac16fe75 --- /dev/null +++ b/packages/logging/pubspec_overrides.yaml @@ -0,0 +1,4 @@ +# melos_managed_dependency_overrides: sentry +dependency_overrides: + sentry: + path: ../dart diff --git a/logging/test/extension_test.dart b/packages/logging/test/extension_test.dart similarity index 100% rename from logging/test/extension_test.dart rename to packages/logging/test/extension_test.dart diff --git a/logging/test/logging_integration_test.dart b/packages/logging/test/logging_integration_test.dart similarity index 100% rename from logging/test/logging_integration_test.dart rename to packages/logging/test/logging_integration_test.dart diff --git a/logging/test/mock_hub.dart b/packages/logging/test/mock_hub.dart similarity index 100% rename from logging/test/mock_hub.dart rename to packages/logging/test/mock_hub.dart diff --git a/logging/test/no_such_method_provider.dart b/packages/logging/test/no_such_method_provider.dart similarity index 100% rename from logging/test/no_such_method_provider.dart rename to packages/logging/test/no_such_method_provider.dart diff --git a/logging/test/version_test.dart b/packages/logging/test/version_test.dart similarity index 100% rename from logging/test/version_test.dart rename to packages/logging/test/version_test.dart diff --git a/sqflite/.gitignore b/packages/sqflite/.gitignore similarity index 100% rename from sqflite/.gitignore rename to packages/sqflite/.gitignore diff --git a/packages/sqflite/CHANGELOG.md b/packages/sqflite/CHANGELOG.md new file mode 120000 index 0000000000..699cc9e7b7 --- /dev/null +++ b/packages/sqflite/CHANGELOG.md @@ -0,0 +1 @@ +../../CHANGELOG.md \ No newline at end of file diff --git a/sqflite/LICENSE b/packages/sqflite/LICENSE similarity index 100% rename from sqflite/LICENSE rename to packages/sqflite/LICENSE diff --git a/sqflite/README.md b/packages/sqflite/README.md similarity index 100% rename from sqflite/README.md rename to packages/sqflite/README.md diff --git a/sqflite/analysis_options.yaml b/packages/sqflite/analysis_options.yaml similarity index 100% rename from sqflite/analysis_options.yaml rename to packages/sqflite/analysis_options.yaml diff --git a/sqflite/class-diagram.svg b/packages/sqflite/class-diagram.svg similarity index 100% rename from sqflite/class-diagram.svg rename to packages/sqflite/class-diagram.svg diff --git a/packages/sqflite/dartdoc_options.yaml b/packages/sqflite/dartdoc_options.yaml new file mode 120000 index 0000000000..7cbb8c0d74 --- /dev/null +++ b/packages/sqflite/dartdoc_options.yaml @@ -0,0 +1 @@ +../dart/dartdoc_options.yaml \ No newline at end of file diff --git a/sqflite/example/example.dart b/packages/sqflite/example/example.dart similarity index 100% rename from sqflite/example/example.dart rename to packages/sqflite/example/example.dart diff --git a/sqflite/lib/sentry_sqflite.dart b/packages/sqflite/lib/sentry_sqflite.dart similarity index 100% rename from sqflite/lib/sentry_sqflite.dart rename to packages/sqflite/lib/sentry_sqflite.dart diff --git a/sqflite/lib/src/sentry_batch.dart b/packages/sqflite/lib/src/sentry_batch.dart similarity index 100% rename from sqflite/lib/src/sentry_batch.dart rename to packages/sqflite/lib/src/sentry_batch.dart diff --git a/sqflite/lib/src/sentry_database.dart b/packages/sqflite/lib/src/sentry_database.dart similarity index 100% rename from sqflite/lib/src/sentry_database.dart rename to packages/sqflite/lib/src/sentry_database.dart diff --git a/sqflite/lib/src/sentry_database_executor.dart b/packages/sqflite/lib/src/sentry_database_executor.dart similarity index 100% rename from sqflite/lib/src/sentry_database_executor.dart rename to packages/sqflite/lib/src/sentry_database_executor.dart diff --git a/sqflite/lib/src/sentry_sqflite.dart b/packages/sqflite/lib/src/sentry_sqflite.dart similarity index 100% rename from sqflite/lib/src/sentry_sqflite.dart rename to packages/sqflite/lib/src/sentry_sqflite.dart diff --git a/sqflite/lib/src/sentry_sqflite_database_factory.dart b/packages/sqflite/lib/src/sentry_sqflite_database_factory.dart similarity index 100% rename from sqflite/lib/src/sentry_sqflite_database_factory.dart rename to packages/sqflite/lib/src/sentry_sqflite_database_factory.dart diff --git a/sqflite/lib/src/sentry_sqflite_transaction.dart b/packages/sqflite/lib/src/sentry_sqflite_transaction.dart similarity index 100% rename from sqflite/lib/src/sentry_sqflite_transaction.dart rename to packages/sqflite/lib/src/sentry_sqflite_transaction.dart diff --git a/sqflite/lib/src/utils/sentry_database_span_attributes.dart b/packages/sqflite/lib/src/utils/sentry_database_span_attributes.dart similarity index 100% rename from sqflite/lib/src/utils/sentry_database_span_attributes.dart rename to packages/sqflite/lib/src/utils/sentry_database_span_attributes.dart diff --git a/sqflite/lib/src/version.dart b/packages/sqflite/lib/src/version.dart similarity index 100% rename from sqflite/lib/src/version.dart rename to packages/sqflite/lib/src/version.dart diff --git a/sqflite/pubspec.yaml b/packages/sqflite/pubspec.yaml similarity index 100% rename from sqflite/pubspec.yaml rename to packages/sqflite/pubspec.yaml diff --git a/packages/sqflite/pubspec_overrides.yaml b/packages/sqflite/pubspec_overrides.yaml new file mode 100644 index 0000000000..04ac16fe75 --- /dev/null +++ b/packages/sqflite/pubspec_overrides.yaml @@ -0,0 +1,4 @@ +# melos_managed_dependency_overrides: sentry +dependency_overrides: + sentry: + path: ../dart diff --git a/sqflite/test/mocks/mocks.dart b/packages/sqflite/test/mocks/mocks.dart similarity index 100% rename from sqflite/test/mocks/mocks.dart rename to packages/sqflite/test/mocks/mocks.dart diff --git a/sqflite/test/mocks/mocks.mocks.dart b/packages/sqflite/test/mocks/mocks.mocks.dart similarity index 100% rename from sqflite/test/mocks/mocks.mocks.dart rename to packages/sqflite/test/mocks/mocks.mocks.dart diff --git a/sqflite/test/sentry_batch_test.dart b/packages/sqflite/test/sentry_batch_test.dart similarity index 100% rename from sqflite/test/sentry_batch_test.dart rename to packages/sqflite/test/sentry_batch_test.dart diff --git a/sqflite/test/sentry_database_test.dart b/packages/sqflite/test/sentry_database_test.dart similarity index 100% rename from sqflite/test/sentry_database_test.dart rename to packages/sqflite/test/sentry_database_test.dart diff --git a/sqflite/test/sentry_sqflite_database_factory_dart_test.dart b/packages/sqflite/test/sentry_sqflite_database_factory_dart_test.dart similarity index 100% rename from sqflite/test/sentry_sqflite_database_factory_dart_test.dart rename to packages/sqflite/test/sentry_sqflite_database_factory_dart_test.dart diff --git a/sqflite/test/sentry_sqflite_test.dart b/packages/sqflite/test/sentry_sqflite_test.dart similarity index 100% rename from sqflite/test/sentry_sqflite_test.dart rename to packages/sqflite/test/sentry_sqflite_test.dart diff --git a/sqflite/test/utils.dart b/packages/sqflite/test/utils.dart similarity index 100% rename from sqflite/test/utils.dart rename to packages/sqflite/test/utils.dart diff --git a/sqflite/test/version_test.dart b/packages/sqflite/test/version_test.dart similarity index 100% rename from sqflite/test/version_test.dart rename to packages/sqflite/test/version_test.dart diff --git a/pubspec.yaml b/pubspec.yaml new file mode 100644 index 0000000000..8745560d7f --- /dev/null +++ b/pubspec.yaml @@ -0,0 +1,9 @@ +name: sentry_dart_workspace +publish_to: 'none' +repository: https://github.com/getsentry/sentry-dart/ + +environment: + sdk: '>=3.5.0 <4.0.0' + +dev_dependencies: + melos: ^6.3.3 \ No newline at end of file diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index 4b495014ed..c87b7d733d 100755 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -12,12 +12,12 @@ echo "Bumping version: ${NEW_VERSION}" for pkg in {dart,flutter,logging,dio,file,sqflite,drift,hive,isar,link,firebase_remote_config}; do # Bump version in pubspec.yaml - perl -pi -e "s/^version: .*/version: $NEW_VERSION/" $pkg/pubspec.yaml + perl -pi -e "s/^version: .*/version: $NEW_VERSION/" packages/$pkg/pubspec.yaml # Bump sentry dependency version in pubspec.yaml - perl -pi -e "s/sentry: .*/sentry: $NEW_VERSION/" $pkg/pubspec.yaml + perl -pi -e "s/sentry: .*/sentry: $NEW_VERSION/" packages/$pkg/pubspec.yaml done # Bump version in version.dart -perl -pi -e "s/sdkVersion = '.*'/sdkVersion = '$NEW_VERSION'/" */lib/src/version.dart +perl -pi -e "s/sdkVersion = '.*'/sdkVersion = '$NEW_VERSION'/" packages/*/lib/src/version.dart # Bump version in flutter example -perl -pi -e "s/^version: .*/version: $NEW_VERSION/" flutter/example/pubspec.yaml +perl -pi -e "s/^version: .*/version: $NEW_VERSION/" packages/flutter/example/pubspec.yaml diff --git a/sqflite/CHANGELOG.md b/sqflite/CHANGELOG.md deleted file mode 120000 index 04c99a55ca..0000000000 --- a/sqflite/CHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -../CHANGELOG.md \ No newline at end of file diff --git a/sqflite/pubspec_overrides.yaml b/sqflite/pubspec_overrides.yaml deleted file mode 100644 index 16e71d16f0..0000000000 --- a/sqflite/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - sentry: - path: ../dart