diff --git a/spine-flutter/codegen/src/dart-writer.ts b/spine-flutter/codegen/src/dart-writer.ts index 90a52a702..d19f196ac 100644 --- a/spine-flutter/codegen/src/dart-writer.ts +++ b/spine-flutter/codegen/src/dart-writer.ts @@ -1319,12 +1319,12 @@ ${declaration} {`; } const methodSuffix = this.getMethodSuffix(method.name, cType.name); - + // Don't consider dispose methods as inherited - they're type-specific if (methodSuffix === 'dispose') { return false; } - + const parentMethodName = `${parentName}_${methodSuffix}`; const hasInParent = parent.methods.some(m => m.name === parentMethodName); @@ -1455,7 +1455,7 @@ ${declaration} {`; lines.push('// Arrays'); lines.push(`export 'arrays.dart';`); - const filePath = path.join(path.dirname(path.dirname(this.outputDir)), 'lib/generated/spine_dart.dart'); + const filePath = path.join(path.dirname(path.dirname(this.outputDir)), 'lib/generated/api.dart'); fs.writeFileSync(filePath, lines.join('\n')); } diff --git a/spine-flutter/lib/extensions.dart b/spine-flutter/lib/extensions.dart index 77724d8cb..132f5101c 100644 --- a/spine-flutter/lib/extensions.dart +++ b/spine-flutter/lib/extensions.dart @@ -41,7 +41,7 @@ import 'package:path/path.dart' as path; import 'ffi_proxy.dart'; import 'spine_dart_init.dart' if (dart.library.html) 'spine_flutter_init_web.dart'; -import 'spine_flutter.dart'; +import 'spine_dart.dart'; import 'raw_image_provider.dart'; export 'spine_widget.dart'; diff --git a/spine-flutter/lib/generated/spine_dart.dart b/spine-flutter/lib/generated/api.dart similarity index 100% rename from spine-flutter/lib/generated/spine_dart.dart rename to spine-flutter/lib/generated/api.dart diff --git a/spine-flutter/lib/spine_flutter.dart b/spine-flutter/lib/spine_dart.dart similarity index 99% rename from spine-flutter/lib/spine_flutter.dart rename to spine-flutter/lib/spine_dart.dart index 72828169a..c25ba6d23 100644 --- a/spine-flutter/lib/spine_flutter.dart +++ b/spine-flutter/lib/spine_dart.dart @@ -36,7 +36,7 @@ import 'generated/atlas.dart'; import 'generated/skeleton_data.dart'; // Export generated classes -export 'generated/spine_dart.dart'; +export 'generated/api.dart'; Future initSpineFlutter({bool useStaticLinkage = false, bool enableMemoryDebugging = false}) async { final ffi = await initSpineDartFFI(useStaticLinkage); diff --git a/spine-flutter/lib/spine_widget.dart b/spine-flutter/lib/spine_widget.dart index 2306ea8f7..19a2ca052 100644 --- a/spine-flutter/lib/spine_widget.dart +++ b/spine-flutter/lib/spine_widget.dart @@ -34,7 +34,7 @@ import 'package:flutter/scheduler.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; -import 'spine_flutter.dart'; +import 'spine_dart.dart'; /// Controls how the skeleton of a [SpineWidget] is animated and rendered. ///