Skip to content

Commit dd5e68c

Browse files
committed
fix jni kotlin package
1 parent aa7372b commit dd5e68c

13 files changed

Lines changed: 3776 additions & 3818 deletions

File tree

packages/pigeon/lib/src/kotlin/jnigen_config_generator.dart

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,23 @@ class JnigenConfigGenerator extends Generator<InternalJnigenConfigOptions> {
6565
),
6666
logLevel: Level.ALL,''');
6767
indent.writeScoped('classes: [', '],', () {
68+
final packagePrefix = generatorOptions.kotlinOptions.package != null
69+
? '${generatorOptions.kotlinOptions.package}.'
70+
: '';
6871
indent.writeln(
69-
"'${generatorOptions.kotlinOptions.errorClassName ?? 'FlutterError'}',",
72+
"'$packagePrefix${generatorOptions.kotlinOptions.errorClassName ?? 'FlutterError'}',",
7073
);
7174
for (final Api api in root.apis) {
7275
if (api is AstHostApi || api is AstFlutterApi) {
73-
indent.writeln("'${api.name}',");
74-
indent.writeln("'${api.name}Registrar',");
76+
indent.writeln("'$packagePrefix${api.name}',");
77+
indent.writeln("'$packagePrefix${api.name}Registrar',");
7578
}
7679
}
7780
for (final Class dataClass in root.classes) {
78-
indent.writeln("'${dataClass.name}',");
81+
indent.writeln("'$packagePrefix${dataClass.name}',");
7982
}
8083
for (final Enum enumType in root.enums) {
81-
indent.writeln("'${enumType.name}',");
84+
indent.writeln("'$packagePrefix${enumType.name}',");
8285
}
8386
});
8487
});

packages/pigeon/lib/src/kotlin/kotlin_generator.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ class KotlinGenerator extends StructuredGenerator<InternalKotlinOptions> {
251251
required String dartPackageName,
252252
}) {
253253
indent.newln();
254-
if (generatorOptions.package != null && !generatorOptions.useJni) {
254+
if (generatorOptions.package != null) {
255255
indent.writeln('package ${generatorOptions.package}');
256256
}
257257
indent.newln();

packages/pigeon/platform_tests/shared_test_plugin_code/lib/comparison_benchmarks.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,8 +400,7 @@ void runComparisonBenchmarks(TargetGenerator targetGenerator) {
400400
});
401401
}
402402

403-
if (targetGenerator == TargetGenerator.swift ||
404-
targetGenerator == TargetGenerator.objc) {
403+
if (targetGenerator == TargetGenerator.swift) {
405404
testWidgets(
406405
'FFI list casting overhead micro-benchmark: cast() vs List.from() vs map()',
407406
(WidgetTester _) async {

0 commit comments

Comments
 (0)