Skip to content

Commit

Permalink
Merge branch '4.1' into 4.2-beta
Browse files Browse the repository at this point in the history
# Conflicts:
#	spine-flutter/CHANGELOG.md
#	spine-flutter/pubspec.yaml
  • Loading branch information
badlogic committed Jun 19, 2023
2 parents 9b35c03 + 403ff46 commit 28e3308
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
3 changes: 3 additions & 0 deletions spine-flutter/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 4.1.3
* Fixes for Impeller.

# 4.2.12
* Merge changes from 4.1.1 and 4.1.2.

Expand Down
4 changes: 2 additions & 2 deletions spine-flutter/example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ packages:
path: ".."
relative: true
source: path
version: "4.1.2"
version: "4.2.13"
string_scanner:
dependency: transitive
description:
Expand Down Expand Up @@ -212,4 +212,4 @@ packages:
version: "0.7.4"
sdks:
dart: ">=3.0.0-417 <4.0.0"
flutter: ">=3.10.1"
flutter: ">=3.10.5"
2 changes: 1 addition & 1 deletion spine-flutter/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version: 1.0.0+1

environment:
sdk: '>=2.17.6 <4.0.0'
flutter: ">=3.10.1"
flutter: ">=3.10.5"

dependencies:
flutter:
Expand Down
4 changes: 2 additions & 2 deletions spine-flutter/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: spine_flutter
description: The official Spine Flutter Runtime to load, display and interact with Spine animations.
version: 4.2.12
version: 4.2.13
homepage: https://esotericsoftware.com
repository: https://github.com/esotericsoftware/spine-runtimes
issue_tracker: https://github.com/esotericsoftware/spine-runtimes/issues
documentation: https://esotericsoftware.com/spine-flutter

environment:
sdk: '>=2.17.6 <4.0.0'
flutter: ">=3.10.1"
flutter: ">=3.10.5"

dependencies:
flutter:
Expand Down

0 comments on commit 28e3308

Please sign in to comment.