Merge branch 'main' into netplan-config-copied

canonical · Sep 29, 2023 · 0d1fa61 · 0d1fa61
2 parents d5a9cd4 + 74823cd
commit 0d1fa61
Show file tree

Hide file tree

Showing 14 changed files with 148 additions and 45 deletions.
diff --git a/packages/ubuntu_desktop_installer/pubspec.yaml b/packages/ubuntu_desktop_installer/pubspec.yaml
@@ -4,8 +4,8 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: '>=3.0.0 <4.0.0'
-  flutter: '>=3.10.0'
+  sdk: '^3.0.6'
+  flutter: '^3.10.6'
 
 dependencies:
   collection: ^1.15.0

diff --git a/packages/ubuntu_wsl_setup/lib/l10n/app_it.arb b/packages/ubuntu_wsl_setup/lib/l10n/app_it.arb
@@ -11,5 +11,9 @@
   "profileSetupRealnameLabel": "Il tuo nome",
   "@profileSetupRealnameLabel": {},
   "profileSetupUsernameHint": "Scegli uno username",
-  "@profileSetupUsernameHint": {}
+  "@profileSetupUsernameHint": {},
+  "exitButton": "Esci",
+  "@exitButton": {},
+  "finishButton": "Termina",
+  "@finishButton": {}
 }
diff --git a/packages/ubuntu_wsl_setup/lib/l10n/app_pt.arb b/packages/ubuntu_wsl_setup/lib/l10n/app_pt.arb
@@ -12,7 +12,7 @@
   "@saveButton": {},
   "setupButton": "Configurar",
   "@setupButton": {},
-  "selectLanguageTitle": "Selecione seu idioma",
+  "selectLanguageTitle": "Selecione o seu idioma",
   "@selectLanguageTitle": {},
   "profileSetupTitle": "Configurar perfil",
   "@profileSetupTitle": {},

diff --git a/packages/ubuntu_wsl_setup/pubspec.yaml b/packages/ubuntu_wsl_setup/pubspec.yaml
@@ -3,8 +3,8 @@ description: Ubuntu WSL OOBE Setup Wizard
 publish_to: 'none'
 
 environment:
-  sdk: '>=3.0.0 <4.0.0'
-  flutter: '>=3.10.0'
+  sdk: '^3.0.6'
+  flutter: '^3.10.6'
 
 dependencies:
   args: ^2.2.0

diff --git a/packages/ubuntu_wsl_setup/test/advanced_setup_page_test.mocks.dart b/packages/ubuntu_wsl_setup/test/advanced_setup_page_test.mocks.dart
@@ -35,6 +35,7 @@ class MockAdvancedSetupModel extends _i1.Mock
         Invocation.getter(#mountLocation),
         returnValue: '',
       ) as String);
+
   @override
   set mountLocation(String? value) => super.noSuchMethod(
         Invocation.setter(
@@ -43,11 +44,13 @@ class MockAdvancedSetupModel extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   String get mountOption => (super.noSuchMethod(
         Invocation.getter(#mountOption),
         returnValue: '',
       ) as String);
+
   @override
   set mountOption(String? value) => super.noSuchMethod(
         Invocation.setter(
@@ -56,11 +59,13 @@ class MockAdvancedSetupModel extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   bool get enableHostGeneration => (super.noSuchMethod(
         Invocation.getter(#enableHostGeneration),
         returnValue: false,
       ) as bool);
+
   @override
   set enableHostGeneration(bool? value) => super.noSuchMethod(
         Invocation.setter(
@@ -69,11 +74,13 @@ class MockAdvancedSetupModel extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   bool get enableResolvConfGeneration => (super.noSuchMethod(
         Invocation.getter(#enableResolvConfGeneration),
         returnValue: false,
       ) as bool);
+
   @override
   set enableResolvConfGeneration(bool? value) => super.noSuchMethod(
         Invocation.setter(
@@ -82,21 +89,25 @@ class MockAdvancedSetupModel extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   bool get isValid => (super.noSuchMethod(
         Invocation.getter(#isValid),
         returnValue: false,
       ) as bool);
+
   @override
   bool get hasListeners => (super.noSuchMethod(
         Invocation.getter(#hasListeners),
         returnValue: false,
       ) as bool);
+
   @override
   bool get isDisposed => (super.noSuchMethod(
         Invocation.getter(#isDisposed),
         returnValue: false,
       ) as bool);
+
   @override
   _i3.Future<void> loadAdvancedSetup() => (super.noSuchMethod(
         Invocation.method(
@@ -106,6 +117,7 @@ class MockAdvancedSetupModel extends _i1.Mock
         returnValue: _i3.Future<void>.value(),
         returnValueForMissingStub: _i3.Future<void>.value(),
       ) as _i3.Future<void>);
+
   @override
   _i3.Future<void> saveAdvancedSetup() => (super.noSuchMethod(
         Invocation.method(
@@ -115,6 +127,7 @@ class MockAdvancedSetupModel extends _i1.Mock
         returnValue: _i3.Future<void>.value(),
         returnValueForMissingStub: _i3.Future<void>.value(),
       ) as _i3.Future<void>);
+
   @override
   void addListener(_i4.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
@@ -123,6 +136,7 @@ class MockAdvancedSetupModel extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   void removeListener(_i4.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
@@ -131,6 +145,7 @@ class MockAdvancedSetupModel extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   void dispose() => super.noSuchMethod(
         Invocation.method(
@@ -139,6 +154,7 @@ class MockAdvancedSetupModel extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   void notifyListeners() => super.noSuchMethod(
         Invocation.method(

diff --git a/packages/ubuntu_wsl_setup/test/applying_changes_page_test.mocks.dart b/packages/ubuntu_wsl_setup/test/applying_changes_page_test.mocks.dart
@@ -35,11 +35,13 @@ class MockApplyingChangesModel extends _i1.Mock
         Invocation.getter(#hasListeners),
         returnValue: false,
       ) as bool);
+
   @override
   bool get isDisposed => (super.noSuchMethod(
         Invocation.getter(#isDisposed),
         returnValue: false,
       ) as bool);
+
   @override
   _i3.Future<void> init() => (super.noSuchMethod(
         Invocation.method(
@@ -49,6 +51,7 @@ class MockApplyingChangesModel extends _i1.Mock
         returnValue: _i3.Future<void>.value(),
         returnValueForMissingStub: _i3.Future<void>.value(),
       ) as _i3.Future<void>);
+
   @override
   void dispose() => super.noSuchMethod(
         Invocation.method(
@@ -57,6 +60,7 @@ class MockApplyingChangesModel extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   void addListener(_i4.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
@@ -65,6 +69,7 @@ class MockApplyingChangesModel extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   void removeListener(_i4.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
@@ -73,6 +78,7 @@ class MockApplyingChangesModel extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   void notifyListeners() => super.noSuchMethod(
         Invocation.method(

diff --git a/packages/ubuntu_wsl_setup/test/configuration_ui_page_test.mocks.dart b/packages/ubuntu_wsl_setup/test/configuration_ui_page_test.mocks.dart
@@ -35,6 +35,7 @@ class MockConfigurationUIModel extends _i1.Mock
         Invocation.getter(#interopAppendwindowspath),
         returnValue: false,
       ) as bool);
+
   @override
   set interopAppendwindowspath(bool? value) => super.noSuchMethod(
         Invocation.setter(
@@ -43,11 +44,13 @@ class MockConfigurationUIModel extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   bool get interopEnabled => (super.noSuchMethod(
         Invocation.getter(#interopEnabled),
         returnValue: false,
       ) as bool);
+
   @override
   set interopEnabled(bool? value) => super.noSuchMethod(
         Invocation.setter(
@@ -56,11 +59,13 @@ class MockConfigurationUIModel extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   bool get automountEnabled => (super.noSuchMethod(
         Invocation.getter(#automountEnabled),
         returnValue: false,
       ) as bool);
+
   @override
   set automountEnabled(bool? value) => super.noSuchMethod(
         Invocation.setter(
@@ -69,11 +74,13 @@ class MockConfigurationUIModel extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   bool get automountMountfstab => (super.noSuchMethod(
         Invocation.getter(#automountMountfstab),
         returnValue: false,
       ) as bool);
+
   @override
   set automountMountfstab(bool? value) => super.noSuchMethod(
         Invocation.setter(
@@ -82,21 +89,25 @@ class MockConfigurationUIModel extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   bool get isValid => (super.noSuchMethod(
         Invocation.getter(#isValid),
         returnValue: false,
       ) as bool);
+
   @override
   bool get hasListeners => (super.noSuchMethod(
         Invocation.getter(#hasListeners),
         returnValue: false,
       ) as bool);
+
   @override
   bool get isDisposed => (super.noSuchMethod(
         Invocation.getter(#isDisposed),
         returnValue: false,
       ) as bool);
+
   @override
   _i3.Future<void> loadConfiguration() => (super.noSuchMethod(
         Invocation.method(
@@ -106,6 +117,7 @@ class MockConfigurationUIModel extends _i1.Mock
         returnValue: _i3.Future<void>.value(),
         returnValueForMissingStub: _i3.Future<void>.value(),
       ) as _i3.Future<void>);
+
   @override
   _i3.Future<void> saveConfiguration() => (super.noSuchMethod(
         Invocation.method(
@@ -115,6 +127,7 @@ class MockConfigurationUIModel extends _i1.Mock
         returnValue: _i3.Future<void>.value(),
         returnValueForMissingStub: _i3.Future<void>.value(),
       ) as _i3.Future<void>);
+
   @override
   void addListener(_i4.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
@@ -123,6 +136,7 @@ class MockConfigurationUIModel extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   void removeListener(_i4.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
@@ -131,6 +145,7 @@ class MockConfigurationUIModel extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   void dispose() => super.noSuchMethod(
         Invocation.method(
@@ -139,6 +154,7 @@ class MockConfigurationUIModel extends _i1.Mock
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   void notifyListeners() => super.noSuchMethod(
         Invocation.method(