Merge branch '14-ffigen-update'

Author: greenrobot-team

.github/workflows/dart.yml

@@ -47,8 +47,7 @@ jobs:
           - 2.17.0
           - 2.16.2
           - 2.15.1
-          - 2.14.4
-          - 2.12.0  # currently the lowest fully supported version (i.e. generator + lib)
+          - 2.14.0 # currently the lowest fully supported version (i.e. generator + lib)
     runs-on: ${{ matrix.os }}
     steps:
       - uses: dart-lang/setup-dart@v1
@@ -95,13 +94,11 @@ jobs:
           - ubuntu-20.04
         flutter-version:
           - 3.0.0
-          - 2.2.0
-          # 2.0.0 technically lowest supported, but need 2.2.0 to correctly resolve null safety dependencies.
-          # https://github.com/flutter/flutter/issues/77282
+          - 2.5.0 # currently the lowest fully supported version (i.e. generator + lib)
         include:
           - flutter-version: 3.0.0 # Flutter 2.9 and newer need Visual Studio 2022 to build desktop.
             os: windows-2022
-          - flutter-version: 2.2.0 # Flutter 2.8.1 and older need Visual Studio 2019 to build desktop.
+          - flutter-version: 2.5.0 # Flutter 2.8.1 and older need Visual Studio 2019 to build desktop.
             os: windows-2019
     runs-on: ${{ matrix.os }}
     steps:

.gitlab-ci.yml

@@ -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.12', '2.14.4', '2.15.1', '2.16.1', '2.16.2', '2.17.0' ]
+      - DART_VERSION: [ '2.14', '2.15.1', '2.16.1', '2.16.2', '2.17.0' ]

benchmark/pubspec.yaml

@@ -3,7 +3,7 @@ description: Simple ObjectBox-Dart performance benchmark
 publish_to: none
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.14.0 <3.0.0"
 
 dependencies:
   objectbox: any

flutter_libs/pubspec.yaml

@@ -5,7 +5,7 @@ homepage: https://objectbox.io
 version: 1.5.0
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.14.0 <3.0.0"
   flutter: ">=2.0.0"
 
 dependencies:

generator/pubspec.yaml

@@ -5,7 +5,7 @@ homepage: https://objectbox.io
 version: 1.5.0
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.14.0 <3.0.0'
 
 dependencies:
   objectbox: 1.5.0

objectbox/CHANGELOG.md

@@ -1,6 +1,9 @@
 ## latest
 
+* Require at least Dart SDK 2.14 (shipped with Flutter 2.5.0).
+
 ## 1.5.0 (2022-05-11)
+
 * Add `Store.runInTransactionAsync` to run database operations asynchronously in the background
   (requires Flutter 2.8.0/Dart 2.15.0 or newer). #415
 * Rename `Store.runIsolated` to `runAsync`, drop unused `mode` parameter, propagate errors and

objectbox/example/flutter/objectbox_demo/pubspec.yaml

@@ -4,7 +4,7 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.13.0 <3.0.0"
+  sdk: ">=2.14.0 <3.0.0"
 
 dependencies:
   flutter:

objectbox/example/flutter/objectbox_demo_relations/pubspec.yaml

@@ -4,7 +4,7 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.13.0 <3.0.0"
+  sdk: ">=2.14.0 <3.0.0"
 
 dependencies:
   flutter:

objectbox/example/flutter/objectbox_demo_sync/pubspec.yaml

@@ -4,7 +4,7 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.13.0 <3.0.0"
+  sdk: ">=2.14.0 <3.0.0"
 
 dependencies:
   flutter:

objectbox/lib/src/native/bindings/data_visitor.dart

@@ -22,7 +22,7 @@ bool Function(Pointer<Uint8> data, int size) _callback = _callback;
 int _forwarder(Pointer<Void> _, Pointer<Void> dataPtr, int size) =>
     _callback(dataPtr.cast<Uint8>(), size) ? 1 : 0;
 
-final Pointer<NativeFunction<obx_data_visitor>> _nativeVisitor =
+final Pointer<obx_data_visitor> _nativeVisitor =
     Pointer.fromFunction(_forwarder, 0);
 
 /// The callback for reading data one-by-one.
@@ -31,18 +31,15 @@ final Pointer<NativeFunction<obx_data_visitor>> _nativeVisitor =
 /// - [size] specifies the length of the read data.
 /// - Return true to keep going, false to cancel.
 @pragma('vm:prefer-inline')
-Pointer<NativeFunction<obx_data_visitor>> dataVisitor(
+Pointer<obx_data_visitor> dataVisitor(
     bool Function(Pointer<Uint8> data, int size) callback) {
   _callback = callback;
   return _nativeVisitor;
 }
 
 @pragma('vm:prefer-inline')
-Pointer<NativeFunction<obx_data_visitor>> objectCollector<T>(
-        List<T> list,
-        Store store,
-        EntityDefinition<T> entity,
-        ObjectCollectorError outError) =>
+Pointer<obx_data_visitor> objectCollector<T>(List<T> list, Store store,
+        EntityDefinition<T> entity, ObjectCollectorError outError) =>
     dataVisitor((Pointer<Uint8> data, int size) {
       try {
         list.add(entity.objectFromFB(