Просмотр исходного кода

[flutter] Change package name to esotericsoftware_spine_flutter

Mario Zechner 2 лет назад
Родитель
Сommit
6efb197776

+ 6 - 0
spine-flutter/CHANGELOG.md

@@ -1,2 +1,8 @@
+# 0.0.3
+* Lower macOS deployment target to 10.11
+
+# 0.0.2
+* Fix package name in build system `spine_flutter` > `esotericsoftware_spine_flutter`.
+
 # 0.0.1
 Initial test release.

+ 1 - 1
spine-flutter/example/lib/animation_state_events.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:spine_flutter/spine_flutter.dart';
+import 'package:esotericsoftware_spine_flutter/spine_flutter.dart';
 
 class AnimationStateEvents extends StatelessWidget {
   const AnimationStateEvents({Key? key}) : super(key: key);

+ 1 - 1
spine-flutter/example/lib/dress_up.dart

@@ -3,7 +3,7 @@ import 'dart:ui' as ui;
 
 import 'package:flutter/material.dart';
 import 'package:flutter/painting.dart' as painting;
-import 'package:spine_flutter/spine_flutter.dart';
+import 'package:esotericsoftware_spine_flutter/spine_flutter.dart';
 import 'package:raw_image_provider/raw_image_provider.dart';
 
 class DressUp extends StatefulWidget {

+ 1 - 1
spine-flutter/example/lib/ik_following.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:spine_flutter/spine_flutter.dart';
+import 'package:esotericsoftware_spine_flutter/spine_flutter.dart';
 
 class IkFollowing extends StatefulWidget {
   const IkFollowing({Key? key}) : super(key: key);

+ 1 - 1
spine-flutter/example/lib/main.dart

@@ -6,7 +6,7 @@ import 'pause_play_animation.dart';
 import 'skins.dart';
 import 'dress_up.dart';
 import 'ik_following.dart';
-import 'package:spine_flutter/spine_flutter.dart';
+import 'package:esotericsoftware_spine_flutter/spine_flutter.dart';
 
 class ExampleSelector extends StatelessWidget {
   const ExampleSelector({super.key});

+ 1 - 1
spine-flutter/example/lib/pause_play_animation.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:spine_flutter/spine_flutter.dart';
+import 'package:esotericsoftware_spine_flutter/spine_flutter.dart';
 
 class PlayPauseAnimation extends StatefulWidget {
   const PlayPauseAnimation({Key? key}) : super(key: key);

+ 1 - 1
spine-flutter/example/lib/simple_animation.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:spine_flutter/spine_flutter.dart';
+import 'package:esotericsoftware_spine_flutter/spine_flutter.dart';
 
 class SimpleAnimation extends StatelessWidget {
   const SimpleAnimation({Key? key}) : super(key: key);

+ 1 - 1
spine-flutter/example/lib/skins.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:spine_flutter/spine_flutter.dart';
+import 'package:esotericsoftware_spine_flutter/spine_flutter.dart';
 
 class Skins extends StatefulWidget {
   const Skins({Key? key}) : super(key: key);

+ 1 - 1
spine-flutter/example/linux/flutter/generated_plugins.cmake

@@ -6,7 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
-  spine_flutter
+  esotericsoftware_spine_flutter
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)

+ 1 - 1
spine-flutter/example/macos/Podfile

@@ -1,4 +1,4 @@
-platform :osx, '10.13'
+platform :osx, '10.11'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

+ 7 - 7
spine-flutter/example/macos/Podfile.lock

@@ -1,22 +1,22 @@
 PODS:
-  - FlutterMacOS (1.0.0)
-  - spine_flutter (0.0.1):
+  - esotericsoftware_spine_flutter (0.0.1):
     - FlutterMacOS
+  - FlutterMacOS (1.0.0)
 
 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: ae6af50a8ea7d6103d888583d46bd8328a7e9811
-  spine_flutter: 931c60737aba4b37f80892ebc67d3acf53932912
 
-PODFILE CHECKSUM: a884f6dd3f7494f3892ee6c81feea3a3abbf9153
+PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c
 
 COCOAPODS: 1.11.3

+ 7 - 7
spine-flutter/example/pubspec.lock

@@ -36,6 +36,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.5"
+  esotericsoftware_spine_flutter:
+    dependency: "direct main"
+    description:
+      path: ".."
+      relative: true
+    source: path
+    version: "0.0.2"
   ffi:
     dependency: transitive
     description:
@@ -137,13 +144,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.9.0"
-  spine_flutter:
-    dependency: "direct main"
-    description:
-      path: ".."
-      relative: true
-    source: path
-    version: "0.0.1"
   string_scanner:
     dependency: transitive
     description:

+ 3 - 74
spine-flutter/example/pubspec.yaml

@@ -1,95 +1,24 @@
 name: spine_flutter_example
 description: Demonstrates how to use the spine_flutter plugin.
-
-# The following line prevents the package from being accidentally published to
-# pub.dev using `flutter pub publish`. This is preferred for private packages.
-publish_to: 'none' # Remove this line if you wish to publish to pub.dev
-
-# The following defines the version and build number for your application.
-# A version number is three numbers separated by dots, like 1.2.43
-# followed by an optional build number separated by a +.
-# Both the version and the builder number may be overridden in flutter
-# build by specifying --build-name and --build-number, respectively.
-# In Android, build-name is used as versionName while build-number used as versionCode.
-# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
-# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
-# Read more about iOS versioning at
-# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
+publish_to: 'none'
 version: 1.0.0+1
 
 environment:
   sdk: ">=2.17.6 <3.0.0"
 
-# Dependencies specify other packages that your package needs in order to work.
-# To automatically upgrade your package dependencies to the latest versions
-# consider running `flutter pub upgrade --major-versions`. Alternatively,
-# dependencies can be manually updated by changing the version numbers below to
-# the latest version available on pub.dev. To see which dependencies have newer
-# versions available, run `flutter pub outdated`.
 dependencies:
   flutter:
     sdk: flutter
 
-  spine_flutter:
-    # When depending on this package from a real application you should use:
-    #   spine_flutter: ^x.y.z
-    # See https://dart.dev/tools/pub/dependencies#version-constraints
-    # The example app is bundled with the plugin so we use a path dependency on
-    # the parent directory to use the current plugin's version.
+  esotericsoftware_spine_flutter:
     path: ../
-
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.2
-
   raw_image_provider: ^0.2.0
 
 dev_dependencies:
-
-  # The "flutter_lints" package below contains a set of recommended lints to
-  # encourage good coding practices. The lint set provided by the package is
-  # activated in the `analysis_options.yaml` file located at the root of your
-  # package. See that file for information about deactivating specific lint
-  # rules and activating additional ones.
   flutter_lints: ^2.0.0
 
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
-
-# The following section is specific to Flutter packages.
 flutter:
-
-  # The following line ensures that the Material Icons font is
-  # included with your application, so that you can use the icons in
-  # the material Icons class.
   uses-material-design: true
-
-  # To add assets to your application, add an assets section, like this:
   assets:
-    - assets/
-
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/assets-and-images/#resolution-aware
-
-  # For details regarding adding assets from package dependencies, see
-  # https://flutter.dev/assets-and-images/#from-packages
-
-  # To add custom fonts to your application, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts from package dependencies,
-  # see https://flutter.dev/custom-fonts/#from-packages
+    - assets/

+ 1 - 1
spine-flutter/example/windows/flutter/generated_plugins.cmake

@@ -6,7 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
-  spine_flutter
+  esotericsoftware_spine_flutter
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)

+ 2 - 2
spine-flutter/ios/spine_flutter.podspec → spine-flutter/ios/esotericsoftware_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 spine_flutter.podspec` to validate before publishing.
+# Run `pod lib lint esotericsoftware_spine_flutter.podspec` to validate before publishing.
 #
 Pod::Spec.new do |s|
-  s.name             = 'spine_flutter'
+  s.name             = 'esotericsoftware_spine_flutter'
   s.version          = '0.0.1'
   s.summary          = 'A new Flutter FFI plugin project.'
   s.description      = <<-DESC

+ 1 - 1
spine-flutter/lib/init.dart

@@ -2,7 +2,7 @@ import 'dart:io';
 import 'dart:ffi';
 import 'package:ffi/ffi.dart';
 
-const String _libName = 'spine_flutter';
+const String _libName = 'esotericsoftware_spine_flutter';
 final DynamicLibrary _dylib = () {
   if (Platform.isMacOS || Platform.isIOS) {
     return DynamicLibrary.open('$_libName.framework/$_libName');

+ 2 - 2
spine-flutter/lib/init_web.dart

@@ -61,8 +61,8 @@ Future<SpineFlutterFFI> initSpineFlutterFFI() async {
     registerOpaqueType<spine_skin_entry_wrapper>();
     registerOpaqueType<spine_skin_entries_wrapper>();
 
-    await js.importLibrary('assets/packages/spine_flutter/lib/assets/libspine_flutter.js');
-    Uint8List wasmBinaries = (await rootBundle.load('packages/spine_flutter/lib/assets/libspine_flutter.wasm')).buffer.asUint8List();
+    await js.importLibrary('assets/packages/esotericsoftware_spine_flutter/lib/assets/libspine_flutter.js');
+    Uint8List wasmBinaries = (await rootBundle.load('packages/esotericsoftware_spine_flutter/lib/assets/libspine_flutter.wasm')).buffer.asUint8List();
     _module = await EmscriptenModule.compile(wasmBinaries, 'libspine_flutter');
   }
   Module? m = _module;

+ 3 - 3
spine-flutter/linux/CMakeLists.txt

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.10)
 
 # Project-level configuration.
-set(PROJECT_NAME "spine_flutter")
+set(PROJECT_NAME "esotericsoftware_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(spine_flutter_bundled_libraries
+set(esotericsoftware_spine_flutter_bundled_libraries
   # Defined in ../src/CMakeLists.txt.
   # This can be changed to accomodate different builds.
-  $<TARGET_FILE:spine_flutter>
+  $<TARGET_FILE:esotericsoftware_spine_flutter>
   PARENT_SCOPE
 )

+ 3 - 3
spine-flutter/macos/spine_flutter.podspec → spine-flutter/macos/esotericsoftware_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 spine_flutter.podspec` to validate before publishing.
+# Run `pod lib lint esotericsoftware_spine_flutter.podspec` to validate before publishing.
 #
 Pod::Spec.new do |s|
-  s.name             = 'spine_flutter'
+  s.name             = 'esotericsoftware_spine_flutter'
   s.version          = '0.0.1'
   s.summary          = 'A new Flutter FFI plugin project.'
   s.description      = <<-DESC
@@ -22,7 +22,7 @@ A new Flutter FFI plugin project.
   s.xcconfig = { 'HEADER_SEARCH_PATHS' => '"' + __dir__ + '/Classes/spine-cpp/include"' }
   s.dependency 'FlutterMacOS'
 
-  s.platform = :osx, '10.13'
+  s.platform = :osx, '10.11'
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
   s.swift_version = '5.0'
 end

+ 1 - 1
spine-flutter/pubspec.yaml

@@ -1,6 +1,6 @@
 name: esotericsoftware_spine_flutter
 description: The official Spine Flutter Runtime to load, display and interact with Spine animations.
-version: 0.0.1
+version: 0.0.3
 homepage: https://esotericsoftware.com
 repository: https://github.com/esotericsoftware/spine-runtimes
 issue_tracker: https://github.com/esotericsoftware/spine-runtimes/issues

+ 6 - 6
spine-flutter/src/CMakeLists.txt

@@ -3,19 +3,19 @@
 # the plugin to fail to compile for some customers of the plugin.
 cmake_minimum_required(VERSION 3.10)
 
-project(spine_flutter_library VERSION 0.0.1)
+project(esotericsoftware_spine_flutter_library VERSION 0.0.1)
 
 file(GLOB SPINE_SOURCES "spine-cpp/src/**/*.cpp")
 
-add_library(spine_flutter SHARED
+add_library(esotericsoftware_spine_flutter SHARED
   "spine_flutter.cpp"
   ${SPINE_SOURCES}
 )
 
-set_target_properties(spine_flutter PROPERTIES
+set_target_properties(esotericsoftware_spine_flutter PROPERTIES
   PUBLIC_HEADER spine_flutter.h
-  OUTPUT_NAME "spine_flutter"
+  OUTPUT_NAME "esotericsoftware_spine_flutter"
 )
-target_include_directories(spine_flutter PUBLIC spine-cpp/include)
-target_compile_definitions(spine_flutter PUBLIC DART_SHARED_LIB)
+target_include_directories(esotericsoftware_spine_flutter PUBLIC spine-cpp/include)
+target_compile_definitions(esotericsoftware_spine_flutter PUBLIC DART_SHARED_LIB)
 

+ 3 - 3
spine-flutter/windows/CMakeLists.txt

@@ -5,7 +5,7 @@
 cmake_minimum_required(VERSION 3.14)
 
 # Project-level configuration.
-set(PROJECT_NAME "spine_flutter")
+set(PROJECT_NAME "esotericsoftware_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(spine_flutter_bundled_libraries
+set(esotericsoftware_spine_flutter_bundled_libraries
   # Defined in ../src/CMakeLists.txt.
   # This can be changed to accomodate different builds.
-  $<TARGET_FILE:spine_flutter>
+  $<TARGET_FILE:esotericsoftware_spine_flutter>
   PARENT_SCOPE
 )