Skip to content

Commit 2b347b5

Browse files
committed
Merge tag '0.7.10' into develop
0.7.10
2 parents 1fcc3f3 + 9baaf23 commit 2b347b5

File tree

6 files changed

+22
-11
lines changed

6 files changed

+22
-11
lines changed

dart_native/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 0.7.10
2+
3+
* [Fix] A dangling pointer on Android.
4+
* [Fix] DetachCurrentThread crash on Android.
5+
* [Feature] Collections support automatic type conversions on Android.
6+
17
## 0.7.9
28

39
* Bump to ffi >=1.1.2

dart_native/example/pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ packages:
168168
path: ".."
169169
relative: true
170170
source: path
171-
version: "0.7.9"
171+
version: "0.7.10"
172172
dart_native_gen:
173173
dependency: transitive
174174
description:

dart_native/lib/src/android/runtime/functions.dart

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ typedef MethodNativeCallback = Void Function(
1414
Int64 responseId);
1515

1616
// use in dart async invoke native
17-
typedef InvokeCallback = Void Function(Pointer<Void> result,
18-
Pointer<Utf8> method, Pointer<Pointer<Utf8>> typePointers, Int32 argCount, Int32 isInterface);
17+
typedef InvokeCallback = Void Function(
18+
Pointer<Void> result,
19+
Pointer<Utf8> method,
20+
Pointer<Pointer<Utf8>> typePointers,
21+
Int32 argCount,
22+
Int32 isInterface);
1923

2024
// notify c++ async invoke result
2125
final void Function(

dart_native/lib/src/android/runtime/messenger.dart

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ Pointer<Void> _newNativeObject(String className, {List? args}) {
1414
objectPtr =
1515
nativeCreateObject(classNamePtr, nullptr.cast(), nullptr.cast(), 0, 0);
1616
} else {
17-
NativeArguments nativeArguments = _parseNativeArguments(args, 'java.lang.Object');
17+
NativeArguments nativeArguments =
18+
_parseNativeArguments(args, 'java.lang.Object');
1819
objectPtr = nativeCreateObject(
1920
classNamePtr,
2021
nativeArguments.pointers,
@@ -62,7 +63,8 @@ void _invokeCallback(Pointer<Void> result, Pointer<Utf8> method,
6263
final callback = _invokeCallbackMap[method];
6364
if (callback != null) {
6465
dynamic value = loadValueFromPointer(
65-
result, typePtrs.elementAt(argCount).value.toDartString(), decodeRetVal: isInterface == 1);
66+
result, typePtrs.elementAt(argCount).value.toDartString(),
67+
decodeRetVal: isInterface == 1);
6668
callback(value);
6769
_invokeCallbackMap.remove(method);
6870
}
@@ -106,8 +108,8 @@ dynamic _doInvoke(
106108
}
107109
}
108110

109-
NativeArguments nativeArguments =
110-
_parseNativeArguments(args, returnType, argsSignature: assignedSignaturePtr);
111+
NativeArguments nativeArguments = _parseNativeArguments(args, returnType,
112+
argsSignature: assignedSignaturePtr);
111113

112114
Pointer<Void> invokeMethodRet = nativeInvoke(
113115
objPtr,
@@ -158,8 +160,8 @@ Future<dynamic> invoke(
158160
return completer.future;
159161
}
160162

161-
NativeArguments _parseNativeArguments(List? args,
162-
String returnType, {List<Pointer<Utf8>>? argsSignature}) {
163+
NativeArguments _parseNativeArguments(List? args, String returnType,
164+
{List<Pointer<Utf8>>? argsSignature}) {
163165
Pointer<Pointer<Void>> pointers = nullptr.cast();
164166
Pointer<Pointer<Utf8>> typePointers =
165167
calloc<Pointer<Utf8>>((args?.length ?? 0) + 1);

dart_native/lib/src/common/finalizer.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'dart:ffi';
22

3-
43
import 'package:dart_native/src/common/native_dylib.dart';
54
import 'package:ffi/ffi.dart';
65

dart_native/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: dart_native
22
description: Write native code using Dart. This package liberates you from native code and low performance channel.
3-
version: 0.7.9
3+
version: 0.7.10
44
homepage: https://github.com/dart-native/dart_native
55

66
environment:

0 commit comments

Comments
 (0)