Squashed commit of the following:

commit f0cf988
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Fri Oct 11 12:59:13 2019 -0700

    Fix reading of JSON clip values. Issue #172

commit a7796e0
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Fri Oct 11 12:39:48 2019 -0700

    Mitigating issue #172.

commit 373c14a
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Wed Oct 9 14:21:47 2019 -0700

    Fixing issue with image clipping.

commit ae1c901
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Wed Oct 9 11:19:16 2019 -0700

    Fix merge bugs.

commit d8cb780
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Wed Oct 9 11:09:42 2019 -0700

    Adding support for difference clipping.

commit bf99a76
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Tue Oct 8 19:07:26 2019 -0700

    Matching stable version

commit 9becc74
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Tue Oct 8 13:58:11 2019 -0700

    Bumping flare_dart to 2.0 due to breaking changes.

commit 0a292cc
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Tue Oct 8 13:39:57 2019 -0700

    Bumping versions and changelogs.

commit 431a98e
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Tue Oct 8 13:35:26 2019 -0700

    Fixing up analysis issues for #169

commit 72fb6fc
Merge: 4d00202 dc68dea
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Tue Oct 8 13:02:17 2019 -0700

    Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter

commit 4d00202
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Tue Oct 8 13:02:11 2019 -0700

    Cleaning up analysis issues.

commit dc68dea
Merge: 5ca8d49 f1d9749
Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
Date:   Tue Oct 8 11:06:53 2019 -0700

    Merge pull request #168 from mehmetf/master

    Escalate the severity of unused imports in analyzer

commit f1d9749
Author: Mehmet Fidanboylu <mehmetf@google.com>
Date:   Tue Oct 8 10:20:58 2019 -0700

    Do the same changes to flare_dart

commit 64f395e
Author: Mehmet Fidanboylu <mehmetf@google.com>
Date:   Tue Oct 8 10:17:51 2019 -0700

    Escalate the severity of unused imports in analyzer

commit 5ca8d49
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Mon Oct 7 11:22:38 2019 -0700

    Bumping versions and changelog.

commit 874ce8e
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Mon Oct 7 11:20:28 2019 -0700

    Adding support for nodes inside of shapes.

commit 4d06431
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Fri Oct 4 18:06:09 2019 -0700

    Introducing FlareTesting.setup();

commit 2c5f420
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Fri Oct 4 13:44:25 2019 -0700

    Clamping trim start/end.

commit daba34d
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Mon Sep 30 21:21:55 2019 +0200

    Cherry picking critical lints from #1 63 and updating for pub.

flare_dart/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [2.2.2] - 2019-10-11 12:55:44
+
+- Call openObject before reading clip node and intersect, closeObject after. Fixes issue with reading in new clips in JSON.
+
 ## [2.2.1] - 2019-10-11 12:38:09
 
 - Mitigate path keyframes exported for non-paths (fixing this on Flare side too).

flare_dart/lib/actor_node.dart

@@ -247,10 +247,12 @@ class ActorNode extends ActorComponent {
     if (clipCount > 0) {
       node._clips = List<ActorClip>(clipCount);
       for (int i = 0; i < clipCount; i++) {
-        var clip = ActorClip(reader.readId("clip"));
+        reader.openObject("clip");
+        var clip = ActorClip(reader.readId("node"));
         if (artboard.actor.version >= 23) {
           clip.intersect = reader.readBool("intersect");
         }
+        reader.closeObject();
         node._clips[i] = clip;
       }
     }

flare_dart/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flare_dart
 description: Vector design and runtime animation.
-version: 2.2.1
+version: 2.2.2
 author: "2Dimensions Team <info@2dimensions.com>"
 homepage: https://github.com/2d-inc/Flare-Flutter
 environment:

flare_flutter/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.6.3] - 2019-10-11 12:58:13
+
+- Use latest flare_dart, fixing issue with reading clip nodes in JSON.
+
 ## [1.6.2] - 2019-10-11 12:38:33
 
 - Use latest flare_dart, mitigating a bad path keyframe issue.

flare_flutter/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flare_flutter
 description: Vector design and runtime animation for Flutter.
-version: 1.6.2
+version: 1.6.3
 author: "2Dimensions Team <info@2dimensions.com>"
 homepage: https://github.com/2d-inc/Flare-Flutter
 environment: