[jnigen] Enable implementing generic interfaces (#1635)

dart-lang · Oct 8, 2024 · 290f21a · 290f21a
1 parent f723a58
commit 290f21a
Show file tree

Hide file tree

Showing 16 changed files with 939 additions and 287 deletions.
diff --git a/pkgs/jnigen/CHANGELOG.md b/pkgs/jnigen/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.12.1
+
+- Support implementing generic functions in interfaces.
+
 ## 0.12.0
 
 - **Breaking Change**([#1530](https://github.com/dart-lang/native/pull/1530)):

diff --git a/pkgs/jnigen/docs/interface_implementation.md b/pkgs/jnigen/docs/interface_implementation.md
@@ -36,7 +36,7 @@ class Runnable extends JObject {
   ) { /* ... */ }
 }
 
-abstract mixin class $Runnable {
+abstract base mixin class $Runnable {
   factory $Runnable({
     required void Function() run,
     bool run$async,
@@ -87,7 +87,7 @@ implementing the interface in Java instead of using the lambdas:
 
 ```java
 // Java
-public class Printer with Runnable {
+public class Printer implements Runnable {
   private final String text;
 
   public Printer(String text) {
@@ -108,7 +108,7 @@ You can do the same in Dart by creating a subclass that implements `$Runnable`:
 
 ```dart
 // Dart
-class Printer with $Runnable {
+final class Printer with $Runnable {
   final String text;
 
   Printer(this.text);
@@ -145,7 +145,7 @@ Similarly, when subclassing
 
 ```dart
 // Dart
-class Printer with $Runnable {
+final class Printer with $Runnable {
   final String text;
 
   Printer(this.text);

diff --git a/pkgs/jnigen/example/in_app_java/lib/android_utils.dart b/pkgs/jnigen/example/in_app_java/lib/android_utils.dart
@@ -125,13 +125,13 @@ class EmojiCompat_CodepointSequenceMatchResult extends _$jni.JObject {
   }
 }
 
-abstract mixin class $EmojiCompat_CodepointSequenceMatchResult {
+abstract base mixin class $EmojiCompat_CodepointSequenceMatchResult {
   factory $EmojiCompat_CodepointSequenceMatchResult() =
       _$EmojiCompat_CodepointSequenceMatchResult;
 }
 
-class _$EmojiCompat_CodepointSequenceMatchResult
-    implements $EmojiCompat_CodepointSequenceMatchResult {
+final class _$EmojiCompat_CodepointSequenceMatchResult
+    with $EmojiCompat_CodepointSequenceMatchResult {
   _$EmojiCompat_CodepointSequenceMatchResult();
 }
 
@@ -729,7 +729,7 @@ class EmojiCompat_GlyphChecker extends _$jni.JObject {
   }
 }
 
-abstract mixin class $EmojiCompat_GlyphChecker {
+abstract base mixin class $EmojiCompat_GlyphChecker {
   factory $EmojiCompat_GlyphChecker({
     required bool Function(_$jni.JObject charSequence, int i, int i1, int i2)
         hasGlyph,
@@ -738,7 +738,7 @@ abstract mixin class $EmojiCompat_GlyphChecker {
   bool hasGlyph(_$jni.JObject charSequence, int i, int i1, int i2);
 }
 
-class _$EmojiCompat_GlyphChecker implements $EmojiCompat_GlyphChecker {
+final class _$EmojiCompat_GlyphChecker with $EmojiCompat_GlyphChecker {
   _$EmojiCompat_GlyphChecker({
     required bool Function(_$jni.JObject charSequence, int i, int i1, int i2)
         hasGlyph,
@@ -972,11 +972,11 @@ class EmojiCompat_LoadStrategy extends _$jni.JObject {
   }
 }
 
-abstract mixin class $EmojiCompat_LoadStrategy {
+abstract base mixin class $EmojiCompat_LoadStrategy {
   factory $EmojiCompat_LoadStrategy() = _$EmojiCompat_LoadStrategy;
 }
 
-class _$EmojiCompat_LoadStrategy implements $EmojiCompat_LoadStrategy {
+final class _$EmojiCompat_LoadStrategy with $EmojiCompat_LoadStrategy {
   _$EmojiCompat_LoadStrategy();
 }
 
@@ -1137,7 +1137,7 @@ class EmojiCompat_MetadataRepoLoader extends _$jni.JObject {
   }
 }
 
-abstract mixin class $EmojiCompat_MetadataRepoLoader {
+abstract base mixin class $EmojiCompat_MetadataRepoLoader {
   factory $EmojiCompat_MetadataRepoLoader({
     required void Function(
             EmojiCompat_MetadataRepoLoaderCallback metadataRepoLoaderCallback)
@@ -1149,8 +1149,8 @@ abstract mixin class $EmojiCompat_MetadataRepoLoader {
   bool get load$async => false;
 }
 
-class _$EmojiCompat_MetadataRepoLoader
-    implements $EmojiCompat_MetadataRepoLoader {
+final class _$EmojiCompat_MetadataRepoLoader
+    with $EmojiCompat_MetadataRepoLoader {
   _$EmojiCompat_MetadataRepoLoader({
     required void Function(
             EmojiCompat_MetadataRepoLoaderCallback metadataRepoLoaderCallback)
@@ -1393,11 +1393,11 @@ class EmojiCompat_ReplaceStrategy extends _$jni.JObject {
   }
 }
 
-abstract mixin class $EmojiCompat_ReplaceStrategy {
+abstract base mixin class $EmojiCompat_ReplaceStrategy {
   factory $EmojiCompat_ReplaceStrategy() = _$EmojiCompat_ReplaceStrategy;
 }
 
-class _$EmojiCompat_ReplaceStrategy implements $EmojiCompat_ReplaceStrategy {
+final class _$EmojiCompat_ReplaceStrategy with $EmojiCompat_ReplaceStrategy {
   _$EmojiCompat_ReplaceStrategy();
 }
 
@@ -1558,7 +1558,7 @@ class EmojiCompat_SpanFactory extends _$jni.JObject {
   }
 }
 
-abstract mixin class $EmojiCompat_SpanFactory {
+abstract base mixin class $EmojiCompat_SpanFactory {
   factory $EmojiCompat_SpanFactory({
     required _$jni.JObject Function(_$jni.JObject typefaceEmojiRasterizer)
         createSpan,
@@ -1567,7 +1567,7 @@ abstract mixin class $EmojiCompat_SpanFactory {
   _$jni.JObject createSpan(_$jni.JObject typefaceEmojiRasterizer);
 }
 
-class _$EmojiCompat_SpanFactory implements $EmojiCompat_SpanFactory {
+final class _$EmojiCompat_SpanFactory with $EmojiCompat_SpanFactory {
   _$EmojiCompat_SpanFactory({
     required _$jni.JObject Function(_$jni.JObject typefaceEmojiRasterizer)
         createSpan,