Skip to content

Commit fa77bf7

Browse files
authored
[jnigen] Extension types (dart-lang#3093)
1 parent 269d65c commit fa77bf7

79 files changed

Lines changed: 20030 additions & 18228 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/jnigen.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,8 @@ jobs:
229229
run: |
230230
dart run tool/generate_jni_bindings.dart
231231
git diff --exit-code -- lib/src/plugin
232+
dart run tool/generate_primitive_arrays.dart
233+
git diff --exit-code -- lib/src/primitive_jarrays.dart
232234
# TODO(https://github.com/dart-lang/ffigen/issues/555): FFIgen generated
233235
# on my machine has macOS specific stuff and CI does not.
234236
# We should just generate the struct as opaque, but we currently can't.

‎pkgs/jni/CHANGELOG.md‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1-
## 0.15.3-wip
2-
1+
## 0.16.0
2+
3+
- **Breaking Change**: All Java wrapper classes have been migrated to extension
4+
types. The main effects are:
5+
- All collections (`JList`, `JMap` etc) are now direct code generated wrappers
6+
around the Java objects, so are less Darty. Instead there are now Darty
7+
adapter classes you can access via `asDart()`.
8+
- No more nullable `JType` classes, only `JType` classes, and the `JType`
9+
class is simplified.
10+
- It is no longer necessary to pass around the `JType` in many cases where it
11+
used to be required.
312
- Added `Jni.captureStackTraceOnRelease` which defaults to `false`. When this is
413
set, the stack traces of the release points will be stored for `JObject`s to
514
help debug `DoubleReleaseError` and `UseAfterReleaseError`s. This includes the

‎pkgs/jni/example/integration_test/on_device_jni_test.dart‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import '../../test/jstring_test.dart' as jstring_test;
1313
import '../../test/jset_test.dart' as jset_test;
1414
import '../../test/jarray_test.dart' as jarray_test;
1515
import '../../test/boxed_test.dart' as boxed_test;
16-
import '../../test/type_test.dart' as type_test;
1716
import '../../test/load_test.dart' as load_test;
1817
import '../../test/isolate_test.dart' as isolate_test;
1918

@@ -34,7 +33,6 @@ void main() {
3433
jset_test.run,
3534
jarray_test.run,
3635
boxed_test.run,
37-
type_test.run,
3836
load_test.run,
3937
isolate_test.run,
4038
];

‎pkgs/jni/lib/_internal.dart‎

Lines changed: 18 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -28,28 +28,8 @@ export 'dart:isolate' show RawReceivePort, ReceivePort;
2828
export 'package:meta/meta.dart' show internal;
2929

3030
export 'src/accessors.dart';
31-
export 'src/jarray.dart'
32-
show
33-
$JArray$NullableType$,
34-
$JArray$Type$,
35-
$JBooleanArray$NullableType$,
36-
$JBooleanArray$Type$,
37-
$JByteArray$NullableType$,
38-
$JByteArray$Type$,
39-
$JCharArray$NullableType$,
40-
$JCharArray$Type$,
41-
$JDoubleArray$NullableType$,
42-
$JDoubleArray$Type$,
43-
$JFloatArray$NullableType$,
44-
$JFloatArray$Type$,
45-
$JIntArray$NullableType$,
46-
$JIntArray$Type$,
47-
$JLongArray$NullableType$,
48-
$JLongArray$Type$,
49-
$JShortArray$NullableType$,
50-
$JShortArray$Type$;
5131
export 'src/jni.dart' show ProtectedJniExtensions;
52-
export 'src/jobject.dart' show $JObject$NullableType$, $JObject$Type$;
32+
export 'src/jobject.dart' show $JObject$Type$;
5333
export 'src/jreference.dart';
5434
export 'src/kotlin.dart'
5535
show
@@ -59,29 +39,26 @@ export 'src/kotlin.dart'
5939
result$Class,
6040
result$FailureClass,
6141
resultValueField;
62-
export 'src/lang/jboolean.dart' show $JBoolean$NullableType$, $JBoolean$Type$;
63-
export 'src/lang/jbyte.dart' show $JByte$NullableType$, $JByte$Type$;
64-
export 'src/lang/jcharacter.dart'
65-
show $JCharacter$NullableType$, $JCharacter$Type$;
66-
export 'src/lang/jdouble.dart' show $JDouble$NullableType$, $JDouble$Type$;
67-
export 'src/lang/jfloat.dart' show $JFloat$NullableType$, $JFloat$Type$;
68-
export 'src/lang/jinteger.dart' show $JInteger$NullableType$, $JInteger$Type$;
69-
export 'src/lang/jlong.dart' show $JLong$NullableType$, $JLong$Type$;
70-
export 'src/lang/jnumber.dart' show $JNumber$NullableType$, $JNumber$Type$;
71-
export 'src/lang/jshort.dart' show $JShort$NullableType$, $JShort$Type$;
72-
export 'src/lang/jstring.dart' show $JString$NullableType$, $JString$Type$;
42+
export 'src/lang/jboolean.dart';
43+
export 'src/lang/jbyte.dart';
44+
export 'src/lang/jcharacter.dart';
45+
export 'src/lang/jdouble.dart';
46+
export 'src/lang/jfloat.dart';
47+
export 'src/lang/jinteger.dart';
48+
export 'src/lang/jlong.dart';
49+
export 'src/lang/jnumber.dart';
50+
export 'src/lang/jshort.dart';
51+
export 'src/lang/jstring.dart';
7352
export 'src/method_invocation.dart';
74-
export 'src/nio/jbuffer.dart' show $JBuffer$NullableType$, $JBuffer$Type$;
75-
export 'src/nio/jbyte_buffer.dart'
76-
show $JByteBuffer$NullableType$, $JByteBuffer$Type$;
53+
export 'src/nio/jbuffer.dart';
54+
export 'src/nio/jbyte_buffer.dart';
7755
export 'src/third_party/generated_bindings.dart'
7856
show JFieldIDPtr, JMethodIDPtr, JObjectPtr, JThrowablePtr, JniResult;
79-
export 'src/types.dart' show JTypeBase, lowestCommonSuperType, referenceType;
80-
export 'src/util/jiterator.dart'
81-
show $JIterator$NullableType$, $JIterator$Type$;
82-
export 'src/util/jlist.dart' show $JList$NullableType$, $JList$Type$;
83-
export 'src/util/jmap.dart' show $JMap$NullableType$, $JMap$Type$;
84-
export 'src/util/jset.dart' show $JSet$NullableType$, $JSet$Type$;
57+
export 'src/types.dart' show JTypeBase;
58+
export 'src/util/jiterator.dart';
59+
export 'src/util/jlist.dart';
60+
export 'src/util/jmap.dart';
61+
export 'src/util/jset.dart';
8562

8663
/// Temporary fix for the macOS arm64 varargs problem.
8764
///

‎pkgs/jni/lib/jni.dart‎

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -62,34 +62,25 @@ library;
6262

6363
export 'package:ffi/ffi.dart' show Arena, using;
6464

65+
export 'src/core_bindings.dart'
66+
show
67+
JArrayList,
68+
JCollection,
69+
JHashMap,
70+
JHashSet,
71+
JIterator,
72+
JList,
73+
JMap,
74+
JSet;
6575
export 'src/errors.dart';
66-
export 'src/jarray.dart'
67-
hide
68-
$JArray$NullableType$,
69-
$JArray$Type$,
70-
$JBooleanArray$NullableType$,
71-
$JBooleanArray$Type$,
72-
$JByteArray$NullableType$,
73-
$JByteArray$Type$,
74-
$JCharArray$NullableType$,
75-
$JCharArray$Type$,
76-
$JDoubleArray$NullableType$,
77-
$JDoubleArray$Type$,
78-
$JFloatArray$NullableType$,
79-
$JFloatArray$Type$,
80-
$JIntArray$NullableType$,
81-
$JIntArray$Type$,
82-
$JLongArray$NullableType$,
83-
$JLongArray$Type$,
84-
$JShortArray$NullableType$,
85-
$JShortArray$Type$;
76+
export 'src/jarray.dart';
8677
export 'src/jimplementer.dart';
8778
export 'src/jni.dart'
8879
hide InternalJniExtension, ProtectedJniExtensions, StringMethodsForJni;
89-
export 'src/jobject.dart' hide $JObject$NullableType$, $JObject$Type$;
80+
export 'src/jobject.dart' hide $JObject$Type$;
9081
export 'src/jreference.dart' hide ProtectedJReference;
9182
export 'src/jvalues.dart';
9283
export 'src/lang/lang.dart';
9384
export 'src/nio/nio.dart';
94-
export 'src/types.dart' hide JTypeBase, lowestCommonSuperType;
95-
export 'src/util/util.dart';
85+
export 'src/types.dart' hide JTypeBase;
86+
export 'src/util/util.dart' hide JIteratorAdapter;

‎pkgs/jni/lib/src/accessors.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import 'jni.dart';
1010
import 'jobject.dart';
1111
import 'jreference.dart';
1212
import 'third_party/generated_bindings.dart';
13-
import 'types.dart';
1413

1514
void _check(JThrowablePtr exception) {
1615
if (exception != nullptr) {
@@ -72,8 +71,9 @@ extension JniResultMethods on JniResult {
7271
return pointer == nullptr ? jNullReference : JGlobalReference(pointer);
7372
}
7473

75-
T object<T extends JObject?>(JType<T> type) {
76-
return type.fromReference(reference);
74+
T object<T extends JObject?>() {
75+
final ref = reference;
76+
return (ref == jNullReference ? null : JObject.fromReference(ref)) as T;
7777
}
7878

7979
bool get boolean {

0 commit comments

Comments
 (0)