From 1cf2d1df5ef71876d7d3ee63fae8047c0c3206bf Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Wed, 24 May 2023 12:54:41 +0200 Subject: [PATCH 1/4] [flutter] Minimum Flutter SDK 3.10.1 --- spine-flutter/example/pubspec.lock | 10 +++++----- spine-flutter/example/pubspec.yaml | 2 +- spine-flutter/pubspec.yaml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spine-flutter/example/pubspec.lock b/spine-flutter/example/pubspec.lock index 393597e87..8191a9d60 100644 --- a/spine-flutter/example/pubspec.lock +++ b/spine-flutter/example/pubspec.lock @@ -122,10 +122,10 @@ packages: dependency: transitive description: name: meta - sha256: "12307e7f0605ce3da64cf0db90e5fcab0869f3ca03f76be6bb2991ce0a55e82b" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" ordered_set: dependency: transitive description: @@ -169,7 +169,7 @@ packages: path: ".." relative: true source: path - version: "4.1.1" + version: "4.1.2" string_scanner: dependency: transitive description: @@ -211,5 +211,5 @@ packages: source: hosted version: "0.7.4" sdks: - dart: ">=2.19.0 <4.0.0" - flutter: ">=3.7.6" + dart: ">=3.0.0-0 <4.0.0" + flutter: ">=3.10.1" diff --git a/spine-flutter/example/pubspec.yaml b/spine-flutter/example/pubspec.yaml index 64ddec812..dbf291ad6 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 <4.0.0' - flutter: ">=3.7.3" + flutter: ">=3.10.1" dependencies: flutter: diff --git a/spine-flutter/pubspec.yaml b/spine-flutter/pubspec.yaml index ac108a33f..0983e1bbe 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 <4.0.0' - flutter: ">=3.7.6" + flutter: ">=3.10.1" dependencies: flutter: From 3a9c57b6a7bf1af04126de16c68f45d1684e21f2 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Wed, 24 May 2023 13:00:06 +0200 Subject: [PATCH 2/4] [flutter] Update pubspec.lock --- spine-flutter/example/pubspec.lock | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/spine-flutter/example/pubspec.lock b/spine-flutter/example/pubspec.lock index 8191a9d60..de54def57 100644 --- a/spine-flutter/example/pubspec.lock +++ b/spine-flutter/example/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" characters: dependency: transitive description: @@ -29,10 +29,10 @@ packages: dependency: transitive description: name: crypto - sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" cupertino_icons: dependency: "direct main" description: @@ -45,18 +45,18 @@ packages: dependency: transitive description: name: ffi - sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 + sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99 url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.2" flame: dependency: "direct main" description: name: flame - sha256: "0c55f8d704f09536125c811a19d9aab7407dce245b2bfb507e84296c1c996202" + sha256: c38e1be5827aa839c166c6ed08a2733bb4523bf153d8c670739c20c842fa1844 url: "https://pub.dev" source: hosted - version: "1.6.0" + version: "1.7.3" flutter: dependency: "direct main" description: flutter @@ -74,10 +74,10 @@ packages: dependency: transitive description: name: http - sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482" + sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2" url: "https://pub.dev" source: hosted - version: "0.13.5" + version: "0.13.6" http_parser: dependency: transitive description: @@ -106,10 +106,10 @@ packages: dependency: transitive description: name: lints - sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593" + sha256: "6b0206b0bf4f04961fc5438198ccb3a885685cd67d4d4a32cc20ad7f8adbe015" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.1.0" material_color_utilities: dependency: transitive description: @@ -130,10 +130,10 @@ packages: dependency: transitive description: name: ordered_set - sha256: "74b0454418f58c34c8e527d91fb1ef571297dbcd5d3b4e5f983dc884e39cdf85" + sha256: "3fedcc9121b3ba24c0a84f32da2989c42e36c159b73feadbc2f402dc55966b81" url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "5.0.1" path: dependency: transitive description: @@ -159,10 +159,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" spine_flutter: dependency: "direct main" description: @@ -190,10 +190,10 @@ packages: dependency: transitive description: name: typed_data - sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" vector_math: dependency: transitive description: @@ -211,5 +211,5 @@ packages: source: hosted version: "0.7.4" sdks: - dart: ">=3.0.0-0 <4.0.0" + dart: ">=3.0.0-417 <4.0.0" flutter: ">=3.10.1" From 9d0c069f5db99f55d63c7d949327db8c94470ee8 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Wed, 24 May 2023 13:06:37 +0200 Subject: [PATCH 3/4] [flutter] Update libspine_flutter.wasm. --- .../ios/Runner.xcodeproj/project.pbxproj | 1 + .../lib/assets/libspine_flutter.wasm | Bin 387456 -> 387504 bytes 2 files changed, 1 insertion(+) diff --git a/spine-flutter/example/ios/Runner.xcodeproj/project.pbxproj b/spine-flutter/example/ios/Runner.xcodeproj/project.pbxproj index 034aaeae5..e5637925c 100644 --- a/spine-flutter/example/ios/Runner.xcodeproj/project.pbxproj +++ b/spine-flutter/example/ios/Runner.xcodeproj/project.pbxproj @@ -205,6 +205,7 @@ files = ( ); inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); name = "Thin Binary"; outputPaths = ( diff --git a/spine-flutter/lib/assets/libspine_flutter.wasm b/spine-flutter/lib/assets/libspine_flutter.wasm index 9e9e631690f19d8ecf7dbb6ce4384f57a64dbcb2..4097f1448e40aa7b6477be932a02bd4d4a06f658 100755 GIT binary patch delta 1282 zcmY*Z&x;&I6z;0(p6Q>HUJ~876V0nKkaZw}VFMAC><*I^0|8?QqL>{gxQE%yBnKg< z5N9EWT=w90)z}B|AIK?4V8F{Ba#+xlc*{SKgCdwi)`LR6*F6TEo#|Ko>iziMS6}VU zuZxfHebE>H+&}C;IP8nrVP75$#h=4b^hZte_5XIicw2?LM9|RWNdXvf>#5Z!WmKQs7Z;l z`7<9|$O=318=>O~h1iXFx9N)B;_R36<BtXFRCV5L&;5OWoj79h_(`FgsYt4~ zl_#4UnO7|z_ux-B_cG{SCq@2O*yB~#0}Lj2*mR0VgXPoudeXpTK=O-9+r28YU^!ym*p}b=mlOK*C#5VXS}oeEsi~e zI$NIGRwUx`lWlccES6tys~Zz7=?%~aH7-Gh#%D7$fn&R68f>l`<*Z3qSvdum7QTT6 za&RX2Wo(Ub787`0Jw`I6ygu@_k&a$NHnfRg-%$hnSc3N$vZ!3WsZObs7RoPgs*fgM z$N@?^Z;=pyC|Z~|$?HUv3wR^1%R%(>ay}e|Zh*8}44>nu<2khj6Yi}!D9=c0?D4T$ zkQ+N&7*%2KZaTZ=)72d zKT_|20X`xKOS z#_IB!dYAzVHw7Efo{4s$g&Oo`yWoUXKE>tFx77P0dJx=J`1!Noc5wIZOPxXX A?*IS* delta 1226 zcmYjR&x;&I6t1r7o}T_OLl0_Z-OeVj%0R|}H4t`1K}?2qG-ALQJOs=PyRgXY&g>p? z4PgQ~1Z6Ry!*o@>AK&}xtM}&7v+n(8 z-A6CR&eI3S^xzR?BlScrJEznH(qj}1GMA5>vl3;Qb4qAZ8Tg^6n`LM)(K6eoYVgO}@lDeRo0 zOh*w(rZ~$@Tthp2+{{hO=KrH&f&whX;OZ2FTg)(|m?H`%{y`pTUtR?t3bP7rC(g@;KAY*omsc+T+o%C2IQy>=EZ)*CFaCa__*$ zyMZ{>4p)X6Zcn~9P}70@)U;Db1g4S`XF0`mV#yBR2)b2xUoKe_jnW|~xWkqtzdSQh z=B7_k0Y>+aGHO`fT*-`Y@sNXPbEv&?tZ=kqQ_+(?~Qg@EAU-ZgxJj;JwQhE7f}YU}Gch3Lg*4t*LtFLqNNksY*y7l9!z# zM?`dpOu(nZU(Mqc8snQaa!}94=z3l|$@l>71(w(V~J3;cmr?Wp>ttilbL|(Z+ zQ)jdb<}NvWMQJm%v~Hj~D^#7p=$1dt)b-V{vTSm<#?UN0FyR8vUy~lC8M}|H2@Al7 z<+(jI=m!O(DeiTLWM+7-G2qzecnl0{bMTy}REOm^d+H1AVx%3U^M8e>6Q0_5+&bmr YQc(W0r`~tMhwJ+aKlgBb-@AMFU%7GW_W%F@ From 72e4c2915f9365bd683db927f80b7ae9ddd356d5 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Fri, 26 May 2023 12:20:46 +0200 Subject: [PATCH 4/4] [unity] Fixed NullReferenceException when SkeletonGraphic SkeletonDataAsset is null. Closes #2294. --- .../Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs | 2 ++ .../Modules/com.esotericsoftware.spine.urp-shaders/package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs index 9e3ea220f..9efa7e9cc 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs @@ -307,6 +307,7 @@ namespace Spine.Unity { public override void Rebuild (CanvasUpdate update) { base.Rebuild(update); + if (!this.IsValid) return; if (canvasRenderer.cull) return; if (update == CanvasUpdate.PreRender) { if (requiresInstructionUpate) PrepareInstructionsAndRenderers(isInRebuild: true); @@ -401,6 +402,7 @@ namespace Spine.Unity { } public void LateUpdate () { + if (!this.IsValid) return; // instantiation can happen from Update() after this component, leading to a missing Update() call. if (!wasUpdatedAfterInit) Update(0); if (freeze) return; diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json index 231d68e18..0b5f5c727 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json @@ -2,7 +2,7 @@ "name": "com.esotericsoftware.spine.urp-shaders", "displayName": "Spine Universal RP Shaders", "description": "This plugin provides universal render pipeline (URP) shaders for the spine-unity runtime.\n\nPrerequisites:\nIt requires a working installation of the spine-unity runtime, version 4.1.\n(See http://esotericsoftware.com/git/spine-runtimes/spine-unity)", - "version": "4.1.12", + "version": "4.1.13", "unity": "2019.3", "author": { "name": "Esoteric Software",