diff --git a/spine-flutter/CHANGELOG.md b/spine-flutter/CHANGELOG.md index 7a2b7becf..108e2ca0f 100644 --- a/spine-flutter/CHANGELOG.md +++ b/spine-flutter/CHANGELOG.md @@ -1,3 +1,6 @@ +# 4.2.7 +* Change package name from `esotericsoftware_spine_flutter` to `spine_flutter`. + # 4.2.6 * Fix analyzer errors, fix code style to adhere to Dart standards. diff --git a/spine-flutter/example/lib/animation_state_events.dart b/spine-flutter/example/lib/animation_state_events.dart index 8186b023c..70bb4231f 100644 --- a/spine-flutter/example/lib/animation_state_events.dart +++ b/spine-flutter/example/lib/animation_state_events.dart @@ -1,5 +1,5 @@ // ignore_for_file: avoid_print -import 'package:esotericsoftware_spine_flutter/spine_flutter.dart'; +import 'package:spine_flutter/spine_flutter.dart'; import 'package:flutter/material.dart'; class AnimationStateEvents extends StatelessWidget { diff --git a/spine-flutter/example/lib/debug_rendering.dart b/spine-flutter/example/lib/debug_rendering.dart index eb2faa3dc..7d20b4650 100644 --- a/spine-flutter/example/lib/debug_rendering.dart +++ b/spine-flutter/example/lib/debug_rendering.dart @@ -1,4 +1,4 @@ -import 'package:esotericsoftware_spine_flutter/spine_flutter.dart'; +import 'package:spine_flutter/spine_flutter.dart'; import 'package:flutter/material.dart'; class DebugRendering extends StatelessWidget { diff --git a/spine-flutter/example/lib/dress_up.dart b/spine-flutter/example/lib/dress_up.dart index 9331c99a1..a62cbaeaf 100644 --- a/spine-flutter/example/lib/dress_up.dart +++ b/spine-flutter/example/lib/dress_up.dart @@ -1,4 +1,4 @@ -import 'package:esotericsoftware_spine_flutter/spine_flutter.dart'; +import 'package:spine_flutter/spine_flutter.dart'; import 'package:flutter/material.dart'; import 'package:flutter/painting.dart' as painting; import 'package:raw_image_provider/raw_image_provider.dart'; diff --git a/spine-flutter/example/lib/flame_example.dart b/spine-flutter/example/lib/flame_example.dart index efed83ca7..e1b668ce8 100644 --- a/spine-flutter/example/lib/flame_example.dart +++ b/spine-flutter/example/lib/flame_example.dart @@ -1,6 +1,6 @@ import 'dart:math'; -import 'package:esotericsoftware_spine_flutter/spine_flutter.dart'; +import 'package:spine_flutter/spine_flutter.dart'; import 'package:flame/components.dart'; import 'package:flame/game.dart'; import 'package:flutter/material.dart'; diff --git a/spine-flutter/example/lib/ik_following.dart b/spine-flutter/example/lib/ik_following.dart index 045f3512e..b05875090 100644 --- a/spine-flutter/example/lib/ik_following.dart +++ b/spine-flutter/example/lib/ik_following.dart @@ -1,4 +1,4 @@ -import 'package:esotericsoftware_spine_flutter/spine_flutter.dart'; +import 'package:spine_flutter/spine_flutter.dart'; import 'package:flutter/material.dart'; class IkFollowing extends StatefulWidget { diff --git a/spine-flutter/example/lib/main.dart b/spine-flutter/example/lib/main.dart index d4364047b..f0f65bcf1 100644 --- a/spine-flutter/example/lib/main.dart +++ b/spine-flutter/example/lib/main.dart @@ -1,4 +1,4 @@ -import 'package:esotericsoftware_spine_flutter/spine_flutter.dart'; +import 'package:spine_flutter/spine_flutter.dart'; import 'package:flutter/material.dart'; import 'package:spine_flutter_example/debug_rendering.dart'; diff --git a/spine-flutter/example/lib/pause_play_animation.dart b/spine-flutter/example/lib/pause_play_animation.dart index eb570a5f4..beb69b323 100644 --- a/spine-flutter/example/lib/pause_play_animation.dart +++ b/spine-flutter/example/lib/pause_play_animation.dart @@ -1,4 +1,4 @@ -import 'package:esotericsoftware_spine_flutter/spine_flutter.dart'; +import 'package:spine_flutter/spine_flutter.dart'; import 'package:flutter/material.dart'; class PlayPauseAnimation extends StatefulWidget { diff --git a/spine-flutter/example/lib/simple_animation.dart b/spine-flutter/example/lib/simple_animation.dart index fb81c8480..666b8ba84 100644 --- a/spine-flutter/example/lib/simple_animation.dart +++ b/spine-flutter/example/lib/simple_animation.dart @@ -1,4 +1,4 @@ -import 'package:esotericsoftware_spine_flutter/spine_flutter.dart'; +import 'package:spine_flutter/spine_flutter.dart'; import 'package:flutter/material.dart'; class SimpleAnimation extends StatelessWidget { diff --git a/spine-flutter/example/linux/flutter/generated_plugins.cmake b/spine-flutter/example/linux/flutter/generated_plugins.cmake index acd6747ac..55f28b8cb 100644 --- a/spine-flutter/example/linux/flutter/generated_plugins.cmake +++ b/spine-flutter/example/linux/flutter/generated_plugins.cmake @@ -6,7 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST - esotericsoftware_spine_flutter + spine_flutter ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/spine-flutter/example/macos/Podfile.lock b/spine-flutter/example/macos/Podfile.lock index 63379b25f..a13caa1c6 100644 --- a/spine-flutter/example/macos/Podfile.lock +++ b/spine-flutter/example/macos/Podfile.lock @@ -1,21 +1,21 @@ PODS: - - esotericsoftware_spine_flutter (0.0.1): - - FlutterMacOS - FlutterMacOS (1.0.0) + - spine_flutter (0.0.1): + - FlutterMacOS DEPENDENCIES: - - esotericsoftware_spine_flutter (from `Flutter/ephemeral/.symlinks/plugins/esotericsoftware_spine_flutter/macos`) - FlutterMacOS (from `Flutter/ephemeral`) + - spine_flutter (from `Flutter/ephemeral/.symlinks/plugins/spine_flutter/macos`) EXTERNAL SOURCES: - esotericsoftware_spine_flutter: - :path: Flutter/ephemeral/.symlinks/plugins/esotericsoftware_spine_flutter/macos FlutterMacOS: :path: Flutter/ephemeral + spine_flutter: + :path: Flutter/ephemeral/.symlinks/plugins/spine_flutter/macos SPEC CHECKSUMS: - esotericsoftware_spine_flutter: 9222ab83a8f5635976f03740fa1eb809809f2b4a FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 + spine_flutter: 9cf72fc0088c2820e80a4d3dc83ba29ac58f40d1 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7 diff --git a/spine-flutter/example/pubspec.lock b/spine-flutter/example/pubspec.lock index f34fc6022..88e52ea34 100644 --- a/spine-flutter/example/pubspec.lock +++ b/spine-flutter/example/pubspec.lock @@ -41,13 +41,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.5" - esotericsoftware_spine_flutter: - dependency: "direct main" - description: - path: ".." - relative: true - source: path - version: "4.2.6" ffi: dependency: transitive description: @@ -170,6 +163,13 @@ packages: url: "https://pub.dev" source: hosted version: "1.9.1" + spine_flutter: + dependency: "direct main" + description: + path: ".." + relative: true + source: path + version: "4.2.7" string_scanner: dependency: transitive description: diff --git a/spine-flutter/example/pubspec.yaml b/spine-flutter/example/pubspec.yaml index a4e73cde3..80d1bce1a 100644 --- a/spine-flutter/example/pubspec.yaml +++ b/spine-flutter/example/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: flutter: sdk: flutter - esotericsoftware_spine_flutter: + spine_flutter: path: ../ cupertino_icons: ^1.0.2 flame: ^1.4.0 diff --git a/spine-flutter/example/windows/flutter/generated_plugins.cmake b/spine-flutter/example/windows/flutter/generated_plugins.cmake index 8e0b3a1ca..dca11f385 100644 --- a/spine-flutter/example/windows/flutter/generated_plugins.cmake +++ b/spine-flutter/example/windows/flutter/generated_plugins.cmake @@ -6,7 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST - esotericsoftware_spine_flutter + spine_flutter ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/spine-flutter/ios/esotericsoftware_spine_flutter.podspec b/spine-flutter/ios/spine_flutter.podspec similarity index 88% rename from spine-flutter/ios/esotericsoftware_spine_flutter.podspec rename to spine-flutter/ios/spine_flutter.podspec index 079d8436a..7c725addc 100644 --- a/spine-flutter/ios/esotericsoftware_spine_flutter.podspec +++ b/spine-flutter/ios/spine_flutter.podspec @@ -1,9 +1,9 @@ # # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html. -# Run `pod lib lint esotericsoftware_spine_flutter.podspec` to validate before publishing. +# Run `pod lib lint spine_flutter.podspec` to validate before publishing. # Pod::Spec.new do |s| - s.name = 'esotericsoftware_spine_flutter' + s.name = 'spine_flutter' s.version = '0.0.1' s.summary = 'A new Flutter FFI plugin project.' s.description = <<-DESC diff --git a/spine-flutter/lib/init.dart b/spine-flutter/lib/init.dart index bcbf5b082..69667bf53 100644 --- a/spine-flutter/lib/init.dart +++ b/spine-flutter/lib/init.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:ffi/ffi.dart'; -const String _libName = 'esotericsoftware_spine_flutter'; +const String _libName = 'spine_flutter'; final DynamicLibrary _dylib = () { if (Platform.isMacOS || Platform.isIOS) { return DynamicLibrary.open('$_libName.framework/$_libName'); diff --git a/spine-flutter/lib/init_web.dart b/spine-flutter/lib/init_web.dart index 8c73b5510..2cfa7d645 100644 --- a/spine-flutter/lib/init_web.dart +++ b/spine-flutter/lib/init_web.dart @@ -61,9 +61,9 @@ Future initSpineFlutterFFI() async { registerOpaqueType(); registerOpaqueType(); - await js.importLibrary('assets/packages/esotericsoftware_spine_flutter/lib/assets/libspine_flutter.js'); + await js.importLibrary('assets/packages/spine_flutter/lib/assets/libspine_flutter.js'); Uint8List wasmBinaries = - (await rootBundle.load('packages/esotericsoftware_spine_flutter/lib/assets/libspine_flutter.wasm')).buffer.asUint8List(); + (await rootBundle.load('packages/spine_flutter/lib/assets/libspine_flutter.wasm')).buffer.asUint8List(); _module = await EmscriptenModule.compile(wasmBinaries, 'libspine_flutter'); } Module? m = _module; diff --git a/spine-flutter/linux/CMakeLists.txt b/spine-flutter/linux/CMakeLists.txt index 4954c0e74..b42273991 100644 --- a/spine-flutter/linux/CMakeLists.txt +++ b/spine-flutter/linux/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.10) # Project-level configuration. -set(PROJECT_NAME "esotericsoftware_spine_flutter") +set(PROJECT_NAME "spine_flutter") project(${PROJECT_NAME} LANGUAGES CXX) # Invoke the build for native code shared with the other target platforms. @@ -14,9 +14,9 @@ add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../src" "${CMAKE_CURRENT_BINARY_DI # List of absolute paths to libraries that should be bundled with the plugin. # This list could contain prebuilt libraries, or libraries created by an # external build triggered from this build file. -set(esotericsoftware_spine_flutter_bundled_libraries +set(spine_flutter_bundled_libraries # Defined in ../src/CMakeLists.txt. # This can be changed to accomodate different builds. - $ + $ PARENT_SCOPE ) diff --git a/spine-flutter/macos/esotericsoftware_spine_flutter.podspec b/spine-flutter/macos/spine_flutter.podspec similarity index 88% rename from spine-flutter/macos/esotericsoftware_spine_flutter.podspec rename to spine-flutter/macos/spine_flutter.podspec index 7224454dd..931b9f54f 100644 --- a/spine-flutter/macos/esotericsoftware_spine_flutter.podspec +++ b/spine-flutter/macos/spine_flutter.podspec @@ -1,9 +1,9 @@ # # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html. -# Run `pod lib lint esotericsoftware_spine_flutter.podspec` to validate before publishing. +# Run `pod lib lint spine_flutter.podspec` to validate before publishing. # Pod::Spec.new do |s| - s.name = 'esotericsoftware_spine_flutter' + s.name = 'spine_flutter' s.version = '0.0.1' s.summary = 'A new Flutter FFI plugin project.' s.description = <<-DESC diff --git a/spine-flutter/pubspec.yaml b/spine-flutter/pubspec.yaml index 00556f5d3..26af2323a 100644 --- a/spine-flutter/pubspec.yaml +++ b/spine-flutter/pubspec.yaml @@ -1,6 +1,6 @@ -name: esotericsoftware_spine_flutter +name: spine_flutter description: The official Spine Flutter Runtime to load, display and interact with Spine animations. -version: 4.2.6 +version: 4.2.7 homepage: https://esotericsoftware.com repository: https://github.com/esotericsoftware/spine-runtimes issue_tracker: https://github.com/esotericsoftware/spine-runtimes/issues diff --git a/spine-flutter/src/CMakeLists.txt b/spine-flutter/src/CMakeLists.txt index 9fd6a15ad..2ef603602 100644 --- a/spine-flutter/src/CMakeLists.txt +++ b/spine-flutter/src/CMakeLists.txt @@ -3,21 +3,21 @@ # the plugin to fail to compile for some customers of the plugin. cmake_minimum_required(VERSION 3.10) -project(esotericsoftware_spine_flutter_library VERSION 0.0.1) +project(pine_flutter_library VERSION 0.0.1) file(GLOB SPINE_SOURCES "spine-cpp/src/**/*.cpp") -add_library(esotericsoftware_spine_flutter SHARED +add_library(spine_flutter SHARED "spine_flutter.cpp" ${SPINE_SOURCES} ) -set_target_properties(esotericsoftware_spine_flutter PROPERTIES +set_target_properties(spine_flutter PROPERTIES PUBLIC_HEADER spine_flutter.h - OUTPUT_NAME "esotericsoftware_spine_flutter" + OUTPUT_NAME "spine_flutter" ) -target_include_directories(esotericsoftware_spine_flutter PUBLIC spine-cpp/include) -target_compile_definitions(esotericsoftware_spine_flutter PUBLIC DART_SHARED_LIB) +target_include_directories(spine_flutter PUBLIC spine-cpp/include) +target_compile_definitions(spine_flutter PUBLIC DART_SHARED_LIB) if(${SPINE_FLUTTER_TESTBED}) set (CMAKE_CXX_STANDARD 11) diff --git a/spine-flutter/windows/CMakeLists.txt b/spine-flutter/windows/CMakeLists.txt index 26d29cd67..cd235bb5c 100644 --- a/spine-flutter/windows/CMakeLists.txt +++ b/spine-flutter/windows/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.14) # Project-level configuration. -set(PROJECT_NAME "esotericsoftware_spine_flutter") +set(PROJECT_NAME "spine_flutter") project(${PROJECT_NAME} LANGUAGES CXX) # Invoke the build for native code shared with the other target platforms. @@ -15,9 +15,9 @@ add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../src" "${CMAKE_CURRENT_BINARY_DI # List of absolute paths to libraries that should be bundled with the plugin. # This list could contain prebuilt libraries, or libraries created by an # external build triggered from this build file. -set(esotericsoftware_spine_flutter_bundled_libraries +set(spine_flutter_bundled_libraries # Defined in ../src/CMakeLists.txt. # This can be changed to accomodate different builds. - $ + $ PARENT_SCOPE )