Minor fixes for analyze.

2d-inc · Dec 5, 2019 · f0b24f4 · f0b24f4
1 parent 333249f
commit f0b24f4
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 34 deletions.
diff --git a/example/checkbox/pubspec.lock b/example/checkbox/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.10"
+    version: "2.0.11"
   args:
     dependency: transitive
     description:
@@ -21,7 +21,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -67,17 +67,19 @@ packages:
   flare_dart:
     dependency: transitive
     description:
-      path: "../../flare_dart"
-      relative: true
-    source: path
-    version: "2.2.2"
+      path: flare_dart
+      ref: dev
+      resolved-ref: "393c22461e127714a3a25c986bb59a666cba72ac"
+      url: "git://github.com/2d-inc/Flare-Flutter.git"
+    source: git
+    version: "2.3.0"
   flare_flutter:
     dependency: "direct main"
     description:
       path: "../../flare_flutter"
       relative: true
     source: path
-    version: "1.6.3"
+    version: "1.8.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -101,14 +103,14 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.5"
+    version: "0.12.6"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
   path:
     dependency: transitive
     description:
@@ -183,7 +185,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.5"
+    version: "0.2.11"
   typed_data:
     dependency: transitive
     description:

diff --git a/example/slider/pubspec.lock b/example/slider/pubspec.lock
@@ -1,20 +1,34 @@
 # Generated by pub
-# See https://www.dartlang.org/tools/pub/glossary#lockfile
+# See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.11"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.2"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.8"
+    version: "2.4.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   charcode:
     dependency: transitive
     description:
@@ -29,6 +43,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.14.11"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -37,19 +65,21 @@ packages:
     source: hosted
     version: "0.1.2"
   flare_dart:
-    dependency: "direct main"
+    dependency: transitive
     description:
-      path: "../../flare_dart"
-      relative: true
-    source: path
-    version: "1.1.0"
+      path: flare_dart
+      ref: dev
+      resolved-ref: "393c22461e127714a3a25c986bb59a666cba72ac"
+      url: "git://github.com/2d-inc/Flare-Flutter.git"
+    source: git
+    version: "2.3.0"
   flare_flutter:
     dependency: "direct main"
     description:
       path: "../../flare_flutter"
       relative: true
     source: path
-    version: "1.1.0"
+    version: "1.8.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -60,34 +90,55 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.4"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.3+1"
+    version: "0.12.6"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.1.8"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.2"
+    version: "1.6.4"
+  pedantic:
+    dependency: transitive
+    description:
+      name: pedantic
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.8.0+1"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0"
   quiver:
     dependency: transitive
     description:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.5"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -99,7 +150,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.1"
+    version: "1.5.5"
   stack_trace:
     dependency: transitive
     description:
@@ -113,28 +164,28 @@ packages:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.8"
+    version: "2.0.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.1"
+    version: "0.2.11"
   typed_data:
     dependency: transitive
     description:
@@ -149,5 +200,12 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.8"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.5.0"
 sdks:
-  dart: ">=2.1.0 <3.0.0"
+  dart: ">=2.4.0 <3.0.0"
diff --git a/flare_dart/lib/actor_bone.dart b/flare_dart/lib/actor_bone.dart
@@ -1,7 +1,6 @@
 import "actor_artboard.dart";
 import "actor_bone_base.dart";
 import "actor_component.dart";
-import "actor_node.dart";
 import "jelly_component.dart";
 import "stream_reader.dart";
 

diff --git a/flare_dart/lib/actor_ik_constraint.dart b/flare_dart/lib/actor_ik_constraint.dart
@@ -121,7 +121,7 @@ class ActorIKConstraint extends ActorTargetedConstraint {
       }
 
       ActorBone bone = fk.bone;
-      for (final ActorNode node in bone.children) {
+      for (final node in bone.children) {
         BoneChain item = _fkChain.firstWhere(
             (chainItem) => chainItem.bone == node,
             orElse: () => null);

diff --git a/flare_dart/lib/actor_layer_effect_renderer.dart b/flare_dart/lib/actor_layer_effect_renderer.dart
@@ -4,7 +4,6 @@ import 'package:flare_dart/math/aabb.dart';
 
 import 'actor_artboard.dart';
 import 'actor_blur.dart';
-import 'actor_component.dart';
 import 'actor_drawable.dart';
 import 'actor_inner_shadow.dart';
 import 'actor_mask.dart';

diff --git a/flare_flutter/android/local.properties b/flare_flutter/android/local.properties
@@ -1,2 +1,2 @@
-sdk.dir=/usr/local/share/android-sdk
-flutter.sdk=/Users/luigirosso/Projects/flutter
+sdk.dir=/Users/luigi/Library/Android/sdk
+flutter.sdk=/Users/luigi/Projects/flutter/flutter
diff --git a/flare_flutter/ios/Runner/GeneratedPluginRegistrant.h b/flare_flutter/ios/Runner/GeneratedPluginRegistrant.h
@@ -7,8 +7,11 @@
 
 #import <Flutter/Flutter.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface GeneratedPluginRegistrant : NSObject
 + (void)registerWithRegistry:(NSObject<FlutterPluginRegistry>*)registry;
 @end
 
+NS_ASSUME_NONNULL_END
 #endif /* GeneratedPluginRegistrant_h */