From c0eb4dee97b9f472638e9b4fa490c52e0ede19f9 Mon Sep 17 00:00:00 2001
From: Uwe <13865709+greenrobot-team@users.noreply.github.com>
Date: Tue, 4 Oct 2022 16:51:58 +0200
Subject: [PATCH 1/2] CI: test Dart 2.18.5 and Flutter 3.3.9

---
 .github/workflows/dart.yml | 12 ++++++------
 .github/workflows/lint.yml |  4 ++--
 .gitlab-ci.yml             |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index dc6adebb5..a7f2eb0c7 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -16,7 +16,7 @@ jobs:
   generator:
     runs-on: ubuntu-22.04
     container:
-      image: dart:2.17.6
+      image: dart:2.18.5
     steps:
       - uses: actions/checkout@v3
       - name: Install ObjectBox C-API
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: 3.0.5
+          flutter-version: 3.3.9
           cache: true
       - run: ./tool/init.sh
 
@@ -44,9 +44,9 @@ jobs:
           - macos-11
           - ubuntu-22.04
         sdk:
+          - 2.18.5
           - 2.17.6
           - 2.16.2
-          - 2.15.1
           - 2.14.0 # currently the lowest fully supported version (i.e. generator + lib)
     runs-on: ${{ matrix.os }}
     steps:
@@ -69,7 +69,7 @@ jobs:
     steps:
       - uses: dart-lang/setup-dart@v1
         with:
-          sdk: 2.17.6
+          sdk: 2.18.5
       - uses: actions/checkout@v3
       - name: Install ObjectBox C-API
         run: ./install.sh
@@ -93,10 +93,10 @@ jobs:
           - macos-11
           - ubuntu-22.04
         flutter-version:
-          - 3.0.5
+          - 3.3.9
           - 2.5.0 # currently the lowest fully supported version (i.e. generator + lib)
         include:
-          - flutter-version: 3.0.5 # Flutter 2.9 and newer need Visual Studio 2022 to build desktop.
+          - flutter-version: 3.3.9 # Flutter 2.9 and newer need Visual Studio 2022 to build desktop.
             os: windows-2022
           - flutter-version: 2.5.0 # Flutter 2.8.1 and older need Visual Studio 2019 to build desktop.
             os: windows-2019
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 60823d262..13cb40d6d 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -12,7 +12,7 @@ jobs:
   analyze:
     runs-on: ubuntu-22.04
     container:
-      image: dart:2.17.6
+      image: dart:2.18.5
     steps:
       - uses: actions/checkout@v3
       - run: dart run build_runner build
@@ -46,7 +46,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: 3.0.5
+          flutter-version: 3.3.9
           cache: true
       - name: Generate test coverage
         working-directory: objectbox
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 774a19ea7..2db2e9b57 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 variables:
   # Note: use specific tags as docker images may not always be pulled due to "if-not-present" pull policy.
   #       Thus, do not use tags like latest/beta, but check https://hub.docker.com/_/dart?tab=tags for latest.
-  DART_VERSION: '2.17.6'
+  DART_VERSION: '2.18.5'
 
 # Make PUB_CACHE cacheable in GitLab;
 # see also https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77791/diffs and
@@ -68,4 +68,4 @@ test-lib:linux:x64:
       # Note: use specific tags as docker images may not always be pulled due to "if-not-present" pull policy.
       #       Thus, do not use tags like latest/beta, but check https://hub.docker.com/_/dart?tab=tags for latest.
       # Always include lowest supported version (see sdk key in objectbox and generator pubspec.yaml).
-      - DART_VERSION: [ '2.14', '2.15.1', '2.16.1', '2.16.2', '2.17.6' ]
+      - DART_VERSION: [ '2.14', '2.16.2', '2.17.6', '2.18.5' ]

From cff6fa70cfaccc8f1d6cb78dcf8834f21da88c34 Mon Sep 17 00:00:00 2001
From: Uwe <13865709+greenrobot-team@users.noreply.github.com>
Date: Mon, 12 Dec 2022 11:06:16 +0100
Subject: [PATCH 2/2] GitHub Actions: temporarily disable valgrind tests.

---
 .github/workflows/dart.yml | 41 +++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index a7f2eb0c7..d103ef271 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -64,26 +64,27 @@ jobs:
           ../tool/pub.sh run build_runner build
           ../tool/pub.sh run test
 
-  valgrind:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: dart-lang/setup-dart@v1
-        with:
-          sdk: 2.18.5
-      - uses: actions/checkout@v3
-      - name: Install ObjectBox C-API
-        run: ./install.sh
-      - name: Install Valgrind
-        run: ./tool/apt-install.sh valgrind
-      - name: Test
-        working-directory: objectbox
-        # let tests know we want a faster/shorter version, if available (to prevent timeouts in CI)
-        env:
-          TEST_SHORT: 1
-        run: |
-          ../tool/pub.sh get
-          ../tool/pub.sh run build_runner build
-          ./tool/valgrind.sh
+# Temporarily disabled, see internal issue.
+#  valgrind:
+#    runs-on: ubuntu-22.04
+#    steps:
+#      - uses: dart-lang/setup-dart@v1
+#        with:
+#          sdk: 2.18.5
+#      - uses: actions/checkout@v3
+#      - name: Install ObjectBox C-API
+#        run: ./install.sh
+#      - name: Install Valgrind
+#        run: ./tool/apt-install.sh valgrind
+#      - name: Test
+#        working-directory: objectbox
+#        # let tests know we want a faster/shorter version, if available (to prevent timeouts in CI)
+#        env:
+#          TEST_SHORT: 1
+#        run: |
+#          ../tool/pub.sh get
+#          ../tool/pub.sh run build_runner build
+#          ./tool/valgrind.sh
 
   flutter-integration-test:
     strategy: