From 4e0dd648f404389aea705f240eb1ef7fb2affbce Mon Sep 17 00:00:00 2001
From: Mario Zechner <badlogicgames@gmail.com>
Date: Fri, 17 Feb 2023 16:44:09 +0100
Subject: [PATCH 1/2] [flutter] Upgrade dependencies.

---
 spine-flutter/example/pubspec.lock |  4 ++--
 spine-flutter/example/pubspec.yaml |  2 +-
 spine-flutter/pubspec.yaml         | 10 ++++------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/spine-flutter/example/pubspec.lock b/spine-flutter/example/pubspec.lock
index 77bfaa806..88b012f80 100644
--- a/spine-flutter/example/pubspec.lock
+++ b/spine-flutter/example/pubspec.lock
@@ -211,5 +211,5 @@ packages:
     source: hosted
     version: "0.7.4"
 sdks:
-  dart: ">=2.18.0 <4.0.0"
-  flutter: ">=3.7.0"
+  dart: ">=2.18.0 <3.0.0"
+  flutter: ">=3.7.3"
diff --git a/spine-flutter/example/pubspec.yaml b/spine-flutter/example/pubspec.yaml
index 526cd7511..e5b6927aa 100644
--- a/spine-flutter/example/pubspec.yaml
+++ b/spine-flutter/example/pubspec.yaml
@@ -5,7 +5,7 @@ version: 1.0.0+1
 
 environment:
   sdk: ">=2.17.6 <3.0.0"
-  flutter: ">=3.7.0"
+  flutter: ">=3.7.3"
 
 dependencies:
   flutter:
diff --git a/spine-flutter/pubspec.yaml b/spine-flutter/pubspec.yaml
index 64128e3aa..38066e1d9 100644
--- a/spine-flutter/pubspec.yaml
+++ b/spine-flutter/pubspec.yaml
@@ -8,7 +8,7 @@ documentation: https://esotericsoftware.com/spine-flutter
 
 environment:
   sdk: ">=2.17.6 <3.0.0"
-  flutter: ">=3.7.0"
+  flutter: ">=3.7.3"
 
 dependencies:
   flutter:
@@ -16,16 +16,14 @@ dependencies:
   ffi: ^2.0.1
   web_ffi_fork: ^0.7.4
   inject_js: ^2.0.0
-  js: ^0.6.3
-  meta: ^1.3.0
+  js: ^0.6.5
+  meta: ^1.8.0
   http: ^0.13.5
   path: ^1.8.2
   raw_image_provider: ^0.2.0
 
 dev_dependencies:
-  ffigen: ^6.1.2
-  flutter_test:
-    sdk: flutter
+  ffigen: ^7.2.6
   flutter_lints: ^2.0.0
 
 flutter:

From 983220d3bcbef92d0c13927e49d55f0200a6d55f Mon Sep 17 00:00:00 2001
From: Mario Zechner <badlogicgames@gmail.com>
Date: Fri, 17 Feb 2023 16:50:20 +0100
Subject: [PATCH 2/2] [godot] Fix refactoring compilation errors.

---
 spine-godot/spine_godot/SpineAtlasResource.cpp | 4 ++--
 spine-godot/spine_godot/SpineSprite.cpp        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spine-godot/spine_godot/SpineAtlasResource.cpp b/spine-godot/spine_godot/SpineAtlasResource.cpp
index 4a178f03c..f766eec87 100644
--- a/spine-godot/spine_godot/SpineAtlasResource.cpp
+++ b/spine-godot/spine_godot/SpineAtlasResource.cpp
@@ -75,7 +75,7 @@ public:
 			auto renderer_object = memnew(SpineRendererObject);
 			renderer_object->texture = Ref<Texture>(nullptr);
 			renderer_object->normal_map = Ref<Texture>(nullptr);
-			page.setRendererObject((void *) renderer_object);
+			page.texture = (void *) renderer_object;
 			return;
 		}
 
@@ -97,7 +97,7 @@ public:
 		renderer_object->canvas_texture->set_normal_texture(renderer_object->normal_map);
 #endif
 
-		page.setRendererObject((void *) renderer_object);
+		page.texture = (void *) renderer_object;
 		page.width = texture->get_width();
 		page.height = texture->get_height();
 	}
diff --git a/spine-godot/spine_godot/SpineSprite.cpp b/spine-godot/spine_godot/SpineSprite.cpp
index 023796d5b..4647ef2b5 100644
--- a/spine-godot/spine_godot/SpineSprite.cpp
+++ b/spine-godot/spine_godot/SpineSprite.cpp
@@ -711,7 +711,7 @@ void SpineSprite::update_meshes(Ref<SpineSkeleton> skeleton_ref) {
 
 			vertices->setSize(8, 0);
 			region->computeWorldVertices(*slot, *vertices, 0);
-			renderer_object = (SpineRendererObject *) ((spine::AtlasRegion *) region->getRendererObject())->page->getRendererObject();
+			renderer_object = (SpineRendererObject *) ((spine::AtlasRegion *) region->getRegion())->page->texture;
 			uvs = &region->getUVs();
 			indices = &quad_indices;
 
@@ -725,7 +725,7 @@ void SpineSprite::update_meshes(Ref<SpineSkeleton> skeleton_ref) {
 
 			vertices->setSize(mesh->getWorldVerticesLength(), 0);
 			mesh->computeWorldVertices(*slot, *vertices);
-			renderer_object = (SpineRendererObject *) ((spine::AtlasRegion *) mesh->getRendererObject())->page->getRendererObject();
+			renderer_object = (SpineRendererObject *) ((spine::AtlasRegion *) mesh->getRegion())->page->texture;
 			uvs = &mesh->getUVs();
 			indices = &mesh->getTriangles();