Merge pull request #41 from 2d-inc/new-dart

🎉Bump Dart version required to run the app, and add in Dart 2.3 features.🎉
2d-inc · Apr 23, 2019 · 0d0bf32 · 0d0bf32
2 parents 3564f1b + bda6b98
commit 0d0bf32
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/lib/src/game_screen/character_modal.dart b/lib/src/game_screen/character_modal.dart
@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:dev_rpg/src/game_screen/character_style.dart';
 import 'package:dev_rpg/src/game_screen/skill_badge.dart';
 import 'package:dev_rpg/src/shared_state/game/character.dart';

diff --git a/lib/src/widgets/flare/hiring_bust.dart b/lib/src/widgets/flare/hiring_bust.dart
@@ -1,5 +1,4 @@
 import 'dart:math';
-import 'dart:ui' as ui;
 
 import 'package:dev_rpg/src/widgets/flare/desaturated_actor.dart';
 import 'package:dev_rpg/src/widgets/flare/hiring_particles.dart';

diff --git a/lib/src/widgets/task_picker/task_picker_task.dart b/lib/src/widgets/task_picker/task_picker_task.dart
@@ -110,8 +110,9 @@ class TaskPickerTask extends StatelessWidget {
                 ),
               ),
             ),
-          )
-        ]..addAll(lineWidgets),
+          ),
+          ...lineWidgets
+        ],
       ),
     );
   }

diff --git a/lib/src/widgets/work_items/bug_header.dart b/lib/src/widgets/work_items/bug_header.dart
@@ -14,9 +14,8 @@ class BugHeader extends StatelessWidget {
       children: [
         const Icon(Icons.bug_report, color: bugColor),
         Expanded(child: Container()),
-      ]..addAll(
-          bug.skillsNeeded.map((Skill skill) => SkillDot(skill)).toList(),
-        ),
+        for (Skill skill in bug.skillsNeeded) SkillDot(skill)
+      ]
     );
   }
 }
diff --git a/lib/src/widgets/work_items/task_header.dart b/lib/src/widgets/work_items/task_header.dart
@@ -26,9 +26,8 @@ class TaskHeader extends StatelessWidget {
           style: contentSmallStyle,
         ),
         Expanded(child: Container()),
-      ]..addAll(
-          blueprint.skillsNeeded.map((Skill skill) => SkillDot(skill)).toList(),
-        ),
+        for (Skill skill in blueprint.skillsNeeded) SkillDot(skill)
+      ],
     );
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -10,7 +10,10 @@ description: Become a tech lead, slay bugs, and don't get fired.
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.2.0 <3.0.0"
+  # For Google I/O we are being very specific about pinning to specific branch revision.
+  # This is flutter commit hash b593f5167bce84fb3cad5c258477bf3abc1b14eb.
+  #sdk: ">=2.3.0-dev.0.1 <3.0.0"
+  sdk: "2.3.0-dev.0.1.flutter-cf4444b803"
 
 dependencies:
   flutter:
-Original file line number
+Diff line change
@@ Expand Up / @@ -110,8 +110,9 @@ class TaskPickerTask extends StatelessWidget { @@
                     ),
                   ),
                 ),
-              )
-            ]..addAll(lineWidgets),
+              ),
+              ...lineWidgets
+            ],
           ),
         );
       }
@@ Expand Down @@