From 610424480b585f2c9e3b9e2b143c9dea394a0e68 Mon Sep 17 00:00:00 2001 From: Vicente Russo Date: Sat, 23 Mar 2024 00:29:50 -0300 Subject: [PATCH 01/11] Adds own analytics IDs --- docs/docs/.vuepress/config.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/docs/.vuepress/config.ts b/docs/docs/.vuepress/config.ts index 724ce346b..9a6056acc 100644 --- a/docs/docs/.vuepress/config.ts +++ b/docs/docs/.vuepress/config.ts @@ -133,7 +133,7 @@ export default defineUserConfig({ "script", { async: "", - src: "https://www.googletagmanager.com/gtag/js?id=G-NX9QJRWFGX", + src: "https://www.googletagmanager.com/gtag/js?id=G-36LNDL9RHB", }, ], [ @@ -142,7 +142,7 @@ export default defineUserConfig({ `window.dataLayer = window.dataLayer || []; function gtag(){dataLayer.push(arguments);} gtag('js', new Date()); - gtag('config', 'G-NX9QJRWFGX');`, + gtag('config', 'G-36LNDL9RHB');`, ], [ "script", @@ -151,7 +151,7 @@ export default defineUserConfig({ c[a]=c[a]||function(){(c[a].q=c[a].q||[]).push(arguments)}; t=l.createElement(r);t.async=1;t.src="https://www.clarity.ms/tag/"+i; y=l.getElementsByTagName(r)[0];y.parentNode.insertBefore(t,y); - })(window, document, "clarity", "script", "ciawnmxjdh");`, + })(window, document, "clarity", "script", "lkyzg3xacc");`, ], ], }) From 8cb7b25dca0387153c6255badfa689979fb94861 Mon Sep 17 00:00:00 2001 From: Vicente Russo Date: Sat, 23 Mar 2024 00:30:40 -0300 Subject: [PATCH 02/11] "vx.x" to be replaced in deployment --- docs/docs/.vuepress/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/.vuepress/config.ts b/docs/docs/.vuepress/config.ts index 9a6056acc..98ad475b5 100644 --- a/docs/docs/.vuepress/config.ts +++ b/docs/docs/.vuepress/config.ts @@ -65,7 +65,7 @@ export default defineUserConfig({ link: "https://t.me/isardb", }, { - text: "3.x", + text: "vx.x", children: [ { text: "v4.x", From bab3158fc70a85ad82bc8262e7fbe7406bbf0b2b Mon Sep 17 00:00:00 2001 From: Vicente Russo Date: Sat, 23 Mar 2024 00:31:09 -0300 Subject: [PATCH 03/11] Deployment to github pages --- .github/workflows/docs.yaml | 69 ++++++++++++++++++++++++++----------- 1 file changed, 48 insertions(+), 21 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 92bcd83a0..097f09574 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -1,40 +1,67 @@ -name: Docs +name: Unified Deploy Docs on: push: branches: + - main - v3 -permissions: - contents: read - pages: write - id-token: write - -concurrency: - group: "pages" - cancel-in-progress: true - jobs: - build_docs: - name: Build and deploy Docs + deploy: runs-on: ubuntu-latest environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} + permissions: + contents: write + id-token: write + pages: write steps: - - uses: actions/checkout@v3 - - name: Build - working-directory: docs + - name: Checkout v3 branch + uses: actions/checkout@v4 + with: + ref: "v3" + path: "v3" + + - name: Build v3 docs + run: | + cd v3/docs + sed -i'.bak' "s|base:.*|base: '/v3/',|" docs/.vuepress/config.ts + sed -i 's|text: "vx.x"|text: "v3.x"|' docs/.vuepress/config.ts + npm ci + npm run build + mv ./docs/.vuepress/dist ../../v3-docs + + - name: Checkout main branch + uses: actions/checkout@v4 + with: + ref: "main" + path: "main" + + - name: Build main docs run: | - npm install + cd main/docs + sed -i'.bak' "s|base:.*|base: '/',|" docs/.vuepress/config.ts + sed -i 's|text: "vx.x"|text: "v4.x"|' docs/.vuepress/config.ts + npm ci npm run build - touch docs/.vuepress/dist/.nojekyll + mv ./docs/.vuepress/dist ../../main-docs + + - name: Prepare deployment directory + run: | + mkdir deploy + mv main-docs/* deploy/ + mkdir deploy/v3 + mv v3-docs/* deploy/v3/ + - name: Setup Pages - uses: actions/configure-pages@v2 + uses: actions/configure-pages@v4 + - name: Upload artifact - uses: actions/upload-pages-artifact@v1 + uses: actions/upload-pages-artifact@v3 with: - path: docs/docs/.vuepress/dist + path: deploy + - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v1 + uses: actions/deploy-pages@v4 \ No newline at end of file From 30ed6165b4cf7cd22c9c0f6ed16130243984aa49 Mon Sep 17 00:00:00 2001 From: Vicente Russo Date: Sat, 23 Mar 2024 00:37:05 -0300 Subject: [PATCH 04/11] Fix repo links --- docs/docs/.vuepress/config.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/docs/.vuepress/config.ts b/docs/docs/.vuepress/config.ts index 98ad475b5..0f44277e1 100644 --- a/docs/docs/.vuepress/config.ts +++ b/docs/docs/.vuepress/config.ts @@ -46,8 +46,8 @@ export default defineUserConfig({ base: '/v3/', theme: defaultTheme({ logo: "/isar.svg", - repo: "isar/isar", - docsRepo: "isar/isar", + repo: "isar-community/isar", + docsRepo: "isar-community/isar", docsDir: "docs/docs", contributors: true, locales: themeLocales, @@ -69,7 +69,7 @@ export default defineUserConfig({ children: [ { text: "v4.x", - link: "https://isar-community.dev/", + link: "https://isar-community.dev", }, { text: "v3.x", From 08ef54b3a0c06c35ab6824db76e87899c786453f Mon Sep 17 00:00:00 2001 From: Vicente Russo Date: Sat, 23 Mar 2024 00:52:33 -0300 Subject: [PATCH 05/11] Tests fixes and small adjustments --- .github/workflows/release.yaml | 22 ++++++---- .github/workflows/test.yaml | 76 +++++++++++++++++++++++++--------- .github/workflows/testlab.yaml | 8 ++-- 3 files changed, 76 insertions(+), 30 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 73a52d317..572b78114 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -9,12 +9,18 @@ jobs: verify_version: name: Verify version matches release runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] + sdk: [3.0.0] steps: - - uses: actions/checkout@v3 - - uses: dart-lang/setup-dart@v1 + - uses: actions/checkout@v4 + - uses: subosito/flutter-action@v2 + with: + flutter-version: ${{ vars.FLUTTER_VERSION }} - name: Verify release version run: | - dart pub get + flutter pub get dart tool/verify_release_version.dart ${{ github.ref_name }} working-directory: packages/isar @@ -56,7 +62,7 @@ jobs: permissions: contents: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Prepare Build uses: ./.github/actions/prepare-build - name: Set env @@ -81,8 +87,10 @@ jobs: needs: build_binaries runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: subosito/flutter-action@v2 + with: + flutter-version: ${{ vars.FLUTTER_VERSION }} - name: Build run: flutter build web --base-href /${{ github.ref_name }}/ working-directory: packages/isar_inspector @@ -90,7 +98,7 @@ jobs: uses: JamesIves/github-pages-deploy-action@v4 with: folder: packages/isar_inspector/build/web - repository-name: isar/inspector + repository-name: isar-community/inspector token: ${{ secrets.TOKEN }} target-folder: ${{ github.ref_name }} clean: false @@ -100,7 +108,7 @@ jobs: # needs: build_inspector # runs-on: ubuntu-latest # steps: - # - uses: actions/checkout@v3 + # - uses: actions/checkout@v4 # - uses: subosito/flutter-action@v2 # - name: pub get # run: dart pub get diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 2d81df057..72a34c7ad 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -9,15 +9,26 @@ on: - v3 jobs: + version: + name: Version Display + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Setup Flutter + uses: subosito/flutter-action@v2 + with: + flutter-version: ${{ vars.FLUTTER_VERSION }} + - run: flutter --version + format: name: Check formatting runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: ${{ secrets.FLUTTER_VERSION }} + flutter-version: ${{ vars.FLUTTER_VERSION }} - name: Check formatting run: dart format --set-exit-if-changed . @@ -26,11 +37,11 @@ jobs: runs-on: ubuntu-latest if: ${{ false }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: ${{ secrets.FLUTTER_VERSION }} + flutter-version: ${{ vars.FLUTTER_VERSION }} - run: flutter pub get working-directory: packages/isar - run: flutter pub get @@ -39,6 +50,8 @@ jobs: working-directory: packages/isar_generator - run: flutter pub get working-directory: packages/isar_inspector + - run: flutter pub get + working-directory: examples/pub - run: | flutter pub get flutter pub run build_runner build @@ -56,8 +69,10 @@ jobs: runs-on: ${{ matrix.os }} steps: - run: echo "$OSTYPE" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: subosito/flutter-action@v2 + with: + flutter-version: ${{ vars.FLUTTER_VERSION }} - name: Prepare Build uses: ./.github/actions/prepare-build - name: Build Isar Core @@ -73,8 +88,10 @@ jobs: runs-on: ubuntu-latest if: ${{ false }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: subosito/flutter-action@v2 + with: + flutter-version: ${{ vars.FLUTTER_VERSION }} - name: Prepare Build uses: ./.github/actions/prepare-build - name: Install valgrind and llvm @@ -99,8 +116,10 @@ jobs: name: Code Coverage runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: subosito/flutter-action@v2 + with: + flutter-version: ${{ vars.FLUTTER_VERSION }} - name: Prepare Build uses: ./.github/actions/prepare-build - name: Build Isar Core @@ -134,8 +153,10 @@ jobs: name: Generator Test runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: subosito/flutter-action@v2 + with: + flutter-version: ${{ vars.FLUTTER_VERSION }} - name: Run Generator Unit tests run: | dart pub get @@ -146,12 +167,14 @@ jobs: name: Integration Test iOS runs-on: macos-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Start simulator uses: futureware-tech/simulator-action@v2 with: model: iPhone 13 - uses: subosito/flutter-action@v2 + with: + flutter-version: ${{ vars.FLUTTER_VERSION }} - name: Prepare Build uses: ./.github/actions/prepare-build - name: Build Isar Core @@ -168,12 +191,14 @@ jobs: name: Integration Test Android runs-on: macos-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v3 with: java-version: "11" distribution: "zulu" - uses: subosito/flutter-action@v2 + with: + flutter-version: ${{ vars.FLUTTER_VERSION }} - name: Prepare Build uses: ./.github/actions/prepare-build - name: Build Isar Core @@ -200,10 +225,11 @@ jobs: name: Integration Test macOS runs-on: macos-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: subosito/flutter-action@v2 with: - flutter-version: "3.3.10" # https://github.com/flutter/flutter/issues/118469 + # flutter-version: "3.3.10" # https://github.com/flutter/flutter/issues/118469 + flutter-version: ${{ vars.FLUTTER_VERSION }} - name: Prepare Build uses: ./.github/actions/prepare-build - name: Build Isar Core @@ -215,7 +241,7 @@ jobs: run: sh tool/prepare_tests.sh - name: Run Flutter Driver tests run: | - flutter config --enable-macos-desktop + flutter config --enable-macos-desktop flutter test -d macos integration_test/integration_test.dart --dart-define STRESS=true working-directory: packages/isar_test @@ -223,8 +249,10 @@ jobs: name: Integration Test Linux runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: subosito/flutter-action@v2 + with: + flutter-version: ${{ vars.FLUTTER_VERSION }} - name: Prepare Build uses: ./.github/actions/prepare-build - name: Install Linux requirements @@ -239,7 +267,7 @@ jobs: run: sh tool/prepare_tests.sh - name: Run Flutter Driver tests run: | - flutter config --enable-linux-desktop + flutter config --enable-linux-desktop flutter test -d linux integration_test/integration_test.dart --dart-define STRESS=true working-directory: packages/isar_test @@ -248,8 +276,10 @@ jobs: runs-on: windows-2019 if: ${{ false }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: subosito/flutter-action@v2 + with: + flutter-version: ${{ vars.FLUTTER_VERSION }} - name: Prepare Build uses: ./.github/actions/prepare-build - name: Build Isar Core @@ -260,7 +290,7 @@ jobs: run: sh tool/prepare_tests.sh - name: Run Flutter Driver tests run: | - flutter config --enable-windows-desktop + flutter config --enable-windows-desktop flutter test -d windows integration_test/integration_test.dart --dart-define STRESS=true working-directory: packages/isar_test @@ -268,8 +298,10 @@ jobs: runs-on: ubuntu-latest if: ${{ false }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: subosito/flutter-action@v2 + with: + flutter-version: ${{ vars.FLUTTER_VERSION }} - name: Install chromedricer uses: nanasess/setup-chromedriver@v1 - name: Prepare chromedricer @@ -287,8 +319,10 @@ jobs: runs-on: macos-latest if: ${{ false }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: subosito/flutter-action@v2 + with: + flutter-version: ${{ vars.FLUTTER_VERSION }} - name: Prepare safaridricer run: | sudo safaridriver --enable @@ -306,8 +340,10 @@ jobs: runs-on: ubuntu-latest if: ${{ false }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: subosito/flutter-action@v2 + with: + flutter-version: ${{ vars.FLUTTER_VERSION }} - name: Install geckodriver uses: browser-actions/setup-geckodriver@latest - name: Prepare geckodriver diff --git a/.github/workflows/testlab.yaml b/.github/workflows/testlab.yaml index b25ba33ce..30a0efcb4 100644 --- a/.github/workflows/testlab.yaml +++ b/.github/workflows/testlab.yaml @@ -5,8 +5,10 @@ jobs: name: Firebase Testlab Android runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: subosito/flutter-action@v2 + with: + flutter-version: ${{ vars.FLUTTER_VERSION }} - name: Prepare Build uses: ./.github/actions/prepare-build - name: Build Isar Core arm64 @@ -36,7 +38,7 @@ jobs: - name: Run tests run: | gcloud firebase test android run \ - --project honeyy \ + --project isar-community \ --type instrumentation \ --timeout 5m \ --device model=hammerhead,version=23 \ @@ -44,4 +46,4 @@ jobs: --device model=cheetah,version=33 \ --app build/app/outputs/apk/debug/app-debug.apk \ --test build/app/outputs/apk/androidTest/debug/app-debug-androidTest.apk - working-directory: packages/isar_test + working-directory: packages/isar_test \ No newline at end of file From d35f1489c368add066ce81adbe8a5fcb170c9fb6 Mon Sep 17 00:00:00 2001 From: Vicente Russo Date: Sat, 23 Mar 2024 01:02:50 -0300 Subject: [PATCH 06/11] Dart Format --- packages/isar/lib/src/native/isar_core.dart | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/isar/lib/src/native/isar_core.dart b/packages/isar/lib/src/native/isar_core.dart index 35efab105..10bad31ba 100644 --- a/packages/isar/lib/src/native/isar_core.dart +++ b/packages/isar/lib/src/native/isar_core.dart @@ -37,7 +37,8 @@ const nullBool = IsarObject_NULL_BOOL; const falseBool = IsarObject_FALSE_BOOL; const trueBool = IsarObject_TRUE_BOOL; -const String _githubUrl = 'https://github.com/isar-community/isar/releases/download'; +const String _githubUrl = + 'https://github.com/isar-community/isar/releases/download'; bool _isarInitialized = false; @@ -119,7 +120,9 @@ String _getLibraryDownloadPath(Map libraries) { if (Platform.script.path.isEmpty) { return name; } - var dir = Platform.script.pathSegments.sublist(0, Platform.script.pathSegments.length - 1).join(Platform.pathSeparator); + var dir = Platform.script.pathSegments + .sublist(0, Platform.script.pathSegments.length - 1) + .join(Platform.pathSeparator); if (!Platform.isWindows) { // Not on windows, add leading platform path separator dir = '${Platform.pathSeparator}$dir'; From 05a6d675885ff0422633f8b4c129236f490ab562 Mon Sep 17 00:00:00 2001 From: Vicente Russo Date: Sat, 23 Mar 2024 01:05:43 -0300 Subject: [PATCH 07/11] Dart Format --- packages/isar/lib/src/native/isar_core.dart | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/isar/lib/src/native/isar_core.dart b/packages/isar/lib/src/native/isar_core.dart index 35efab105..10bad31ba 100644 --- a/packages/isar/lib/src/native/isar_core.dart +++ b/packages/isar/lib/src/native/isar_core.dart @@ -37,7 +37,8 @@ const nullBool = IsarObject_NULL_BOOL; const falseBool = IsarObject_FALSE_BOOL; const trueBool = IsarObject_TRUE_BOOL; -const String _githubUrl = 'https://github.com/isar-community/isar/releases/download'; +const String _githubUrl = + 'https://github.com/isar-community/isar/releases/download'; bool _isarInitialized = false; @@ -119,7 +120,9 @@ String _getLibraryDownloadPath(Map libraries) { if (Platform.script.path.isEmpty) { return name; } - var dir = Platform.script.pathSegments.sublist(0, Platform.script.pathSegments.length - 1).join(Platform.pathSeparator); + var dir = Platform.script.pathSegments + .sublist(0, Platform.script.pathSegments.length - 1) + .join(Platform.pathSeparator); if (!Platform.isWindows) { // Not on windows, add leading platform path separator dir = '${Platform.pathSeparator}$dir'; From c21cc52adcb70febe2df2295c923799e2eb81785 Mon Sep 17 00:00:00 2001 From: Vicente Russo Date: Sat, 23 Mar 2024 01:12:42 -0300 Subject: [PATCH 08/11] fixed windows building --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index df62b1bd4..efe69f880 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,5 @@ [workspace] +resolver = "2" members = [ "packages/isar_core", "packages/isar_core_ffi", From e7011a99dc28fcfc7fba4bbbd347885ca4b6f29c Mon Sep 17 00:00:00 2001 From: Vicente Russo Date: Sat, 23 Mar 2024 01:28:08 -0300 Subject: [PATCH 09/11] Dart format using correct sdk version --- packages/isar/lib/src/native/bindings.dart | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/isar/lib/src/native/bindings.dart b/packages/isar/lib/src/native/bindings.dart index bfe7b2b4a..734bc9d1f 100644 --- a/packages/isar/lib/src/native/bindings.dart +++ b/packages/isar/lib/src/native/bindings.dart @@ -2024,8 +2024,8 @@ class IsarCoreBindings { } late final _isar_q_aggregate_long_resultPtr = _lookup< - ffi - .NativeFunction)>>( + ffi.NativeFunction< + ffi.Int64 Function(ffi.Pointer)>>( 'isar_q_aggregate_long_result'); late final _isar_q_aggregate_long_result = _isar_q_aggregate_long_resultPtr .asFunction)>(); @@ -2088,9 +2088,9 @@ class IsarCoreBindings { } late final _isar_txn_finishPtr = _lookup< - ffi - .NativeFunction, ffi.Bool)>>( - 'isar_txn_finish'); + ffi.NativeFunction< + ffi.Int64 Function( + ffi.Pointer, ffi.Bool)>>('isar_txn_finish'); late final _isar_txn_finish = _isar_txn_finishPtr .asFunction, bool)>(); From d83399b30003ba4e88651ecd582e1a81efd70408 Mon Sep 17 00:00:00 2001 From: Vicente Russo Date: Sat, 23 Mar 2024 01:39:23 -0300 Subject: [PATCH 10/11] versions adjustments and updates --- packages/isar/pubspec.yaml | 4 +++- packages/isar_flutter_libs/pubspec.yaml | 5 ++--- packages/isar_generator/pubspec.yaml | 5 ++--- .../isar_generator/pubspec_overrides.yaml | 6 +++--- packages/isar_inspector/pubspec.yaml | 2 +- packages/isar_test/pubspec.yaml | 19 +++++++------------ packages/mdbx_sys/build.rs | 2 +- 7 files changed, 19 insertions(+), 24 deletions(-) diff --git a/packages/isar/pubspec.yaml b/packages/isar/pubspec.yaml index 40c59765a..c5f0f1a58 100644 --- a/packages/isar/pubspec.yaml +++ b/packages/isar/pubspec.yaml @@ -14,10 +14,12 @@ environment: dependencies: ffi: ">=2.0.0 <3.0.0" + isar_test: + path: ../isar_test js: ^0.6.4 meta: ^1.7.0 dev_dependencies: - ffigen: ">=6.1.2 <8.0.0" + ffigen: "^7.0.0" test: ^1.21.1 very_good_analysis: ^3.0.1 diff --git a/packages/isar_flutter_libs/pubspec.yaml b/packages/isar_flutter_libs/pubspec.yaml index f7321ccaf..b6960b7bd 100644 --- a/packages/isar_flutter_libs/pubspec.yaml +++ b/packages/isar_flutter_libs/pubspec.yaml @@ -12,9 +12,8 @@ environment: dependencies: flutter: sdk: flutter - isar: - version: 3.1.4 - hosted: https://isar-community.dev/ + isar: + path: ../isar flutter: plugin: diff --git a/packages/isar_generator/pubspec.yaml b/packages/isar_generator/pubspec.yaml index fc6ff8e14..b6c9967a6 100644 --- a/packages/isar_generator/pubspec.yaml +++ b/packages/isar_generator/pubspec.yaml @@ -14,9 +14,8 @@ dependencies: dart_style: ^2.2.3 dartx: ^1.1.0 glob: ^2.0.2 - isar: - version: 3.1.4 - hosted: https://isar-community.dev/ + isar: + path: ../isar path: ^1.8.1 source_gen: ^1.2.2 xxh3: ^1.0.1 diff --git a/packages/isar_generator/pubspec_overrides.yaml b/packages/isar_generator/pubspec_overrides.yaml index 388e439a0..1acd6f4c2 100644 --- a/packages/isar_generator/pubspec_overrides.yaml +++ b/packages/isar_generator/pubspec_overrides.yaml @@ -1,3 +1,3 @@ -dependency_overrides: - isar: - path: ../isar \ No newline at end of file +# dependency_overrides: +# isar: +# path: ../isar diff --git a/packages/isar_inspector/pubspec.yaml b/packages/isar_inspector/pubspec.yaml index 831c20365..beac58364 100644 --- a/packages/isar_inspector/pubspec.yaml +++ b/packages/isar_inspector/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: google_fonts: 6.1.0 isar: path: ../isar - vm_service: ^9.0.0 + vm_service: ^11.0.0 web_socket_channel: ^2.2.0 dev_dependencies: diff --git a/packages/isar_test/pubspec.yaml b/packages/isar_test/pubspec.yaml index 25e7e1827..f0c21490e 100644 --- a/packages/isar_test/pubspec.yaml +++ b/packages/isar_test/pubspec.yaml @@ -13,27 +13,22 @@ dependencies: integration_test: sdk: flutter intl: 0.18.0 - isar: any - isar_flutter_libs: any + isar: + path: ../isar + isar_flutter_libs: + path: ../isar_flutter_libs json_annotation: ^4.7.0 meta: ^1.8.0 path: ^1.8.2 path_provider: ^2.0.10 test: ^1.21.4 - test_api: ^0.4.12 + test_api: ^0.5.1 dev_dependencies: build_runner: any flutter_test: sdk: flutter - isar_generator: any - json_serializable: ^6.3.1 - very_good_analysis: ^3.0.1 - -dependency_overrides: - isar: - path: ../isar - isar_flutter_libs: - path: ../isar_flutter_libs isar_generator: path: ../isar_generator + json_serializable: ^6.3.1 + very_good_analysis: ^3.0.1 diff --git a/packages/mdbx_sys/build.rs b/packages/mdbx_sys/build.rs index 7be16789e..0522ced41 100644 --- a/packages/mdbx_sys/build.rs +++ b/packages/mdbx_sys/build.rs @@ -50,7 +50,7 @@ impl ParseCallbacks for Callbacks { } const LIBMDBX_REPO: &str = "https://github.com/isar/libmdbx.git"; -const LIBMDBX_TAG: &str = "v0.12.4"; +const LIBMDBX_TAG: &str = "v0.13.0"; fn main() { println!("cargo:rerun-if-changed=build.rs"); From 8381c69cb11b06d59df5f8c83717787a84c55858 Mon Sep 17 00:00:00 2001 From: Vicente Russo Date: Thu, 28 Mar 2024 13:25:31 -0300 Subject: [PATCH 11/11] updating pubspecs --- .../isar_generator/pubspec_overrides.yaml | 6 ++--- packages/isar_test/pubspec.yaml | 25 +++++++++++++------ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/packages/isar_generator/pubspec_overrides.yaml b/packages/isar_generator/pubspec_overrides.yaml index 1acd6f4c2..22f4dbec7 100644 --- a/packages/isar_generator/pubspec_overrides.yaml +++ b/packages/isar_generator/pubspec_overrides.yaml @@ -1,3 +1,3 @@ -# dependency_overrides: -# isar: -# path: ../isar +dependency_overrides: + isar: + path: ../isar diff --git a/packages/isar_test/pubspec.yaml b/packages/isar_test/pubspec.yaml index f0c21490e..2fa6ab09a 100644 --- a/packages/isar_test/pubspec.yaml +++ b/packages/isar_test/pubspec.yaml @@ -12,11 +12,13 @@ dependencies: sdk: flutter integration_test: sdk: flutter - intl: 0.18.0 - isar: - path: ../isar - isar_flutter_libs: - path: ../isar_flutter_libs + intl: ^0.19.0 + isar: + version: any + hosted: https://isar-community.dev + isar_flutter_libs: + version: any + hosted: https://isar-community.dev json_annotation: ^4.7.0 meta: ^1.8.0 path: ^1.8.2 @@ -28,7 +30,16 @@ dev_dependencies: build_runner: any flutter_test: sdk: flutter - isar_generator: - path: ../isar_generator + isar_generator: + version: any + hosted: https://isar-community.dev json_serializable: ^6.3.1 very_good_analysis: ^3.0.1 + +dependency_overrides: + isar: + path: ../isar + isar_flutter_libs: + path: ../isar_flutter_libs + isar_generator: + path: ../isar_generator \ No newline at end of file