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/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/dartdoc_options.yaml b/isar/dartdoc_options.yaml deleted file mode 120000 index fcb0f9cc26..0000000000 --- a/isar/dartdoc_options.yaml +++ /dev/null @@ -1 +0,0 @@ -../packages/dart/dartdoc_options.yaml \ No newline at end of file diff --git a/isar/pubspec_overrides.yaml b/isar/pubspec_overrides.yaml deleted file mode 100644 index 0a17afda20..0000000000 --- a/isar/pubspec_overrides.yaml +++ /dev/null @@ -1,3 +0,0 @@ -dependency_overrides: - sentry: - path: ../packages/dart diff --git a/packages/flutter/example/pubspec_overrides.yaml b/packages/flutter/example/pubspec_overrides.yaml index 65ee86ab7c..48859e298c 100644 --- a/packages/flutter/example/pubspec_overrides.yaml +++ b/packages/flutter/example/pubspec_overrides.yaml @@ -17,7 +17,7 @@ dependency_overrides: sentry_drift: path: ../../drift sentry_isar: - path: ../../../isar + path: ../../isar # isar community fork is more stable isar: version: ^3.1.0 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/packages/isar/dartdoc_options.yaml b/packages/isar/dartdoc_options.yaml new file mode 120000 index 0000000000..7cbb8c0d74 --- /dev/null +++ b/packages/isar/dartdoc_options.yaml @@ -0,0 +1 @@ +../dart/dartdoc_options.yaml \ No newline at end of file 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