From c6aa52c5624ed474d2d1155206e2c0257e6aa81c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 12:49:01 +0000 Subject: [PATCH 1/9] Bump dart-lang/setup-dart from 1.6.2 to 1.6.5 Bumps [dart-lang/setup-dart](https://github.com/dart-lang/setup-dart) from 1.6.2 to 1.6.5. - [Release notes](https://github.com/dart-lang/setup-dart/releases) - [Changelog](https://github.com/dart-lang/setup-dart/blob/main/CHANGELOG.md) - [Commits](https://github.com/dart-lang/setup-dart/compare/fedb1266e91cf51be2fdb382869461a434b920a3...0a8a0fc875eb934c15d08629302413c671d3f672) --- updated-dependencies: - dependency-name: dart-lang/setup-dart dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dart.yml | 4 ++-- .github/workflows/lint.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index ad5e724e..b86ba634 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -22,7 +22,7 @@ jobs: steps: - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 # Prefer running on Ubuntu over Dart Docker image - - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 # v1.6.2 + - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1.6.5 with: sdk: 3.3.0 - name: Install ObjectBox C library @@ -57,7 +57,7 @@ jobs: - 2.18.6 runs-on: ${{ matrix.os }} steps: - - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 # v1.6.2 + - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1.6.5 with: sdk: ${{ matrix.sdk }} - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 61c9db66..e7895c8a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,7 +18,7 @@ jobs: steps: - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 # Prefer running on Ubuntu over Dart Docker image - - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 # v1.6.2 + - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1.6.5 with: sdk: 3.3.0 - name: Get dependencies @@ -70,7 +70,7 @@ jobs: steps: - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 # Prefer running on Ubuntu over Dart Docker image - - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3 # v1.6.2 + - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1.6.5 with: sdk: 3.3.0 - name: Install coverage tools From a32771b0ba7311d58d1095a3f7992a55387a4a25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 12:28:22 +0000 Subject: [PATCH 2/9] Bump actions/setup-java from 4.2.1 to 4.4.0 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.2.1 to 4.4.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/99b8673ff64fbf99d8d325f52d9a5bdedb8483e9...b36c23c0d998641eff861008f374ee103c25ac73) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dart.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index b86ba634..60d0586c 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -104,7 +104,7 @@ jobs: flutter-version: ${{ matrix.flutter-version }} cache: true # windows-2022 defaults to Java 8, but Android Plugin requires at least 11. - - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 + - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0 with: distribution: 'temurin' java-version: '17' From 236ac91395a9df68256dd817e8cf815dacd0c2fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 12:59:37 +0000 Subject: [PATCH 3/9] Bump actions/upload-artifact from 4.3.3 to 4.4.0 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.3 to 4.4.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/65462800fd760344b1a7b4382951275a0abb4808...50769540e7f4bd5e21e526ee35c689e35e0d6874) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e7895c8a..ede73d45 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -102,7 +102,7 @@ jobs: targetdir: 'coveragereport' 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 sourcedirs: 'objectbox' - - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 with: name: CoverageReport # Artifact name path: coveragereport # Directory containing files to upload From 4c38ed397fd42f15767588a3d804cc2a69592fc6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 12:28:26 +0000 Subject: [PATCH 4/9] Bump danielpalme/ReportGenerator-GitHub-Action from 5.2.5 to 5.3.10 Bumps [danielpalme/ReportGenerator-GitHub-Action](https://github.com/danielpalme/reportgenerator-github-action) from 5.2.5 to 5.3.10. - [Release notes](https://github.com/danielpalme/reportgenerator-github-action/releases) - [Commits](https://github.com/danielpalme/reportgenerator-github-action/compare/2a2d60ea1c7e811f54684179af6ac1ae8c1ce69a...b7115d212c0f7814a0cb17fb43ec36983c707ccb) --- updated-dependencies: - dependency-name: danielpalme/ReportGenerator-GitHub-Action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ede73d45..a06bf67f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -96,7 +96,7 @@ jobs: result_path: objectbox/coverage/lcov.info min_coverage: 90 token: ${{ github.token }} - - uses: danielpalme/ReportGenerator-GitHub-Action@2a2d60ea1c7e811f54684179af6ac1ae8c1ce69a # v5.2.5 + - uses: danielpalme/ReportGenerator-GitHub-Action@b7115d212c0f7814a0cb17fb43ec36983c707ccb # v5.3.10 with: reports: 'objectbox/coverage/lcov.info' targetdir: 'coveragereport' From 2abb3fa82c75834fa205a40a4200c83fbd3d42bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 12:28:31 +0000 Subject: [PATCH 5/9] Bump actions/checkout from 4.1.4 to 4.2.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.4 to 4.2.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/0ad4b8fadaa221de15dcec353f45205ec38ea70b...d632683dd7b4114ad314bca15554477dd762a938) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dart.yml | 8 ++++---- .github/workflows/lint.yml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 60d0586c..9b8acb87 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -20,7 +20,7 @@ jobs: generator: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 # Prefer running on Ubuntu over Dart Docker image - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1.6.5 with: @@ -34,7 +34,7 @@ jobs: init-script: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 # v2.16.0 with: flutter-version: 3.19.1 @@ -60,7 +60,7 @@ jobs: - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1.6.5 with: sdk: ${{ matrix.sdk }} - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Generator Test working-directory: generator run: | @@ -98,7 +98,7 @@ jobs: - 3.7.12 runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 # v2.16.0 with: flutter-version: ${{ matrix.flutter-version }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a06bf67f..a79d854c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,7 +16,7 @@ jobs: analyze: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 # Prefer running on Ubuntu over Dart Docker image - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1.6.5 with: @@ -47,7 +47,7 @@ jobs: permissions: checks: write # to publish the report steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - uses: axel-op/dart-package-analyzer@7a6c3c66bce78d82b729a1ffef2d9458fde6c8d2 # v3 id: analysis # set an id for the current step with: @@ -68,7 +68,7 @@ jobs: permissions: checks: write # to publish the report steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 # Prefer running on Ubuntu over Dart Docker image - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1.6.5 with: From 1349f1eb988dddb8756a8937935d298cdd92d69e Mon Sep 17 00:00:00 2001 From: Uwe <13865709+greenrobot-team@users.noreply.github.com> Date: Tue, 1 Oct 2024 08:31:39 +0200 Subject: [PATCH 6/9] CI: test Flutter 3.24.2 and Dart 3.5.2 Also Dart SDK 3.4.4 because haven't updated that long. --- .github/workflows/dart.yml | 10 +++++----- .github/workflows/lint.yml | 4 ++-- .gitlab-ci.yml | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 9b8acb87..9d012674 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -24,7 +24,7 @@ jobs: # Prefer running on Ubuntu over Dart Docker image - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1.6.5 with: - sdk: 3.3.0 + sdk: 3.5.2 - name: Install ObjectBox C library run: ./install.sh - name: Integration test @@ -37,7 +37,7 @@ jobs: - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 # v2.16.0 with: - flutter-version: 3.19.1 + flutter-version: 3.24.2 cache: true - run: ./tool/init.sh @@ -52,8 +52,8 @@ jobs: sdk: # Always include lowest supported version (see sdk key in objectbox and generator # pubspec.yaml, but may be higher due to dependencies). - - 3.3.0 - - 3.2.3 + - 3.5.2 + - 3.4.4 - 2.18.6 runs-on: ${{ matrix.os }} steps: @@ -94,7 +94,7 @@ jobs: # Include lowest working version (use lowest tested Dart SDK as a guideline, see lib tests # above; but may be higher due to dependency conflicts) # https://docs.flutter.dev/development/tools/sdk/releases lists included Dart SDK. - - 3.19.1 + - 3.24.2 - 3.7.12 runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a79d854c..bfcf0b3e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ jobs: # Prefer running on Ubuntu over Dart Docker image - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1.6.5 with: - sdk: 3.3.0 + sdk: 3.5.2 - name: Get dependencies run: | dart pub get --directory=benchmark @@ -72,7 +72,7 @@ jobs: # Prefer running on Ubuntu over Dart Docker image - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1.6.5 with: - sdk: 3.3.0 + sdk: 3.5.2 - name: Install coverage tools run: | ./tool/apt-install.sh lcov diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de127ca5..bcdef1e4 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: '3.3.0' + DART_VERSION: '3.5.2' # Make PUB_CACHE cacheable in GitLab; # see also https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77791/diffs and @@ -95,7 +95,7 @@ test-lib:linux:x64: # pulled due to "if-not-present" pull policy. Check https://hub.docker.com/_/dart?tab=tags. # Always include lowest supported version (see sdk key in objectbox and generator # pubspec.yaml, but may be higher due to dependencies). - - DART_VERSION: [ '2.18.6', '3.2.3', '3.3.0' ] + - DART_VERSION: [ '2.18.6', '3.4.4', '3.5.2' ] # Runs tests with coverage on the objectbox package. # Note: As this requires to run tests, make sure this does not block the actual test jobs so test From 6fa6af1bd24f8f6dd1c6fdcccc71b8159a029d9b Mon Sep 17 00:00:00 2001 From: Uwe <13865709+greenrobot-team@users.noreply.github.com> Date: Tue, 1 Oct 2024 14:34:40 +0200 Subject: [PATCH 7/9] Flutter 3.24 requires at least Kotlin 1.7.0 --- flutter_libs/android/build.gradle | 2 +- .../event_manager/android/build.gradle | 2 +- .../event_management_tutorial/many_to_many/android/build.gradle | 2 +- objectbox/example/flutter/objectbox_demo/android/build.gradle | 2 +- .../flutter/objectbox_demo_relations/android/build.gradle | 2 +- .../example/flutter/objectbox_demo_sync/android/build.gradle | 2 +- sync_flutter_libs/android/build.gradle | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flutter_libs/android/build.gradle b/flutter_libs/android/build.gradle index 53e09971..da7638ff 100644 --- a/flutter_libs/android/build.gradle +++ b/flutter_libs/android/build.gradle @@ -2,7 +2,7 @@ group 'io.objectbox.objectbox_flutter_libs' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.7.0' repositories { google() mavenCentral() diff --git a/objectbox/example/flutter/event_management_tutorial/event_manager/android/build.gradle b/objectbox/example/flutter/event_management_tutorial/event_manager/android/build.gradle index 3cdaac95..6617c1e9 100644 --- a/objectbox/example/flutter/event_management_tutorial/event_manager/android/build.gradle +++ b/objectbox/example/flutter/event_management_tutorial/event_manager/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.7.0' repositories { google() mavenCentral() diff --git a/objectbox/example/flutter/event_management_tutorial/many_to_many/android/build.gradle b/objectbox/example/flutter/event_management_tutorial/many_to_many/android/build.gradle index 3cdaac95..6617c1e9 100644 --- a/objectbox/example/flutter/event_management_tutorial/many_to_many/android/build.gradle +++ b/objectbox/example/flutter/event_management_tutorial/many_to_many/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.7.0' repositories { google() mavenCentral() diff --git a/objectbox/example/flutter/objectbox_demo/android/build.gradle b/objectbox/example/flutter/objectbox_demo/android/build.gradle index 3cdaac95..6617c1e9 100644 --- a/objectbox/example/flutter/objectbox_demo/android/build.gradle +++ b/objectbox/example/flutter/objectbox_demo/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.7.0' repositories { google() mavenCentral() diff --git a/objectbox/example/flutter/objectbox_demo_relations/android/build.gradle b/objectbox/example/flutter/objectbox_demo_relations/android/build.gradle index 3cdaac95..6617c1e9 100644 --- a/objectbox/example/flutter/objectbox_demo_relations/android/build.gradle +++ b/objectbox/example/flutter/objectbox_demo_relations/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.7.0' repositories { google() mavenCentral() diff --git a/objectbox/example/flutter/objectbox_demo_sync/android/build.gradle b/objectbox/example/flutter/objectbox_demo_sync/android/build.gradle index 3cdaac95..6617c1e9 100644 --- a/objectbox/example/flutter/objectbox_demo_sync/android/build.gradle +++ b/objectbox/example/flutter/objectbox_demo_sync/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.7.0' repositories { google() mavenCentral() diff --git a/sync_flutter_libs/android/build.gradle b/sync_flutter_libs/android/build.gradle index 56af898a..9977c637 100644 --- a/sync_flutter_libs/android/build.gradle +++ b/sync_flutter_libs/android/build.gradle @@ -2,7 +2,7 @@ group 'io.objectbox.objectbox_sync_flutter_libs' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.7.0' repositories { google() mavenCentral() From 84bd01a16a9819aa0401b9008b91e70608c02b37 Mon Sep 17 00:00:00 2001 From: Uwe <13865709+greenrobot-team@users.noreply.github.com> Date: Tue, 1 Oct 2024 14:42:32 +0200 Subject: [PATCH 8/9] GitHub Actions: test on ubuntu-24.04 (current ubuntu-latest) --- .github/workflows/dart.yml | 8 ++++---- .github/workflows/lint.yml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 9d012674..710d0d44 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -18,7 +18,7 @@ permissions: jobs: generator: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 # Prefer running on Ubuntu over Dart Docker image @@ -32,7 +32,7 @@ jobs: # make sure the init script doesn't stop working - it's not something we usually run during normal development init-script: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 # v2.16.0 @@ -48,7 +48,7 @@ jobs: os: - windows-2022 - macos-13 - - ubuntu-22.04 + - ubuntu-24.04 sdk: # Always include lowest supported version (see sdk key in objectbox and generator # pubspec.yaml, but may be higher due to dependencies). @@ -88,7 +88,7 @@ jobs: matrix: os: - macos-13 - - ubuntu-22.04 + - ubuntu-24.04 - windows-2022 # Flutter 2.9 and newer need Visual Studio 2022 to build desktop. flutter-version: # Include lowest working version (use lowest tested Dart SDK as a guideline, see lib tests diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index bfcf0b3e..0ff24742 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,7 +14,7 @@ permissions: jobs: analyze: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 # Prefer running on Ubuntu over Dart Docker image @@ -43,7 +43,7 @@ jobs: run: dart format --set-exit-if-changed --fix . pana: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 permissions: checks: write # to publish the report steps: @@ -64,7 +64,7 @@ jobs: fi coverage: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 permissions: checks: write # to publish the report steps: From c8bfc08e4d8014f5fe134292c2cd78452baa45f8 Mon Sep 17 00:00:00 2001 From: Uwe <13865709+greenrobot-team@users.noreply.github.com> Date: Tue, 1 Oct 2024 15:09:42 +0200 Subject: [PATCH 9/9] install.sh: never install the C library by default --- .github/workflows/dart.yml | 2 +- .gitlab-ci.yml | 4 ++-- install.sh | 6 ------ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 710d0d44..dcb82995 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -26,7 +26,7 @@ jobs: with: sdk: 3.5.2 - name: Install ObjectBox C library - run: ./install.sh + run: ./install.sh --install # Install globally for generator integration tests - name: Integration test run: ./generator/test.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bcdef1e4..a3fe8be0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,7 +59,7 @@ test-generator:linux:x64: tags: [ x64, linux, docker ] image: dart:$DART_VERSION script: - - ./install.sh + - ./install.sh --install # Install globally for generator integration tests - ./generator/test.sh # Runs generator and objectbox unit tests. @@ -67,13 +67,13 @@ test-generator:linux:x64: extends: .cache stage: test script: - - ./install.sh # Generator tests - cd generator - dart pub get - dart test # ObjectBox tests - cd ../objectbox_test + - ../install.sh - dart pub get - dart run build_runner build # Set concurrency=1 to run only one test suite (== test file) at a time. diff --git a/install.sh b/install.sh index 48793dea..7ca187dd 100755 --- a/install.sh +++ b/install.sh @@ -9,10 +9,4 @@ cLibVersion=4.0.0 os=$(uname) cLibArgs="$*" -# if there's no tty this is probably part of a docker build - therefore we install the c-api explicitly -if [[ "$os" != MINGW* ]] && [[ "$os" != CYGWIN* ]] && [[ "$cLibArgs" != *"--install"* ]]; then - tty -s || cLibArgs="${cLibArgs} --install" -fi - - bash <(curl -s https://raw.githubusercontent.com/objectbox/objectbox-c/main/download.sh) ${cLibArgs} ${cLibVersion}