Moved files and basic formatting

lib/src/commands/config_command.dart

@@ -1,10 +1,10 @@
-import '../../constants.dart';
-import '../../fvm.dart';
-import '../services/config_repository.dart';
-import '../services/logger_service.dart';
 import 'package:io/ansi.dart';
 import 'package:io/io.dart';
 
+import '../../fvm.dart';
+import '../services/config_repository.dart';
+import '../services/logger_service.dart';
+import '../utils/constants.dart';
 import '../utils/context.dart';
 import 'base_command.dart';
 

lib/src/commands/dart_command.dart

@@ -1,9 +1,9 @@
 import 'package:args/args.dart';
-import '../../constants.dart';
-import '../../fvm.dart';
-import '../utils/commands.dart';
 
+import '../../fvm.dart';
 import '../services/logger_service.dart';
+import '../utils/commands.dart';
+import '../utils/constants.dart';
 import '../workflows/ensure_cache.workflow.dart';
 import 'base_command.dart';
 
@@ -40,6 +40,7 @@ class DartCommand extends BaseCommand {
       // Running null will default to dart version on path
     }
     final results = await runDart(args, version: cacheVersion);
+
     return results.exitCode;
   }
 }

lib/src/commands/doctor_command.dart

@@ -2,16 +2,16 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:dart_console/dart_console.dart';
-import '../../constants.dart';
-import '../../exceptions.dart';
-import '../../fvm.dart';
-import '../utils/console_utils.dart';
-import '../utils/context.dart';
-import '../utils/which.dart';
 import 'package:io/io.dart';
 import 'package:path/path.dart';
 
+import '../../fvm.dart';
 import '../services/logger_service.dart';
+import '../utils/console_utils.dart';
+import '../utils/constants.dart';
+import '../utils/context.dart';
+import '../utils/exceptions.dart';
+import '../utils/which.dart';
 import 'base_command.dart';
 
 /// Information about fvm environment
@@ -155,10 +155,7 @@ class DoctorCommand extends BaseCommand {
         ]);
       }
     } else {
-      table.insertRow([
-        kIntelliJ,
-        'No .idea folder found',
-      ]);
+      table.insertRow([kIntelliJ, 'No .idea folder found']);
     }
 
     logger.write(table.toString());

lib/src/commands/exec_command.dart

@@ -1,10 +1,10 @@
 import 'package:args/args.dart';
 import 'package:args/command_runner.dart';
-import '../../constants.dart';
-import '../../fvm.dart';
 
+import '../../fvm.dart';
 import '../services/logger_service.dart';
 import '../utils/commands.dart';
+import '../utils/constants.dart';
 import '../workflows/ensure_cache.workflow.dart';
 import 'base_command.dart';
 

lib/src/commands/flutter_command.dart

@@ -1,10 +1,10 @@
 import 'package:args/args.dart';
-import '../../constants.dart';
-import '../../exceptions.dart';
+
 import '../../fvm.dart';
 import '../services/logger_service.dart';
-
 import '../utils/commands.dart';
+import '../utils/constants.dart';
+import '../utils/exceptions.dart';
 import '../workflows/ensure_cache.workflow.dart';
 import 'base_command.dart';
 
@@ -56,6 +56,7 @@ class FlutterCommand extends BaseCommand {
       // Running null will default to flutter version on paths
     }
     final results = await runFlutter(args, version: cacheVersion);
+
     return results.exitCode;
   }
 }

lib/src/commands/global_command.dart

@@ -1,16 +1,16 @@
-import '../../constants.dart';
+import 'package:mason_logger/mason_logger.dart';
+import 'package:tint/tint.dart';
+
 import '../models/cache_flutter_version_model.dart';
+import '../services/cache_service.dart';
 import '../services/global_version_service.dart';
 import '../services/logger_service.dart';
 import '../services/project_service.dart';
 import '../utils/console_utils.dart';
+import '../utils/constants.dart';
 import '../utils/context.dart';
 import '../utils/helpers.dart';
 import '../utils/which.dart';
-import 'package:mason_logger/mason_logger.dart';
-import 'package:tint/tint.dart';
-
-import '../services/cache_service.dart';
 import '../workflows/ensure_cache.workflow.dart';
 import 'base_command.dart';
 

lib/src/commands/install_command.dart

@@ -1,11 +1,11 @@
 import 'dart:async';
 
-import '../workflows/setup_flutter.workflow.dart';
 import 'package:io/io.dart';
 
-import '../../exceptions.dart';
 import '../services/project_service.dart';
+import '../utils/exceptions.dart';
 import '../workflows/ensure_cache.workflow.dart';
+import '../workflows/setup_flutter.workflow.dart';
 import 'base_command.dart';
 
 /// Installs Flutter SDK
@@ -20,8 +20,8 @@ class InstallCommand extends BaseCommand {
   InstallCommand() {
     argParser.addFlag(
       'setup',
-      help: 'Builds SDK after install after install',
       abbr: 's',
+      help: 'Builds SDK after install after install',
       defaultsTo: false,
       negatable: false,
     );

lib/src/commands/remove_command.dart

@@ -1,13 +1,13 @@
 import 'dart:io';
 
-import '../../constants.dart';
-import '../utils/context.dart';
 import 'package:io/io.dart';
 
 import '../models/flutter_version_model.dart';
 import '../services/cache_service.dart';
 import '../services/logger_service.dart';
 import '../utils/console_utils.dart';
+import '../utils/constants.dart';
+import '../utils/context.dart';
 import 'base_command.dart';
 
 /// Removes Flutter SDK
@@ -21,8 +21,8 @@ class RemoveCommand extends BaseCommand {
   RemoveCommand() {
     argParser.addFlag(
       'all',
-      help: 'Removes all versions',
       abbr: 'a',
+      help: 'Removes all versions',
       negatable: false,
     );
   }
@@ -48,6 +48,7 @@ class RemoveCommand extends BaseCommand {
           );
         }
       }
+
       return ExitCode.success.code;
     }
 
@@ -65,6 +66,7 @@ class RemoveCommand extends BaseCommand {
     // Check if version is installed
     if (cacheVersion == null) {
       logger.info('Flutter SDK: $validVersion is not installed');
+
       return ExitCode.success.code;
     }
 

lib/src/commands/update_command.dart

@@ -4,8 +4,8 @@ import 'package:args/command_runner.dart';
 import 'package:mason_logger/mason_logger.dart';
 import 'package:pub_updater/pub_updater.dart';
 
-import '../../constants.dart';
 import '../services/logger_service.dart';
+import '../utils/constants.dart';
 import '../version.g.dart';
 
 class UpdateCommand extends Command<int> {

lib/src/models/cache_flutter_version_model.dart

@@ -1,13 +1,13 @@
 import 'dart:io';
 
-import 'flutter_version_model.dart';
+import 'package:path/path.dart';
+
 import '../utils/commands.dart';
 import '../utils/compare_semver.dart';
+import '../utils/constants.dart';
 import '../utils/extensions.dart';
 import '../utils/helpers.dart';
-import 'package:path/path.dart';
-
-import '../../constants.dart';
+import 'flutter_version_model.dart';
 
 /// Cache Version model
 class CacheFlutterVersion extends FlutterVersion {
@@ -41,6 +41,7 @@ class CacheFlutterVersion extends FlutterVersion {
     /// Get old bin path
     /// Before version 1.17.5 dart path was bin/cache/dart-sdk/bin
     if (hasOldBinPath) return join(_dartSdkCache, 'bin');
+
     return binPath;
   }
 
@@ -53,11 +54,13 @@ class CacheFlutterVersion extends FlutterVersion {
   /// Gets Flutter SDK version from CacheVersion sync
   String? get flutterSdkVersion {
     final versionFile = join(directory, 'version');
+
     return versionFile.file.read()?.trim();
   }
 
   String? get dartSdkVersion {
     final versionFile = join(_dartSdkCache, 'version');
+
     return versionFile.file.read()?.trim();
   }
 

lib/src/models/config_model.dart

@@ -4,8 +4,9 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:args/args.dart';
-import '../../constants.dart';
+
 import '../utils/change_case.dart';
+import '../utils/constants.dart';
 import '../utils/extensions.dart';
 import '../utils/pretty_json.dart';
 

lib/src/models/flutter_version_model.dart

@@ -1,8 +1,7 @@
 import '../utils/compare_semver.dart';
+import '../utils/constants.dart';
 import '../utils/extensions.dart';
 import '../utils/git_utils.dart';
-
-import '../../constants.dart';
 import '../utils/helpers.dart';
 
 /// Provides a structured way to handle Flutter SDK versions.
@@ -121,6 +120,7 @@ class FlutterVersion {
   int compareTo(FlutterVersion other) {
     final otherVersion = assignVersionWeight(other.version);
     final versionWeight = assignVersionWeight(version);
+
     return compareSemver(versionWeight, otherVersion);
   }
 

lib/src/models/project_model.dart

@@ -5,7 +5,7 @@ import 'package:path/path.dart';
 import 'package:pub_semver/pub_semver.dart';
 import 'package:pubspec/pubspec.dart';
 
-import '../../constants.dart';
+import '../utils/constants.dart';
 import '../utils/extensions.dart';
 import 'config_model.dart';
 import 'flutter_version_model.dart';

lib/src/runner.dart

@@ -3,29 +3,29 @@ import 'dart:io';
 
 import 'package:args/args.dart';
 import 'package:args/command_runner.dart';
-import '../constants.dart';
-import 'commands/global_command.dart';
-import 'commands/update_command.dart';
-import 'services/config_repository.dart';
-import 'services/logger_service.dart';
-import 'utils/context.dart';
-import 'utils/deprecation_util.dart';
 import 'package:mason_logger/mason_logger.dart';
 import 'package:pub_updater/pub_updater.dart';
 import 'package:stack_trace/stack_trace.dart';
 
-import '../exceptions.dart';
 import 'commands/config_command.dart';
 import 'commands/dart_command.dart';
 import 'commands/doctor_command.dart';
 import 'commands/exec_command.dart';
 import 'commands/flutter_command.dart';
+import 'commands/global_command.dart';
 import 'commands/install_command.dart';
 import 'commands/list_command.dart';
 import 'commands/releases_command.dart';
 import 'commands/remove_command.dart';
 import 'commands/spawn_command.dart';
+import 'commands/update_command.dart';
 import 'commands/use_command.dart';
+import 'services/config_repository.dart';
+import 'services/logger_service.dart';
+import 'utils/constants.dart';
+import 'utils/context.dart';
+import 'utils/deprecation_util.dart';
+import 'utils/exceptions.dart';
 import 'version.g.dart';
 
 /// Command Runner for FVM
@@ -41,8 +41,8 @@ class FvmCommandRunner extends CommandRunner<int> {
       ..addFlag(
         'version',
         abbr: 'v',
-        negatable: false,
         help: 'Print the current version.',
+        negatable: false,
       );
     addCommand(InstallCommand());
     addCommand(UseCommand());
@@ -142,6 +142,7 @@ class FvmCommandRunner extends CommandRunner<int> {
           "Try running with sudo or administrator priviledges.\n"
           "If you are on Windows, you can turn on developer mode: https://bit.ly/3vxRr2M",
         );
+
         return ExitCode.noPerm.code;
       }
 
@@ -179,6 +180,7 @@ class FvmCommandRunner extends CommandRunner<int> {
         ..err(err.toString());
 
       _printTrace(stackTrace);
+
       return ExitCode.unavailable.code;
     } finally {
       // Add spacer after the last line always

lib/src/services/cache_service.dart

@@ -1,14 +1,14 @@
 import 'dart:io';
 
-import '../../exceptions.dart';
-import 'base_service.dart';
-import '../utils/context.dart';
-import '../utils/extensions.dart';
 import 'package:io/io.dart';
 import 'package:path/path.dart' as path;
 
 import '../models/cache_flutter_version_model.dart';
 import '../models/flutter_version_model.dart';
+import '../utils/context.dart';
+import '../utils/exceptions.dart';
+import '../utils/extensions.dart';
+import 'base_service.dart';
 
 enum CacheIntegrity {
   valid,
@@ -34,6 +34,7 @@ class CacheService extends ContextService {
     if (version.isChannel) return true;
     // If sdkVersion is not available return true
     if (version.flutterSdkVersion == null) return true;
+
     return version.flutterSdkVersion == version.version;
   }
 
@@ -45,6 +46,7 @@ class CacheService extends ContextService {
     final versionDir = getVersionCacheDir(version.name);
     // Return null if version does not exist
     if (!versionDir.existsSync()) return null;
+
     return CacheFlutterVersion(version, directory: versionDir.path);
   }
 

lib/src/services/config_repository.dart

@@ -1,9 +1,8 @@
 import 'dart:io';
 
-import '../../constants.dart';
-import '../utils/helpers.dart';
-
 import '../../fvm.dart';
+import '../utils/constants.dart';
+import '../utils/helpers.dart';
 
 const String flutterGitUrl = 'FLUTTER_GIT_URL';