0.8.0 - Exclude clinit

dart-lang · Apr 3, 2024 · be7fc59 · be7fc59
1 parent 179a177
commit be7fc59
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 5 deletions.
diff --git a/pkgs/jni/CHANGELOG.md b/pkgs/jni/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.8.0-wip
+## 0.8.0
 
 - **Breaking Change** ([#981](https://github.com/dart-lang/native/issues/981)):
 

diff --git a/pkgs/jni/pubspec.yaml b/pkgs/jni/pubspec.yaml
@@ -4,7 +4,7 @@
 
 name: jni
 description: A library to access JNI from Dart and Flutter that acts as a support library for package:jnigen.
-version: 0.8.0-wip
+version: 0.8.0
 repository: https://github.com/dart-lang/native/tree/main/pkgs/jni
 
 topics:

diff --git a/pkgs/jnigen/CHANGELOG.md b/pkgs/jnigen/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.8.0-wip
+## 0.8.0
 
 - **Breaking Change** ([#981](https://github.com/dart-lang/native/issues/981)):
   - `fromRef` is now `fromReference`, and it gets a `JReference` instead of a
@@ -12,6 +12,8 @@
   `static const String` fields in Dart.
 - Fixed a bug where a package would either be searched from sources or classes
   but not both.
+- Fixed a bug where `<clinit>` (class initialization method) which is not
+  necessary to be exposed was generated.
 
 ## 0.7.0
 

diff --git a/pkgs/jnigen/README.md b/pkgs/jnigen/README.md
@@ -58,7 +58,7 @@ final ffi.Pointer<T> Function<T extends ffi.NativeType>(String sym) jniLookup =
 
 /// from: com.example.in_app_java.AndroidUtils
 class AndroidUtils extends jni.JObject {
-  AndroidUtils.fromRef(ffi.Pointer<ffi.Void> ref) : super.fromRef(ref);
+  AndroidUtils.fromReference(JReference reference) : super.fromReference(reference);
 
   static final _showToast = jniLookup<
           ffi.NativeFunction<

diff --git a/pkgs/jnigen/lib/src/bindings/excluder.dart b/pkgs/jnigen/lib/src/bindings/excluder.dart
@@ -42,6 +42,7 @@ class _ClassExcluder extends Visitor<ClassDecl, void> {
     node.methods = node.methods.where((method) {
       final included = !_isPrivate(method) &&
           !method.name.startsWith('_') &&
+          method.name != '<clinit>' &&
           (config.exclude?.methods?.included(node, method) ?? true);
       if (!included) {
         log.fine('Excluded method ${node.binaryName}#${method.name}');

diff --git a/pkgs/jnigen/pubspec.yaml b/pkgs/jnigen/pubspec.yaml
@@ -4,7 +4,7 @@
 
 name: jnigen
 description: A Dart bindings generator for Java and Kotlin that uses JNI under the hood to interop with Java virtual machine.
-version: 0.8.0-wip
+version: 0.8.0
 repository: https://github.com/dart-lang/native/tree/main/pkgs/jnigen
 
 environment:

diff --git a/...gen/test/simple_package_test/java/com/github/dart_lang/jnigen/simple_package/Example.java b/...gen/test/simple_package_test/java/com/github/dart_lang/jnigen/simple_package/Example.java
@@ -7,6 +7,11 @@
 import java.util.*;
 
 public class Example {
+  static {
+    // This turns into a <clinit> method in the bytecode. Making sure jnigen
+    // does not generate it.
+  }
+
   // static fields - primitive & string
   public static final int ON = 1;
   public static final int OFF = 0;