Merge branch '4.1' into 4.2-beta

# Conflicts:
#	spine-flutter/example/pubspec.lock

CMakeLists.txt

@@ -5,8 +5,9 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 	set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR} CACHE PATH "Install location" FORCE)
 endif()
 set(CMAKE_VERBOSE_MAKEFILE ON)
-set(SPINE_SFML FALSE CACHE BOOL FALSE)
+option(SPINE_SFML "Build spine SFML API" OFF)
-set(SPINE_SANITIZE FALSE CACHE BOOL FALSE)
+option(SPINE_SANITIZE "Build with sanitization" OFF)
+option(BUILD_TESTING "Build with testing" ON)
 
 if(MSVC)
 	message("MSCV detected")
@@ -42,5 +43,12 @@ elseif((${SPINE_SDL}) OR (${CMAKE_CURRENT_BINARY_DIR} MATCHES "spine-sdl"))
 else()
 	add_subdirectory(spine-c)
 	add_subdirectory(spine-cpp)
-	add_subdirectory(spine-cpp/spine-cpp-unit-tests)
+	if (${BUILD_TESTING})
+		add_subdirectory(spine-cpp/spine-cpp-unit-tests)
+	endif()
 endif()
+
+# Create config file that include the exported targets
+configure_file(SpineConfig.cmake.in
+	"${CMAKE_CURRENT_BINARY_DIR}/SpineConfig.cmake"
+	@ONLY)

SpineConfig.cmake.in

@@ -0,0 +1 @@
+include("@CMAKE_CURRENT_BINARY_DIR@/spine-cpp/spine-cppTargets.cmake")

spine-cpp/CMakeLists.txt

@@ -13,5 +13,13 @@ file(GLOB SOURCES "spine-cpp/src/**/*.cpp")
 
 add_library(spine-cpp STATIC ${SOURCES} ${INCLUDES})
 target_include_directories(spine-cpp PUBLIC spine-cpp/include)
-install(TARGETS spine-cpp DESTINATION dist/lib)
+
+# Install target
+install(TARGETS spine-cpp EXPORT spine-cpp_TARGETS DESTINATION dist/lib)
 install(FILES ${INCLUDES} DESTINATION dist/include)
+
+# Export target
+export(
+	EXPORT spine-cpp_TARGETS
+	FILE ${CMAKE_CURRENT_BINARY_DIR}/spine-cppTargets.cmake
+	NAMESPACE "Spine::")

spine-flutter/example/pubspec.lock

@@ -74,10 +74,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
+      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.6"
+    version: "1.1.0"
   http_parser:
     dependency: transitive
     description:

spine-flutter/lib/spine_flutter_bindings_generated.dart

@@ -9979,87 +9979,87 @@ class SpineFlutterBindings {
           .asFunction<void Function(spine_texture_region, int)>();
 }
 
-class spine_skeleton_wrapper extends ffi.Opaque {}
+final class spine_skeleton_wrapper extends ffi.Opaque {}
 
-class spine_skeleton_data_wrapper extends ffi.Opaque {}
+final class spine_skeleton_data_wrapper extends ffi.Opaque {}
 
-class spine_bone_wrapper extends ffi.Opaque {}
+final class spine_bone_wrapper extends ffi.Opaque {}
 
-class spine_bone_data_wrapper extends ffi.Opaque {}
+final class spine_bone_data_wrapper extends ffi.Opaque {}
 
-class spine_slot_wrapper extends ffi.Opaque {}
+final class spine_slot_wrapper extends ffi.Opaque {}
 
-class spine_slot_data_wrapper extends ffi.Opaque {}
+final class spine_slot_data_wrapper extends ffi.Opaque {}
 
-class spine_skin_wrapper extends ffi.Opaque {}
+final class spine_skin_wrapper extends ffi.Opaque {}
 
-class spine_attachment_wrapper extends ffi.Opaque {}
+final class spine_attachment_wrapper extends ffi.Opaque {}
 
-class spine_region_attachment_wrapper extends ffi.Opaque {}
+final class spine_region_attachment_wrapper extends ffi.Opaque {}
 
-class spine_vertex_attachment_wrapper extends ffi.Opaque {}
+final class spine_vertex_attachment_wrapper extends ffi.Opaque {}
 
-class spine_mesh_attachment_wrapper extends ffi.Opaque {}
+final class spine_mesh_attachment_wrapper extends ffi.Opaque {}
 
-class spine_clipping_attachment_wrapper extends ffi.Opaque {}
+final class spine_clipping_attachment_wrapper extends ffi.Opaque {}
 
-class spine_bounding_box_attachment_wrapper extends ffi.Opaque {}
+final class spine_bounding_box_attachment_wrapper extends ffi.Opaque {}
 
-class spine_path_attachment_wrapper extends ffi.Opaque {}
+final class spine_path_attachment_wrapper extends ffi.Opaque {}
 
-class spine_point_attachment_wrapper extends ffi.Opaque {}
+final class spine_point_attachment_wrapper extends ffi.Opaque {}
 
-class spine_texture_region_wrapper extends ffi.Opaque {}
+final class spine_texture_region_wrapper extends ffi.Opaque {}
 
-class spine_sequence_wrapper extends ffi.Opaque {}
+final class spine_sequence_wrapper extends ffi.Opaque {}
 
-class spine_constraint_wrapper extends ffi.Opaque {}
+final class spine_constraint_wrapper extends ffi.Opaque {}
 
-class spine_constraint_data_wrapper extends ffi.Opaque {}
+final class spine_constraint_data_wrapper extends ffi.Opaque {}
 
-class spine_ik_constraint_wrapper extends ffi.Opaque {}
+final class spine_ik_constraint_wrapper extends ffi.Opaque {}
 
-class spine_ik_constraint_data_wrapper extends ffi.Opaque {}
+final class spine_ik_constraint_data_wrapper extends ffi.Opaque {}
 
-class spine_transform_constraint_wrapper extends ffi.Opaque {}
+final class spine_transform_constraint_wrapper extends ffi.Opaque {}
 
-class spine_transform_constraint_data_wrapper extends ffi.Opaque {}
+final class spine_transform_constraint_data_wrapper extends ffi.Opaque {}
 
-class spine_path_constraint_wrapper extends ffi.Opaque {}
+final class spine_path_constraint_wrapper extends ffi.Opaque {}
 
-class spine_path_constraint_data_wrapper extends ffi.Opaque {}
+final class spine_path_constraint_data_wrapper extends ffi.Opaque {}
 
-class spine_animation_state_wrapper extends ffi.Opaque {}
+final class spine_animation_state_wrapper extends ffi.Opaque {}
 
-class spine_animation_state_data_wrapper extends ffi.Opaque {}
+final class spine_animation_state_data_wrapper extends ffi.Opaque {}
 
-class spine_animation_state_events_wrapper extends ffi.Opaque {}
+final class spine_animation_state_events_wrapper extends ffi.Opaque {}
 
-class spine_event_wrapper extends ffi.Opaque {}
+final class spine_event_wrapper extends ffi.Opaque {}
 
-class spine_event_data_wrapper extends ffi.Opaque {}
+final class spine_event_data_wrapper extends ffi.Opaque {}
 
-class spine_track_entry_wrapper extends ffi.Opaque {}
+final class spine_track_entry_wrapper extends ffi.Opaque {}
 
-class spine_animation_wrapper extends ffi.Opaque {}
+final class spine_animation_wrapper extends ffi.Opaque {}
 
-class spine_atlas_wrapper extends ffi.Opaque {}
+final class spine_atlas_wrapper extends ffi.Opaque {}
 
-class spine_skeleton_data_result_wrapper extends ffi.Opaque {}
+final class spine_skeleton_data_result_wrapper extends ffi.Opaque {}
 
-class spine_render_command_wrapper extends ffi.Opaque {}
+final class spine_render_command_wrapper extends ffi.Opaque {}
 
-class spine_bounds_wrapper extends ffi.Opaque {}
+final class spine_bounds_wrapper extends ffi.Opaque {}
 
-class spine_color_wrapper extends ffi.Opaque {}
+final class spine_color_wrapper extends ffi.Opaque {}
 
-class spine_vector_wrapper extends ffi.Opaque {}
+final class spine_vector_wrapper extends ffi.Opaque {}
 
-class spine_skeleton_drawable_wrapper extends ffi.Opaque {}
+final class spine_skeleton_drawable_wrapper extends ffi.Opaque {}
 
-class spine_skin_entry_wrapper extends ffi.Opaque {}
+final class spine_skin_entry_wrapper extends ffi.Opaque {}
 
-class spine_skin_entries_wrapper extends ffi.Opaque {}
+final class spine_skin_entries_wrapper extends ffi.Opaque {}
 
 abstract class spine_blend_mode {
   static const int SPINE_BLEND_MODE_NORMAL = 0;

spine-flutter/pubspec.yaml

@@ -18,12 +18,12 @@ dependencies:
   inject_js: ^2.0.0
   js: ^0.6.5
   meta: ^1.8.0
-  http: ^0.13.5
+  http: ^1.1.0
   path: ^1.8.2
   raw_image_provider: ^0.2.0
 
 dev_dependencies:
-  ffigen: ^7.2.6
+  ffigen: ^9.0.1
   flutter_lints: ^2.0.0
 
 flutter: