From 373eba35a3ed6beb3bff72aed2cf44db3f1a0a24 Mon Sep 17 00:00:00 2001
From: Hossein Yousefi <yousefi@google.com>
Date: Thu, 16 Nov 2023 16:45:09 +0100
Subject: [PATCH] Fix beta CI and print the analyzer failures

---
 jnigen/example/in_app_java/jnigen.yaml                      | 3 +++
 jnigen/example/in_app_java/lib/android_utils.dart           | 1 +
 jnigen/example/kotlin_plugin/lib/kotlin_bindings.dart       | 1 +
 jnigen/example/notification_plugin/lib/notifications.dart   | 1 +
 .../third_party/org/apache/pdfbox/pdmodel/PDDocument.dart   | 1 +
 .../org/apache/pdfbox/pdmodel/PDDocumentInformation.dart    | 1 +
 .../third_party/org/apache/pdfbox/text/PDFTextStripper.dart | 1 +
 jnigen/lib/src/bindings/dart_generator.dart                 | 1 +
 .../com/fasterxml/jackson/core/JsonFactory.dart             | 1 +
 .../com/fasterxml/jackson/core/JsonParser.dart              | 1 +
 .../dart_bindings/com/fasterxml/jackson/core/JsonToken.dart | 1 +
 .../com/fasterxml/jackson/core/JsonFactory.dart             | 1 +
 .../com/fasterxml/jackson/core/JsonParser.dart              | 1 +
 .../dart_bindings/com/fasterxml/jackson/core/JsonToken.dart | 1 +
 jnigen/test/kotlin_test/c_based/dart_bindings/kotlin.dart   | 1 +
 jnigen/test/kotlin_test/dart_only/dart_bindings/kotlin.dart | 1 +
 .../c_based/dart_bindings/simple_package.dart               | 1 +
 .../dart_only/dart_bindings/simple_package.dart             | 1 +
 jnigen/test/test_util/test_util.dart                        | 6 ++++--
 19 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/jnigen/example/in_app_java/jnigen.yaml b/jnigen/example/in_app_java/jnigen.yaml
index f053698a..e588f4a4 100644
--- a/jnigen/example/in_app_java/jnigen.yaml
+++ b/jnigen/example/in_app_java/jnigen.yaml
@@ -18,3 +18,6 @@ classes:
   - 'androidx.emoji2.text.DefaultEmojiCompatConfig' # From gradle's source path
   - 'android.os.Build' # from gradle's compile classpath
   - 'java.util.HashMap' # from gradle's compile classpath
+exclude:
+  fields:
+    - 'android.os.Build\$VERSION_CODES#UPSIDE_DOWN_CAKE'
diff --git a/jnigen/example/in_app_java/lib/android_utils.dart b/jnigen/example/in_app_java/lib/android_utils.dart
index 8eba9cc8..6e677a90 100644
--- a/jnigen/example/in_app_java/lib/android_utils.dart
+++ b/jnigen/example/in_app_java/lib/android_utils.dart
@@ -4,6 +4,7 @@
 // ignore_for_file: camel_case_extensions
 // ignore_for_file: camel_case_types
 // ignore_for_file: constant_identifier_names
+// ignore_for_file: doc_directive_unknown
 // ignore_for_file: file_names
 // ignore_for_file: lines_longer_than_80_chars
 // ignore_for_file: no_leading_underscores_for_local_identifiers
diff --git a/jnigen/example/kotlin_plugin/lib/kotlin_bindings.dart b/jnigen/example/kotlin_plugin/lib/kotlin_bindings.dart
index efd0351f..e1e7abb6 100644
--- a/jnigen/example/kotlin_plugin/lib/kotlin_bindings.dart
+++ b/jnigen/example/kotlin_plugin/lib/kotlin_bindings.dart
@@ -4,6 +4,7 @@
 // ignore_for_file: camel_case_extensions
 // ignore_for_file: camel_case_types
 // ignore_for_file: constant_identifier_names
+// ignore_for_file: doc_directive_unknown
 // ignore_for_file: file_names
 // ignore_for_file: lines_longer_than_80_chars
 // ignore_for_file: no_leading_underscores_for_local_identifiers
diff --git a/jnigen/example/notification_plugin/lib/notifications.dart b/jnigen/example/notification_plugin/lib/notifications.dart
index 9855d16a..d91a2f57 100644
--- a/jnigen/example/notification_plugin/lib/notifications.dart
+++ b/jnigen/example/notification_plugin/lib/notifications.dart
@@ -8,6 +8,7 @@
 // ignore_for_file: camel_case_extensions
 // ignore_for_file: camel_case_types
 // ignore_for_file: constant_identifier_names
+// ignore_for_file: doc_directive_unknown
 // ignore_for_file: file_names
 // ignore_for_file: lines_longer_than_80_chars
 // ignore_for_file: no_leading_underscores_for_local_identifiers
diff --git a/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/pdmodel/PDDocument.dart b/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/pdmodel/PDDocument.dart
index b2c40a28..e8777cba 100644
--- a/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/pdmodel/PDDocument.dart
+++ b/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/pdmodel/PDDocument.dart
@@ -22,6 +22,7 @@
 // ignore_for_file: camel_case_extensions
 // ignore_for_file: camel_case_types
 // ignore_for_file: constant_identifier_names
+// ignore_for_file: doc_directive_unknown
 // ignore_for_file: file_names
 // ignore_for_file: lines_longer_than_80_chars
 // ignore_for_file: no_leading_underscores_for_local_identifiers
diff --git a/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/pdmodel/PDDocumentInformation.dart b/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/pdmodel/PDDocumentInformation.dart
index 3c959e76..b05c031d 100644
--- a/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/pdmodel/PDDocumentInformation.dart
+++ b/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/pdmodel/PDDocumentInformation.dart
@@ -22,6 +22,7 @@
 // ignore_for_file: camel_case_extensions
 // ignore_for_file: camel_case_types
 // ignore_for_file: constant_identifier_names
+// ignore_for_file: doc_directive_unknown
 // ignore_for_file: file_names
 // ignore_for_file: lines_longer_than_80_chars
 // ignore_for_file: no_leading_underscores_for_local_identifiers
diff --git a/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/text/PDFTextStripper.dart b/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/text/PDFTextStripper.dart
index 930240b7..fcdfda2d 100644
--- a/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/text/PDFTextStripper.dart
+++ b/jnigen/example/pdfbox_plugin/lib/src/third_party/org/apache/pdfbox/text/PDFTextStripper.dart
@@ -22,6 +22,7 @@
 // ignore_for_file: camel_case_extensions
 // ignore_for_file: camel_case_types
 // ignore_for_file: constant_identifier_names
+// ignore_for_file: doc_directive_unknown
 // ignore_for_file: file_names
 // ignore_for_file: lines_longer_than_80_chars
 // ignore_for_file: no_leading_underscores_for_local_identifiers
diff --git a/jnigen/lib/src/bindings/dart_generator.dart b/jnigen/lib/src/bindings/dart_generator.dart
index 9c206929..b202293d 100644
--- a/jnigen/lib/src/bindings/dart_generator.dart
+++ b/jnigen/lib/src/bindings/dart_generator.dart
@@ -151,6 +151,7 @@ import "package:jni/jni.dart" as jni;
 // ignore_for_file: camel_case_extensions
 // ignore_for_file: camel_case_types
 // ignore_for_file: constant_identifier_names
+// ignore_for_file: doc_directive_unknown
 // ignore_for_file: file_names
 // ignore_for_file: lines_longer_than_80_chars
 // ignore_for_file: no_leading_underscores_for_local_identifiers
diff --git a/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonFactory.dart b/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonFactory.dart
index 95ddfd57..822a0526 100644
--- a/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonFactory.dart
+++ b/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonFactory.dart
@@ -21,6 +21,7 @@
 // ignore_for_file: camel_case_extensions
 // ignore_for_file: camel_case_types
 // ignore_for_file: constant_identifier_names
+// ignore_for_file: doc_directive_unknown
 // ignore_for_file: file_names
 // ignore_for_file: lines_longer_than_80_chars
 // ignore_for_file: no_leading_underscores_for_local_identifiers
diff --git a/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonParser.dart b/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonParser.dart
index 5775da71..4a1863df 100644
--- a/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonParser.dart
+++ b/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonParser.dart
@@ -21,6 +21,7 @@
 // ignore_for_file: camel_case_extensions
 // ignore_for_file: camel_case_types
 // ignore_for_file: constant_identifier_names
+// ignore_for_file: doc_directive_unknown
 // ignore_for_file: file_names
 // ignore_for_file: lines_longer_than_80_chars
 // ignore_for_file: no_leading_underscores_for_local_identifiers
diff --git a/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonToken.dart b/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonToken.dart
index 4d80a8f7..2d036c5a 100644
--- a/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonToken.dart
+++ b/jnigen/test/jackson_core_test/third_party/c_based/dart_bindings/com/fasterxml/jackson/core/JsonToken.dart
@@ -21,6 +21,7 @@
 // ignore_for_file: camel_case_extensions
 // ignore_for_file: camel_case_types
 // ignore_for_file: constant_identifier_names
+// ignore_for_file: doc_directive_unknown
 // ignore_for_file: file_names
 // ignore_for_file: lines_longer_than_80_chars
 // ignore_for_file: no_leading_underscores_for_local_identifiers
diff --git a/jnigen/test/jackson_core_test/third_party/dart_only/dart_bindings/com/fasterxml/jackson/core/JsonFactory.dart b/jnigen/test/jackson_core_test/third_party/dart_only/dart_bindings/com/fasterxml/jackson/core/JsonFactory.dart
index 3cdf2ff8..5aab2d45 100644
--- a/jnigen/test/jackson_core_test/third_party/dart_only/dart_bindings/com/fasterxml/jackson/core/JsonFactory.dart
+++ b/jnigen/test/jackson_core_test/third_party/dart_only/dart_bindings/com/fasterxml/jackson/core/JsonFactory.dart
@@ -21,6 +21,7 @@
 // ignore_for_file: camel_case_extensions
 // ignore_for_file: camel_case_types
 // ignore_for_file: constant_identifier_names
+// ignore_for_file: doc_directive_unknown
 // ignore_for_file: file_names
 // ignore_for_file: lines_longer_than_80_chars
 // ignore_for_file: no_leading_underscores_for_local_identifiers
diff --git a/jnigen/test/jackson_core_test/third_party/dart_only/dart_bindings/com/fasterxml/jackson/core/JsonParser.dart b/jnigen/test/jackson_core_test/third_party/dart_only/dart_bindings/com/fasterxml/jackson/core/JsonParser.dart
index d94c2205..2c27eccd 100644
--- a/jnigen/test/jackson_core_test/third_party/dart_only/dart_bindings/com/fasterxml/jackson/core/JsonParser.dart
+++ b/jnigen/test/jackson_core_test/third_party/dart_only/dart_bindings/com/fasterxml/jackson/core/JsonParser.dart
@@ -21,6 +21,7 @@
 // ignore_for_file: camel_case_extensions
 // ignore_for_file: camel_case_types
 // ignore_for_file: constant_identifier_names
+// ignore_for_file: doc_directive_unknown
 // ignore_for_file: file_names
 // ignore_for_file: lines_longer_than_80_chars
 // ignore_for_file: no_leading_underscores_for_local_identifiers
diff --git a/jnigen/test/jackson_core_test/third_party/dart_only/dart_bindings/com/fasterxml/jackson/core/JsonToken.dart b/jnigen/test/jackson_core_test/third_party/dart_only/dart_bindings/com/fasterxml/jackson/core/JsonToken.dart
index 573a815a..4e67a2d4 100644
--- a/jnigen/test/jackson_core_test/third_party/dart_only/dart_bindings/com/fasterxml/jackson/core/JsonToken.dart
+++ b/jnigen/test/jackson_core_test/third_party/dart_only/dart_bindings/com/fasterxml/jackson/core/JsonToken.dart
@@ -21,6 +21,7 @@
 // ignore_for_file: camel_case_extensions
 // ignore_for_file: camel_case_types
 // ignore_for_file: constant_identifier_names
+// ignore_for_file: doc_directive_unknown
 // ignore_for_file: file_names
 // ignore_for_file: lines_longer_than_80_chars
 // ignore_for_file: no_leading_underscores_for_local_identifiers
diff --git a/jnigen/test/kotlin_test/c_based/dart_bindings/kotlin.dart b/jnigen/test/kotlin_test/c_based/dart_bindings/kotlin.dart
index 3e264274..e96d08c4 100644
--- a/jnigen/test/kotlin_test/c_based/dart_bindings/kotlin.dart
+++ b/jnigen/test/kotlin_test/c_based/dart_bindings/kotlin.dart
@@ -8,6 +8,7 @@
 // ignore_for_file: camel_case_extensions
 // ignore_for_file: camel_case_types
 // ignore_for_file: constant_identifier_names
+// ignore_for_file: doc_directive_unknown
 // ignore_for_file: file_names
 // ignore_for_file: lines_longer_than_80_chars
 // ignore_for_file: no_leading_underscores_for_local_identifiers
diff --git a/jnigen/test/kotlin_test/dart_only/dart_bindings/kotlin.dart b/jnigen/test/kotlin_test/dart_only/dart_bindings/kotlin.dart
index bd4441f3..b3a1985d 100644
--- a/jnigen/test/kotlin_test/dart_only/dart_bindings/kotlin.dart
+++ b/jnigen/test/kotlin_test/dart_only/dart_bindings/kotlin.dart
@@ -8,6 +8,7 @@
 // ignore_for_file: camel_case_extensions
 // ignore_for_file: camel_case_types
 // ignore_for_file: constant_identifier_names
+// ignore_for_file: doc_directive_unknown
 // ignore_for_file: file_names
 // ignore_for_file: lines_longer_than_80_chars
 // ignore_for_file: no_leading_underscores_for_local_identifiers
diff --git a/jnigen/test/simple_package_test/c_based/dart_bindings/simple_package.dart b/jnigen/test/simple_package_test/c_based/dart_bindings/simple_package.dart
index c4f64a18..8149d4e9 100644
--- a/jnigen/test/simple_package_test/c_based/dart_bindings/simple_package.dart
+++ b/jnigen/test/simple_package_test/c_based/dart_bindings/simple_package.dart
@@ -8,6 +8,7 @@
 // ignore_for_file: camel_case_extensions
 // ignore_for_file: camel_case_types
 // ignore_for_file: constant_identifier_names
+// ignore_for_file: doc_directive_unknown
 // ignore_for_file: file_names
 // ignore_for_file: lines_longer_than_80_chars
 // ignore_for_file: no_leading_underscores_for_local_identifiers
diff --git a/jnigen/test/simple_package_test/dart_only/dart_bindings/simple_package.dart b/jnigen/test/simple_package_test/dart_only/dart_bindings/simple_package.dart
index ba022690..8e0f1ce8 100644
--- a/jnigen/test/simple_package_test/dart_only/dart_bindings/simple_package.dart
+++ b/jnigen/test/simple_package_test/dart_only/dart_bindings/simple_package.dart
@@ -8,6 +8,7 @@
 // ignore_for_file: camel_case_extensions
 // ignore_for_file: camel_case_types
 // ignore_for_file: constant_identifier_names
+// ignore_for_file: doc_directive_unknown
 // ignore_for_file: file_names
 // ignore_for_file: lines_longer_than_80_chars
 // ignore_for_file: no_leading_underscores_for_local_identifiers
diff --git a/jnigen/test/test_util/test_util.dart b/jnigen/test/test_util/test_util.dart
index 3c418abc..8fbc7ce4 100644
--- a/jnigen/test/test_util/test_util.dart
+++ b/jnigen/test/test_util/test_util.dart
@@ -149,8 +149,10 @@ Future<void> generateAndAnalyzeBindings(Config config) async {
   try {
     await _generateTempBindings(config, tempDir);
     final analyzeResult = Process.runSync("dart", ["analyze", tempDir.path]);
-    expect(analyzeResult.exitCode, equals(0),
-        reason: "Analyzer exited with non-zero status");
+    if (analyzeResult.exitCode != 0) {
+      stderr.write(analyzeResult.stdout);
+      fail('Analyzer exited with non-zero status (${analyzeResult.exitCode})');
+    }
   } finally {
     tempDir.deleteSync(recursive: true);
   }