Merging from dart3a

tekartik · Jun 2, 2024 · 75b7566 · 75b7566
2 parents 5d67bf4 + 4eea5fc
commit 75b7566
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ dependencies:
   tekartik_test_menu_flutter:
     git:
       url: https://github.com/tekartik/test_menu_flutter
-      ref: dart2
+      ref: dart3a
       path: test_menu_flutter
     version: '>=0.2.5'
   ...

diff --git a/example/min_app/lib/main.dart b/example/min_app/lib/main.dart
@@ -8,7 +8,7 @@ import 'package:tekartik_test_menu_flutter/demo/demo_test_menu_flutter.dart'
 import 'package:tekartik_test_menu_flutter/test_menu_flutter.dart';
 
 void main() {
-  mainMenu(() {
+  mainMenuFlutter(() {
     //devPrint('MAIN_');
     item('item2', () {
       write('item');

diff --git a/test_menu_flutter/lib/src/test_menu_manager_flutter.dart b/test_menu_flutter/lib/src/test_menu_manager_flutter.dart
@@ -204,7 +204,13 @@ void initTestMenuFlutter(
 
 _TestMenuManagerFlutter? _testMenuManagerFlutter;
 
+@Deprecated('Use mainMenuFlutter')
 void mainMenu(void Function() body, {bool? showConsole}) {
+  mainMenuFlutter(body, showConsole: showConsole);
+}
+
+/// Main menu for flutter
+void mainMenuFlutter(void Function() body, {bool? showConsole}) {
   initTestMenuFlutter(
       builder: (Widget child) {
         // _testMenuManagerFlutter.bodyBuilder = body;

diff --git a/test_menu_flutter/lib/test_menu_flutter.dart b/test_menu_flutter/lib/test_menu_flutter.dart
@@ -6,7 +6,9 @@ export 'src/model/main_item.dart';
 */
 export 'src/test_menu_manager_flutter.dart'
     show
+        // ignore: deprecated_member_use_from_same_package
         mainMenu,
+        mainMenuFlutter,
         initTestMenuFlutter,
         // ignore: deprecated_member_use
         solo_item,

diff --git a/test_menu_flutter/raw_example/example.dart b/test_menu_flutter/raw_example/example.dart
@@ -7,7 +7,7 @@ import 'package:tekartik_test_menu_flutter/demo/demo_test_menu_flutter.dart'
 import 'package:tekartik_test_menu_flutter/test_menu_flutter.dart';
 
 void main() {
-  mainMenu(() {
+  mainMenuFlutter(() {
     //devPrint('MAIN_');
     item('item2', () {
       write('item');

diff --git a/test_menu_flutter_example/lib/main.dart b/test_menu_flutter_example/lib/main.dart
@@ -7,7 +7,7 @@ import 'package:tekartik_test_menu_flutter/demo/demo_test_menu_flutter.dart'
 import 'package:tekartik_test_menu_flutter/test_menu_flutter.dart';
 
 void main() {
-  mainMenu(() {
+  mainMenuFlutter(() {
     //devPrint('MAIN_');
     item('item2', () {
       write('item');

diff --git a/test_menu_flutter_example/lib/solo_test_main.dart b/test_menu_flutter_example/lib/solo_test_main.dart
@@ -1,7 +1,7 @@
 import 'package:tekartik_test_menu_flutter/test.dart';
 
 void main() {
-  mainMenu(menu, showConsole: true);
+  mainMenuFlutter(menu, showConsole: true);
 }
 
 void menu() {

diff --git a/test_menu_flutter_example/pubspec.yaml b/test_menu_flutter_example/pubspec.yaml
@@ -49,6 +49,7 @@ dependency_overrides:
   # tmp
   tekartik_test_menu:
      path: ../../test_menu.dart/test_menu
+_dependency_overrides:
   dev_build:
     path: ../../../tekartik/dev_test.dart/dev_build
   # temp pre-dart2 override