Skip to content

Commit 64d189a

Browse files
Merge branch 'flutter-3.3'
2 parents 28d1c86 + cff6fa7 commit 64d189a

File tree

3 files changed

+30
-29
lines changed

3 files changed

+30
-29
lines changed

.github/workflows/dart.yml

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
generator:
1717
runs-on: ubuntu-22.04
1818
container:
19-
image: dart:2.17.6
19+
image: dart:2.18.5
2020
steps:
2121
- uses: actions/checkout@v3
2222
- name: Install ObjectBox C-API
@@ -31,7 +31,7 @@ jobs:
3131
- uses: actions/checkout@v3
3232
- uses: subosito/flutter-action@v2
3333
with:
34-
flutter-version: 3.0.5
34+
flutter-version: 3.3.9
3535
cache: true
3636
- run: ./tool/init.sh
3737

@@ -44,9 +44,9 @@ jobs:
4444
- macos-11
4545
- ubuntu-22.04
4646
sdk:
47+
- 2.18.5
4748
- 2.17.6
4849
- 2.16.2
49-
- 2.15.1
5050
- 2.14.0 # currently the lowest fully supported version (i.e. generator + lib)
5151
runs-on: ${{ matrix.os }}
5252
steps:
@@ -64,26 +64,27 @@ jobs:
6464
../tool/pub.sh run build_runner build
6565
../tool/pub.sh run test
6666
67-
valgrind:
68-
runs-on: ubuntu-22.04
69-
steps:
70-
- uses: dart-lang/setup-dart@v1
71-
with:
72-
sdk: 2.17.6
73-
- uses: actions/checkout@v3
74-
- name: Install ObjectBox C-API
75-
run: ./install.sh
76-
- name: Install Valgrind
77-
run: ./tool/apt-install.sh valgrind
78-
- name: Test
79-
working-directory: objectbox
80-
# let tests know we want a faster/shorter version, if available (to prevent timeouts in CI)
81-
env:
82-
TEST_SHORT: 1
83-
run: |
84-
../tool/pub.sh get
85-
../tool/pub.sh run build_runner build
86-
./tool/valgrind.sh
67+
# Temporarily disabled, see internal issue.
68+
# valgrind:
69+
# runs-on: ubuntu-22.04
70+
# steps:
71+
# - uses: dart-lang/setup-dart@v1
72+
# with:
73+
# sdk: 2.18.5
74+
# - uses: actions/checkout@v3
75+
# - name: Install ObjectBox C-API
76+
# run: ./install.sh
77+
# - name: Install Valgrind
78+
# run: ./tool/apt-install.sh valgrind
79+
# - name: Test
80+
# working-directory: objectbox
81+
# # let tests know we want a faster/shorter version, if available (to prevent timeouts in CI)
82+
# env:
83+
# TEST_SHORT: 1
84+
# run: |
85+
# ../tool/pub.sh get
86+
# ../tool/pub.sh run build_runner build
87+
# ./tool/valgrind.sh
8788

8889
flutter-integration-test:
8990
strategy:
@@ -93,10 +94,10 @@ jobs:
9394
- macos-11
9495
- ubuntu-22.04
9596
flutter-version:
96-
- 3.0.5
97+
- 3.3.9
9798
- 2.5.0 # currently the lowest fully supported version (i.e. generator + lib)
9899
include:
99-
- flutter-version: 3.0.5 # Flutter 2.9 and newer need Visual Studio 2022 to build desktop.
100+
- flutter-version: 3.3.9 # Flutter 2.9 and newer need Visual Studio 2022 to build desktop.
100101
os: windows-2022
101102
- flutter-version: 2.5.0 # Flutter 2.8.1 and older need Visual Studio 2019 to build desktop.
102103
os: windows-2019

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
analyze:
1313
runs-on: ubuntu-22.04
1414
container:
15-
image: dart:2.17.6
15+
image: dart:2.18.5
1616
steps:
1717
- uses: actions/checkout@v3
1818
- run: dart run build_runner build
@@ -46,7 +46,7 @@ jobs:
4646
- uses: actions/checkout@v3
4747
- uses: subosito/flutter-action@v2
4848
with:
49-
flutter-version: 3.0.5
49+
flutter-version: 3.3.9
5050
cache: true
5151
- name: Generate test coverage
5252
working-directory: objectbox

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ stages:
55
variables:
66
# Note: use specific tags as docker images may not always be pulled due to "if-not-present" pull policy.
77
# Thus, do not use tags like latest/beta, but check https://hub.docker.com/_/dart?tab=tags for latest.
8-
DART_VERSION: '2.17.6'
8+
DART_VERSION: '2.18.5'
99

1010
# Make PUB_CACHE cacheable in GitLab;
1111
# see also https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77791/diffs and
@@ -68,4 +68,4 @@ test-lib:linux:x64:
6868
# Note: use specific tags as docker images may not always be pulled due to "if-not-present" pull policy.
6969
# Thus, do not use tags like latest/beta, but check https://hub.docker.com/_/dart?tab=tags for latest.
7070
# Always include lowest supported version (see sdk key in objectbox and generator pubspec.yaml).
71-
- DART_VERSION: [ '2.14', '2.15.1', '2.16.1', '2.16.2', '2.17.6' ]
71+
- DART_VERSION: [ '2.14', '2.16.2', '2.17.6', '2.18.5' ]

0 commit comments

Comments
 (0)