From 261bf41fb8c8be9317c8ec6556fbbcb4d34dd220 Mon Sep 17 00:00:00 2001 From: Emily Fortuna Date: Mon, 22 Apr 2019 17:40:12 -0700 Subject: [PATCH 1/4] Bump Dart version required to run the app, and add in Dart 2.3 features. --- lib/src/widgets/task_picker/task_picker_task.dart | 5 +++-- lib/src/widgets/work_items/bug_header.dart | 5 ++--- lib/src/widgets/work_items/task_header.dart | 5 ++--- pubspec.yaml | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/src/widgets/task_picker/task_picker_task.dart b/lib/src/widgets/task_picker/task_picker_task.dart index 4a9ec91..e539928 100644 --- 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 index 8e583b6..37db033 100644 --- 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 index 4504033..6d6a6d6 100644 --- 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 index fa5caea..ce2b475 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,7 +10,7 @@ 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" + sdk: ">=2.3.0-dev <3.0.0" dependencies: flutter: From 9811648f87cf72269035f75b3d71e635c21aea09 Mon Sep 17 00:00:00 2001 From: Emily Fortuna Date: Tue, 23 Apr 2019 13:43:01 -0700 Subject: [PATCH 2/4] be more specific with which dev version we want --- ios/Runner.xcodeproj/project.pbxproj | 8 ++++---- lib/src/widgets/flare/hiring_bust.dart | 4 ++-- pubspec.yaml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index bf3f9c3..28fdb48 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -153,7 +153,7 @@ TargetAttributes = { 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; - DevelopmentTeam = NJ3JMFUNS9; + DevelopmentTeam = S8QB4VV633; LastSwiftMigration = 0910; }; }; @@ -308,7 +308,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = NJ3JMFUNS9; + DEVELOPMENT_TEAM = S8QB4VV633; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -438,7 +438,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = NJ3JMFUNS9; + DEVELOPMENT_TEAM = S8QB4VV633; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -467,7 +467,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = NJ3JMFUNS9; + DEVELOPMENT_TEAM = S8QB4VV633; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", diff --git a/lib/src/widgets/flare/hiring_bust.dart b/lib/src/widgets/flare/hiring_bust.dart index b42c389..1b92b88 100644 --- a/lib/src/widgets/flare/hiring_bust.dart +++ b/lib/src/widgets/flare/hiring_bust.dart @@ -177,8 +177,8 @@ class HiringBustRenderObject extends FlareRenderBox { offset.dy + size.height / 2.0 - clipDiameter / 2.0) & Size(clipDiameter, clipDiameter)); - clip.addRect(const Offset(0.0, 0.0) & - Size(ui.window.physicalSize.width, offset.dy + size.height / 1.25)); + //clip.addRect(const Offset(0.0, 0.0) & + // Size(ui.window.physicalSize.width, offset.dy + size.height / 1.25)); canvas.clipPath(clip); } diff --git a/pubspec.yaml b/pubspec.yaml index ce2b475..052b1c9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,7 +10,7 @@ description: Become a tech lead, slay bugs, and don't get fired. version: 1.0.0+1 environment: - sdk: ">=2.3.0-dev <3.0.0" + sdk: ">=2.3.0-dev.0.1 <3.0.0" dependencies: flutter: From 9ff33eff0420fffbcf68d887d2798ef9aeb5cf1e Mon Sep 17 00:00:00 2001 From: Emily Fortuna Date: Tue, 23 Apr 2019 13:47:04 -0700 Subject: [PATCH 3/4] be really strict with the Flutter checkout version you use. --- pubspec.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 052b1c9..e7cfd85 100644 --- 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.3.0-dev.0.1 <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: From bda6b9828faddd0bb71b535cac98341cc1ee7e61 Mon Sep 17 00:00:00 2001 From: Emily Fortuna Date: Tue, 23 Apr 2019 13:50:27 -0700 Subject: [PATCH 4/4] remvoe unused import --- lib/src/game_screen/character_modal.dart | 2 -- lib/src/widgets/flare/hiring_bust.dart | 1 - 2 files changed, 3 deletions(-) diff --git a/lib/src/game_screen/character_modal.dart b/lib/src/game_screen/character_modal.dart index a7dcaba..7491e52 100644 --- 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 index ccd4ebb..de3eb05 100644 --- 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';