Merge pull request #146 from objectbox/ffigen

Use ffigen for C-API bindings

Author: vaind

flutter_libs/android/build.gradle

@@ -11,6 +11,6 @@ android {
 }
 
 dependencies {
-    // https://github.com/objectbox/objectbox-java/releases
+    // https://bintray.com/objectbox/objectbox/io.objectbox%3Aobjectbox-android
     implementation "io.objectbox:objectbox-android:2.8.0"
 }

generator/integration-tests/basics/1.dart

@@ -4,7 +4,7 @@ import 'lib/objectbox.g.dart';
 import 'package:test/test.dart';
 import '../test_env.dart';
 import '../common.dart';
-import 'package:objectbox/src/bindings/constants.dart';
+import 'package:objectbox/src/bindings/bindings.dart';
 
 void main() {
   TestEnv<A> env;
@@ -32,7 +32,7 @@ void main() {
     expect(entity(model, 'A').flags, equals(0));
     expect(entity(jsonModel, 'A').flags, equals(0));
 
-    expect(entity(model, 'D').flags, equals(OBXEntityFlag.SYNC_ENABLED));
-    expect(entity(jsonModel, 'D').flags, equals(OBXEntityFlag.SYNC_ENABLED));
+    expect(entity(model, 'D').flags, equals(OBXEntityFlags.SYNC_ENABLED));
+    expect(entity(jsonModel, 'D').flags, equals(OBXEntityFlags.SYNC_ENABLED));
   });
 }

generator/lib/src/code_chunks.dart

@@ -1,6 +1,6 @@
 import "dart:convert";
 import "package:objectbox/src/modelinfo/index.dart";
-import "package:objectbox/src/bindings/constants.dart" show OBXPropertyType;
+import "package:objectbox/src/bindings/bindings.dart" show OBXPropertyType;
 import "package:source_gen/source_gen.dart" show InvalidGenerationSourceError;
 
 class CodeChunks {

generator/lib/src/entity_resolver.dart

@@ -4,7 +4,7 @@ import 'dart:convert';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:build/build.dart';
 import 'package:objectbox/objectbox.dart' as obx;
-import 'package:objectbox/src/bindings/constants.dart';
+import 'package:objectbox/src/bindings/bindings.dart';
 import 'package:objectbox/src/modelinfo/index.dart';
 import 'package:source_gen/source_gen.dart';
 
@@ -61,11 +61,11 @@ class EntityResolver extends Builder {
     }
 
     if (_syncChecker.hasAnnotationOfExact(element)) {
-      entity.flags |= OBXEntityFlag.SYNC_ENABLED;
+      entity.flags |= OBXEntityFlags.SYNC_ENABLED;
     }
 
     log.info('entity ${entity.name}(${entity.id}), sync=' +
-        (entity.hasFlag(OBXEntityFlag.SYNC_ENABLED) ? 'ON' : 'OFF'));
+        (entity.hasFlag(OBXEntityFlags.SYNC_ENABLED) ? 'ON' : 'OFF'));
 
     // getters, ... (anything else?)
     final readOnlyFields = <String, bool>{};
@@ -104,7 +104,7 @@ class EntityResolver extends Builder {
         hasIdProperty = true;
 
         fieldType = OBXPropertyType.Long;
-        flags |= OBXPropertyFlag.ID;
+        flags |= OBXPropertyFlags.ID;
 
         final _idAnnotation = _idChecker.firstAnnotationOfExact(f);
         propUid = _idAnnotation.getField('uid').toIntValue();

install.sh

@@ -2,9 +2,13 @@
 set -eu
 
 # https://github.com/objectbox/objectbox-c/releases
-# Warning: ensure C lib signature changes are reflected in lib/src/bindings/signatures.dart
-# Dart won't error if they do not match, it may lead to obscure memory bugs.
-cLibVersion=0.10.0
+# It's important that the generated dart bindings and the c-api library version match. Dart won't error on C function
+# signature mismatch, leading to obscure memory bugs.
+# After upgrading to a different C-API version:
+#   * update lib/src/bindings/objectbox.h
+#   * execute pub run ffigen
+#   * have a look at the changed files to see if some call sites need to be updated
+cLibVersion=0.11.0
 os=$(uname)
 
 # if there's no tty this is probably part of a docker build - therefore we install the c-api explicitly

lib/integration_test.dart

@@ -1,7 +1,6 @@
 library integration_test;
 
 import 'package:objectbox/objectbox.dart';
-import './src/bindings/constants.dart';
 import './src/bindings/helpers.dart';
 import './src/bindings/bindings.dart';