nits

Author: tarrinneal

packages/pigeon/CHANGELOG.md

@@ -1,7 +1,7 @@
 ## 26.4.0
 
 * [swift] [kotlin] Adds support for FFI and JNI.
-* Expose missing PigeonOptions and language-specific configurations as command-line arguments.
+* Exposes missing PigeonOptions and language-specific configurations as command-line arguments.
 
 ## 26.3.4
 

packages/pigeon/pigeons/ni_tests.dart

@@ -1413,32 +1413,6 @@ abstract class NIHostIntegrationCoreApi {
   bool callFlutterNoopOnBackgroundThread();
 }
 
-/// An API that can be implemented for minimal, compile-only tests.
-//
-// This is also here to test that multiple host APIs can be generated
-// successfully in all languages (e.g., in Java where it requires having a
-// wrapper class).
-// @HostApi()
-// abstract class NIHostTrivialApi {
-//   void noop();
-// }
-
-/// A simple API implemented in some unit tests.
-//
-// This is separate from NIHostIntegrationCoreApi to avoid having to update a
-// lot of unit tests every time we add something to the integration test API.
-// TODO(stuartmorgan): Restructure the unit tests to reduce the number of
-// different APIs we define.
-// @HostApi()
-// abstract class NIHostSmallApi {
-//   @async
-//   @ObjCSelector('echoString:')
-//   String echo(String aString);
-
-//   @async
-//   void voidVoid();
-// }
-
 /// The core interface that the Dart platform_test code implements for host
 /// integration tests to call into.
 @FlutterApi()

packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/ni_tests.gen.dart

@@ -11489,6 +11489,7 @@ class NIHostIntegrationCoreApi {
     return pigeonVar_replyValue! as NIAllNullableTypes;
   }
 
+  /// Returns passed in arguments of multiple types.
   Future<NIAllNullableTypesWithoutRecursion>
   sendMultipleNullableTypesWithoutRecursion(
     bool? aNullableBool,

packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/ni_tests.gen.ffi.dart

@@ -22773,7 +22773,7 @@ extension NIHostIntegrationCoreApiSetup$Methods
           );
   }
 
-  /// sendMultipleNullableTypesWithoutRecursionWithANullableBool:aNullableInt:aNullableString:wrappedError:
+  /// Returns passed in arguments of multiple types.
   ///
   /// iOS: introduced 13.0.0
   /// macOS: introduced 10.15.0

packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/NiTests.gen.kt

@@ -1130,7 +1130,7 @@ abstract class NIHostIntegrationCoreApi {
       aNullableInt: Long?,
       aNullableString: String?
   ): NIAllNullableTypes
-
+  /** Returns passed in arguments of multiple types. */
   abstract fun sendMultipleNullableTypesWithoutRecursion(
       aNullableBool: Boolean?,
       aNullableInt: Long?,
@@ -2101,7 +2101,7 @@ class NIHostIntegrationCoreApiRegistrar : NIHostIntegrationCoreApi() {
     }
     error("NIHostIntegrationCoreApi has not been set")
   }
-
+  /** Returns passed in arguments of multiple types. */
   override fun sendMultipleNullableTypesWithoutRecursion(
       aNullableBool: Boolean?,
       aNullableInt: Long?,

packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Sources/test_plugin/NiTests.gen.swift

@@ -2051,6 +2051,7 @@ protocol NIHostIntegrationCoreApi {
   func sendMultipleNullableTypes(
     aBool aNullableBool: Bool?, anInt aNullableInt: Int64?, aString aNullableString: String?
   ) throws -> NIAllNullableTypes
+  /// Returns passed in arguments of multiple types.
   func sendMultipleNullableTypesWithoutRecursion(
     aBool aNullableBool: Bool?, anInt aNullableInt: Int64?, aString aNullableString: String?
   ) throws -> NIAllNullableTypesWithoutRecursion
@@ -3117,6 +3118,7 @@ protocol NIHostIntegrationCoreApi {
     }
     return nil
   }
+  /// Returns passed in arguments of multiple types.
   @objc func sendMultipleNullableTypesWithoutRecursion(
     aNullableBool: NSNumber?, aNullableInt: NSNumber?, aNullableString: NSString?,
     wrappedError: NiTestsError

packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Sources/test_plugin_objc/NiTests.gen.o

@@ -1479,6 +1479,7 @@ SWIFT_AVAILABILITY(macos, introduced = 10.15)
                                   wrappedError:
                                       (NiTestsError* _Nonnull)wrappedError
     SWIFT_WARN_UNUSED_RESULT;
+/// Returns passed in arguments of multiple types.
 - (NIAllNullableTypesWithoutRecursionBridge* _Nullable)
     sendMultipleNullableTypesWithoutRecursionWithANullableBool:
         (NSNumber* _Nullable)aNullableBool

packages/pigeon/platform_tests/test_plugin/darwin/test_plugin/Sources/test_plugin_objc/test_plugin.h

@@ -40,3 +40,89 @@ android {
 flutter {
     source = "../.."
 }
+// Gradle stub for listing dependencies in JNIgen. If found in
+// android/build.gradle.kts, please delete the following task.
+tasks.register<DefaultTask>("getReleaseCompileClasspath") {
+  // Tell Gradle to complete the configuration phase of all subprojects (eg
+  // Flutter plugins) before continuing configuration of this project.
+  allprojects {
+    if (this != rootProject) {
+      evaluationDependsOn(path)
+    }
+  }
+
+  // Fetch all the dependencies and extract the JARs.
+  allprojects {
+    val config = configurations.findByName("releaseCompileClasspath") ?: return@allprojects
+    try {
+      // Find all JARs.
+      val jarView = config.incoming.artifactView {
+        attributes {
+          attribute(org.gradle.api.attributes.Attribute.of("artifactType", String::class.java), "jar")
+        }
+        lenient(true)
+      }
+      inputs.files(jarView.files)
+
+      // Also find all JARs stored in AARs.
+      val aarView = config.incoming.artifactView {
+        attributes {
+          attribute(org.gradle.api.attributes.Attribute.of("artifactType", String::class.java), "android-classes-jar")
+        }
+        lenient(true)
+      }
+      inputs.files(aarView.files)
+    } catch (e: Exception) {}
+  }
+
+  // Find all the JARs and print their paths.
+  doLast {
+    try {
+      val cp = mutableListOf<File>()
+
+      // JNIgen uses the first version of a class it finds, so the order we list
+      // the JARs in is important.
+      val mainProject = allprojects.find { project ->
+        project.plugins.hasPlugin("com.android.application")
+      } ?: project
+
+      // Start with the android bootClasspath. This contains things like java.*
+      // and android.*.
+      val android = mainProject.extensions.findByName("android") as? com.android.build.gradle.BaseExtension
+      android?.bootClasspath?.let { file -> cp.addAll(file) }
+
+      // Next, add the main project's JARs, followed by all the other project's
+      // JARs.
+      val projects = (listOf(mainProject) + allprojects).distinct()
+      projects.forEach { project ->
+        val config = project.configurations.findByName("releaseCompileClasspath") ?: return@forEach
+        try {
+          // Add all JARs.
+          cp.addAll(config.incoming.artifactView {
+            attributes {
+              attribute(org.gradle.api.attributes.Attribute.of("artifactType", String::class.java), "jar")
+            }
+            lenient(true)
+          }.files)
+
+          // Add all JARs that were contained in AARs.
+          cp.addAll(config.incoming.artifactView {
+            attributes {
+              attribute(org.gradle.api.attributes.Attribute.of("artifactType", String::class.java), "android-classes-jar")
+            }
+            lenient(true)
+          }.files)
+        } catch (e: Exception) {}
+      }
+
+      // Dedupe and print the absolute paths to all the JARs.
+      cp.map { file -> file.absolutePath }.distinct().forEach {
+        path -> println(path)
+      }
+    } catch (e: Exception) {
+      System.err.println("Gradle stub cannot find JAR libraries.")
+      throw e
+    }
+  }
+  System.err.println("If you are seeing this error in `flutter build` output, it is likely that JNIgen left some stubs in the build.gradle file. Please restore that file from your version control system or manually remove the stub functions named getReleaseCompileClasspath and / or getSources.")
+}