Skip to content

Commit 1fcb507

Browse files
Merge branch '25-updates'
2 parents 64d189a + 7731794 commit 1fcb507

File tree

9 files changed

+22
-24
lines changed

9 files changed

+22
-24
lines changed

.github/workflows/dart.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ jobs:
4444
- macos-11
4545
- ubuntu-22.04
4646
sdk:
47+
# Always include lowest supported version (see sdk key in objectbox and generator
48+
# pubspec.yaml, but may be higher due to dependencies).
4749
- 2.18.5
4850
- 2.17.6
49-
- 2.16.2
50-
- 2.14.0 # currently the lowest fully supported version (i.e. generator + lib)
5151
runs-on: ${{ matrix.os }}
5252
steps:
5353
- uses: dart-lang/setup-dart@v1
@@ -93,14 +93,12 @@ jobs:
9393
os:
9494
- macos-11
9595
- ubuntu-22.04
96+
- windows-2022 # Flutter 2.9 and newer need Visual Studio 2022 to build desktop.
9697
flutter-version:
98+
# Always include lowest supported version (based on lowest tested Dart SDK, see lib tests
99+
# above): https://docs.flutter.dev/development/tools/sdk/releases lists included Dart SDK.
97100
- 3.3.9
98-
- 2.5.0 # currently the lowest fully supported version (i.e. generator + lib)
99-
include:
100-
- flutter-version: 3.3.9 # Flutter 2.9 and newer need Visual Studio 2022 to build desktop.
101-
os: windows-2022
102-
- flutter-version: 2.5.0 # Flutter 2.8.1 and older need Visual Studio 2019 to build desktop.
103-
os: windows-2019
101+
- 3.0.5
104102
runs-on: ${{ matrix.os }}
105103
steps:
106104
- uses: actions/checkout@v3

.gitlab-ci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ test-lib:linux:x64:
6565
needs: ["test-generator:linux:x64"] # Wait for generator test
6666
parallel:
6767
matrix:
68-
# Note: use specific tags as docker images may not always be pulled due to "if-not-present" pull policy.
69-
# Thus, do not use tags like latest/beta, but check https://hub.docker.com/_/dart?tab=tags for latest.
70-
# Always include lowest supported version (see sdk key in objectbox and generator pubspec.yaml).
71-
- DART_VERSION: [ '2.14', '2.16.2', '2.17.6', '2.18.5' ]
68+
# Note: use specific versions instead of latest/beta tags as Docker images may not always be
69+
# pulled due to "if-not-present" pull policy. Check https://hub.docker.com/_/dart?tab=tags.
70+
# Always include lowest supported version (see sdk key in objectbox and generator
71+
# pubspec.yaml, but may be higher due to dependencies).
72+
- DART_VERSION: [ '2.17.6', '2.18.5' ]

benchmark/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies:
1010
meta: ^1.3.0
1111

1212
dev_dependencies:
13-
lints: ^1.0.1
13+
lints: ^2.0.1
1414
objectbox_generator: any
1515
build_runner: any
1616

generator/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ environment:
99

1010
dependencies:
1111
objectbox: 1.6.2
12-
analyzer: '>=1.1.0 <5.0.0'
12+
analyzer: '>=4.0.0 <6.0.0' # v5 requires test version that requires Dart SDK 2.18, allow v4 for some time.
1313
build: ^2.0.0
1414
collection: ^1.15.0
1515
dart_style: ^2.0.0
@@ -20,7 +20,7 @@ dependencies:
2020
yaml: ^3.0.0
2121

2222
dev_dependencies:
23-
lints: ^1.0.1
23+
lints: ^2.0.1
2424

2525
# NOTE: remove before publishing
2626
dependency_overrides:

objectbox/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// AFTER
88
final query = box.query().order(Person_.name).build();
99
```
10+
* Allow `analyzer` with major version 5. #487
1011

1112
## 1.6.2 (2022-08-24)
1213

objectbox/example/flutter/objectbox_demo/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ dependencies:
1616
dev_dependencies:
1717
flutter_driver:
1818
sdk: flutter
19-
test: any
20-
flutter_lints: ^1.0.0
19+
test: any # Should specify a minimum version; but we use any for easier testing of multiple SDKs.
20+
flutter_lints: ^2.0.1
2121
build_runner: ^2.0.0
2222
objectbox_generator: any
2323

objectbox/example/flutter/objectbox_demo_relations/pubspec.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@ dependencies:
1313
objectbox_flutter_libs: any
1414
intl: any
1515
path_provider: ^2.0.10 # 2.0.11+ requires Flutter 2.8.0
16-
path: ^1.8.0 # flutter_test depends on path 1.8.0
16+
path: ^1.8.0
1717

1818
dev_dependencies:
19-
flutter_test:
20-
sdk: flutter
21-
flutter_lints: ^1.0.0
19+
flutter_lints: ^2.0.1
2220
build_runner: ^2.0.0
2321
objectbox_generator: any
2422

objectbox/example/flutter/objectbox_demo_sync/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ dependencies:
1616
dev_dependencies:
1717
flutter_driver:
1818
sdk: flutter
19-
test: any
20-
flutter_lints: ^1.0.0
19+
test: any # Should specify a minimum version; but we use any for easier testing of multiple SDKs.
20+
flutter_lints: ^2.0.1
2121
build_runner: ^2.0.0
2222
objectbox_generator: any
2323

objectbox/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dev_dependencies:
2323
objectbox_generator: any
2424
test: ^1.16.5
2525
ffigen: ^4.1.3
26-
lints: ^1.0.1
26+
lints: ^2.0.1
2727

2828
# NOTE: remove before publishing
2929
dependency_overrides:

0 commit comments

Comments
 (0)