Skip to content

Commit 392bb30

Browse files
Merge branch 'test-flutter-3.24' into 'main'
CI: test Flutter 3.24.3 and Dart 3.5.3 See merge request objectbox/objectbox-dart!92
2 parents 6006737 + c8bfc08 commit 392bb30

File tree

11 files changed

+40
-46
lines changed

11 files changed

+40
-46
lines changed

.github/workflows/dart.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,26 @@ permissions:
1818

1919
jobs:
2020
generator:
21-
runs-on: ubuntu-22.04
21+
runs-on: ubuntu-24.04
2222
steps:
23-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
23+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2424
# Prefer running on Ubuntu over Dart Docker image
25-
- uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 # v1.6.2
25+
- uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1.6.5
2626
with:
27-
sdk: 3.3.0
27+
sdk: 3.5.2
2828
- name: Install ObjectBox C library
29-
run: ./install.sh
29+
run: ./install.sh --install # Install globally for generator integration tests
3030
- name: Integration test
3131
run: ./generator/test.sh
3232

3333
# make sure the init script doesn't stop working - it's not something we usually run during normal development
3434
init-script:
35-
runs-on: ubuntu-22.04
35+
runs-on: ubuntu-24.04
3636
steps:
37-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
37+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
3838
- uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 # v2.16.0
3939
with:
40-
flutter-version: 3.19.1
40+
flutter-version: 3.24.2
4141
cache: true
4242
- run: ./tool/init.sh
4343

@@ -48,19 +48,19 @@ jobs:
4848
os:
4949
- windows-2022
5050
- macos-13
51-
- ubuntu-22.04
51+
- ubuntu-24.04
5252
sdk:
5353
# Always include lowest supported version (see sdk key in objectbox and generator
5454
# pubspec.yaml, but may be higher due to dependencies).
55-
- 3.3.0
56-
- 3.2.3
55+
- 3.5.2
56+
- 3.4.4
5757
- 2.18.6
5858
runs-on: ${{ matrix.os }}
5959
steps:
60-
- uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 # v1.6.2
60+
- uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1.6.5
6161
with:
6262
sdk: ${{ matrix.sdk }}
63-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
63+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
6464
- name: Generator Test
6565
working-directory: generator
6666
run: |
@@ -88,23 +88,23 @@ jobs:
8888
matrix:
8989
os:
9090
- macos-13
91-
- ubuntu-22.04
91+
- ubuntu-24.04
9292
- windows-2022 # Flutter 2.9 and newer need Visual Studio 2022 to build desktop.
9393
flutter-version:
9494
# Include lowest working version (use lowest tested Dart SDK as a guideline, see lib tests
9595
# above; but may be higher due to dependency conflicts)
9696
# https://docs.flutter.dev/development/tools/sdk/releases lists included Dart SDK.
97-
- 3.19.1
97+
- 3.24.2
9898
- 3.7.12
9999
runs-on: ${{ matrix.os }}
100100
steps:
101-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
101+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
102102
- uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 # v2.16.0
103103
with:
104104
flutter-version: ${{ matrix.flutter-version }}
105105
cache: true
106106
# windows-2022 defaults to Java 8, but Android Plugin requires at least 11.
107-
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
107+
- uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
108108
with:
109109
distribution: 'temurin'
110110
java-version: '17'

.github/workflows/lint.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ permissions:
1414

1515
jobs:
1616
analyze:
17-
runs-on: ubuntu-22.04
17+
runs-on: ubuntu-24.04
1818
steps:
19-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
19+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2020
# Prefer running on Ubuntu over Dart Docker image
21-
- uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 # v1.6.2
21+
- uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1.6.5
2222
with:
23-
sdk: 3.3.0
23+
sdk: 3.5.2
2424
- name: Get dependencies
2525
run: |
2626
dart pub get --directory=benchmark
@@ -43,11 +43,11 @@ jobs:
4343
run: dart format --set-exit-if-changed --fix .
4444

4545
pana:
46-
runs-on: ubuntu-22.04
46+
runs-on: ubuntu-24.04
4747
permissions:
4848
checks: write # to publish the report
4949
steps:
50-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
50+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
5151
- uses: axel-op/dart-package-analyzer@7a6c3c66bce78d82b729a1ffef2d9458fde6c8d2 # v3
5252
id: analysis # set an id for the current step
5353
with:
@@ -64,15 +64,15 @@ jobs:
6464
fi
6565
6666
coverage:
67-
runs-on: ubuntu-22.04
67+
runs-on: ubuntu-24.04
6868
permissions:
6969
checks: write # to publish the report
7070
steps:
71-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
71+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
7272
# Prefer running on Ubuntu over Dart Docker image
73-
- uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 # v1.6.2
73+
- uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1.6.5
7474
with:
75-
sdk: 3.3.0
75+
sdk: 3.5.2
7676
- name: Install coverage tools
7777
run: |
7878
./tool/apt-install.sh lcov
@@ -96,13 +96,13 @@ jobs:
9696
result_path: objectbox/coverage/lcov.info
9797
min_coverage: 90
9898
token: ${{ github.token }}
99-
- uses: danielpalme/ReportGenerator-GitHub-Action@2a2d60ea1c7e811f54684179af6ac1ae8c1ce69a # v5.2.5
99+
- uses: danielpalme/ReportGenerator-GitHub-Action@b7115d212c0f7814a0cb17fb43ec36983c707ccb # v5.3.10
100100
with:
101101
reports: 'objectbox/coverage/lcov.info'
102102
targetdir: 'coveragereport'
103103
reporttypes: 'HtmlInline' # The output formats and scope (separated by semicolon) Values: Badges, Clover, Cobertura, CsvSummary, Html, HtmlChart, HtmlInline, HtmlInline_AzurePipelines, HtmlInline_AzurePipelines_Dark, HtmlSummary, JsonSummary, Latex, LatexSummary, lcov, MarkdownSummary, MHtml, PngChart, SonarQube, TeamCitySummary, TextSummary, Xml, XmlSummary
104104
sourcedirs: 'objectbox'
105-
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
105+
- uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
106106
with:
107107
name: CoverageReport # Artifact name
108108
path: coveragereport # Directory containing files to upload

.gitlab-ci.yml

Lines changed: 4 additions & 4 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: '3.3.0'
8+
DART_VERSION: '3.5.2'
99

1010
# Make PUB_CACHE cacheable in GitLab;
1111
# see also https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77791/diffs and
@@ -59,21 +59,21 @@ test-generator:linux:x64:
5959
tags: [ x64, linux, docker ]
6060
image: dart:$DART_VERSION
6161
script:
62-
- ./install.sh
62+
- ./install.sh --install # Install globally for generator integration tests
6363
- ./generator/test.sh
6464

6565
# Runs generator and objectbox unit tests.
6666
.test:
6767
extends: .cache
6868
stage: test
6969
script:
70-
- ./install.sh
7170
# Generator tests
7271
- cd generator
7372
- dart pub get
7473
- dart test
7574
# ObjectBox tests
7675
- cd ../objectbox_test
76+
- ../install.sh
7777
- dart pub get
7878
- dart run build_runner build
7979
# Set concurrency=1 to run only one test suite (== test file) at a time.
@@ -95,7 +95,7 @@ test-lib:linux:x64:
9595
# pulled due to "if-not-present" pull policy. Check https://hub.docker.com/_/dart?tab=tags.
9696
# Always include lowest supported version (see sdk key in objectbox and generator
9797
# pubspec.yaml, but may be higher due to dependencies).
98-
- DART_VERSION: [ '2.18.6', '3.2.3', '3.3.0' ]
98+
- DART_VERSION: [ '2.18.6', '3.4.4', '3.5.2' ]
9999

100100
# Runs tests with coverage on the objectbox package.
101101
# Note: As this requires to run tests, make sure this does not block the actual test jobs so test

flutter_libs/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group 'io.objectbox.objectbox_flutter_libs'
22
version '1.0-SNAPSHOT'
33

44
buildscript {
5-
ext.kotlin_version = '1.6.10'
5+
ext.kotlin_version = '1.7.0'
66
repositories {
77
google()
88
mavenCentral()

install.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,4 @@ cLibVersion=4.0.0
99
os=$(uname)
1010
cLibArgs="$*"
1111

12-
# if there's no tty this is probably part of a docker build - therefore we install the c-api explicitly
13-
if [[ "$os" != MINGW* ]] && [[ "$os" != CYGWIN* ]] && [[ "$cLibArgs" != *"--install"* ]]; then
14-
tty -s || cLibArgs="${cLibArgs} --install"
15-
fi
16-
17-
1812
bash <(curl -s https://raw.githubusercontent.com/objectbox/objectbox-c/main/download.sh) ${cLibArgs} ${cLibVersion}

objectbox/example/flutter/event_management_tutorial/event_manager/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.6.10'
2+
ext.kotlin_version = '1.7.0'
33
repositories {
44
google()
55
mavenCentral()

objectbox/example/flutter/event_management_tutorial/many_to_many/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.6.10'
2+
ext.kotlin_version = '1.7.0'
33
repositories {
44
google()
55
mavenCentral()

objectbox/example/flutter/objectbox_demo/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.6.10'
2+
ext.kotlin_version = '1.7.0'
33
repositories {
44
google()
55
mavenCentral()

objectbox/example/flutter/objectbox_demo_relations/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.6.10'
2+
ext.kotlin_version = '1.7.0'
33
repositories {
44
google()
55
mavenCentral()

objectbox/example/flutter/objectbox_demo_sync/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.6.10'
2+
ext.kotlin_version = '1.7.0'
33
repositories {
44
google()
55
mavenCentral()

0 commit comments

Comments
 (0)