From 94d4f62f3b078fd4e259f4a9dbc7441d4ee997b9 Mon Sep 17 00:00:00 2001
From: Lukas Klingsbo <lukas.klingsbo@gmail.com>
Date: Thu, 7 Mar 2024 15:42:22 +0100
Subject: [PATCH] fix: Migrate to yaru 4.0.0

---
 lib/src/common_finders.dart  | 2 +-
 lib/src/custom_matchers.dart | 2 +-
 pubspec.yaml                 | 5 ++---
 test/button_test.dart        | 2 +-
 test/title_bar_test.dart     | 2 +-
 test/togglable_test.dart     | 2 +-
 test/window_test.dart        | 2 +-
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/src/common_finders.dart b/lib/src/common_finders.dart
index 6ff1765..b7dfd54 100644
--- a/lib/src/common_finders.dart
+++ b/lib/src/common_finders.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:yaru_widgets/yaru_widgets.dart';
+import 'package:yaru/widgets.dart';
 
 /// Convenient high-level common finder extensions for buttons and alike.
 extension YaruCommonFinders on CommonFinders {
diff --git a/lib/src/custom_matchers.dart b/lib/src/custom_matchers.dart
index f900472..d73de9e 100644
--- a/lib/src/custom_matchers.dart
+++ b/lib/src/custom_matchers.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 // TODO: expose YaruTogglable for testing
-import 'package:yaru_widgets/src/widgets/yaru_togglable.dart'; // ignore: implementation_imports
+import 'package:yaru/src/widgets/yaru_togglable.dart'; // ignore: implementation_imports
 
 /// Matches a focused (focusable) widget.
 final hasFocus = _HasFocusMatcher(true);
diff --git a/pubspec.yaml b/pubspec.yaml
index 045c0c7..938f0a6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -13,11 +13,10 @@ dependencies:
     sdk: flutter
   flutter_test:
     sdk: flutter
-  yaru: ^1.1.0
-  yaru_widgets: ^3.1.0
+  yaru: ^4.0.0
   yaru_window_platform_interface: ^0.1.0
 
 dev_dependencies:
-  flutter_lints: ^2.0.0
   mockito: ^5.4.0
   plugin_platform_interface: ^2.1.4
+  ubuntu_lints: ^0.3.0
diff --git a/test/button_test.dart b/test/button_test.dart
index 666d297..fad4d8b 100644
--- a/test/button_test.dart
+++ b/test/button_test.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:yaru/widgets.dart';
 import 'package:yaru_test/yaru_test.dart';
-import 'package:yaru_widgets/yaru_widgets.dart';
 
 import 'test_utils.dart';
 
diff --git a/test/title_bar_test.dart b/test/title_bar_test.dart
index 4c338ba..bf5e861 100644
--- a/test/title_bar_test.dart
+++ b/test/title_bar_test.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:yaru/widgets.dart';
 import 'package:yaru_test/yaru_test.dart';
-import 'package:yaru_widgets/yaru_widgets.dart';
 
 import 'test_utils.dart';
 
diff --git a/test/togglable_test.dart b/test/togglable_test.dart
index a4dde29..fbfbd3b 100644
--- a/test/togglable_test.dart
+++ b/test/togglable_test.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:yaru/widgets.dart';
 import 'package:yaru_test/yaru_test.dart';
-import 'package:yaru_widgets/yaru_widgets.dart';
 
 import 'test_utils.dart';
 
diff --git a/test/window_test.dart b/test/window_test.dart
index 2ff18e3..a98a0fe 100644
--- a/test/window_test.dart
+++ b/test/window_test.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
+import 'package:yaru/foundation.dart';
 import 'package:yaru_test/yaru_test.dart';
-import 'package:yaru_widgets/yaru_widgets.dart';
 import 'package:yaru_window_platform_interface/yaru_window_platform_interface.dart';
 
 void main() {