Merge pull request #658 from leoafarias/fix/650

Update dependencies and fix deprecation warnings
leoafarias · Feb 26, 2024 · bc02bba · bc02bba
2 parents 36e40b6 + 62e59d5
commit bc02bba
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/lib/src/models/config_model.dart b/lib/src/models/config_model.dart
@@ -1,9 +1,9 @@
 // Use just for reference, should not change
 
-import 'dart:convert';
 import 'dart:io';
 
 import 'package:args/args.dart';
+import 'package:jsonc/jsonc.dart';
 
 import '../utils/change_case.dart';
 import '../utils/constants.dart';
@@ -204,7 +204,7 @@ class AppConfig extends Config {
   }
 
   factory AppConfig.fromJson(String source) {
-    return AppConfig.fromMap(json.decode(source) as Map<String, dynamic>);
+    return AppConfig.fromMap(jsonc.decode(source) as Map<String, dynamic>);
   }
 
   static AppConfig? loadFromPath(String path) {
@@ -321,7 +321,7 @@ class ProjectConfig extends Config {
 
   /// Returns ConfigDto from a json string
   factory ProjectConfig.fromJson(String source) =>
-      ProjectConfig.fromMap(json.decode(source) as Map<String, dynamic>);
+      ProjectConfig.fromMap(jsonc.decode(source) as Map<String, dynamic>);
 
   static ProjectConfig? loadFromPath(String path) {
     final configFile = File(path);

diff --git a/lib/src/utils/deprecation_util.dart b/lib/src/utils/deprecation_util.dart
@@ -13,31 +13,32 @@ import 'context.dart';
 void deprecationWorkflow() {
   _warnDeprecatedEnvVars();
   final fvmDir = ctx.fvmDir;
-  final settingsFile = File(join(fvmDir, '.settings'));
+  final legacySettingsFile = File(join(fvmDir, '.settings'));
 
-  if (!settingsFile.existsSync()) {
+  if (!legacySettingsFile.existsSync()) {
     return;
   }
 
-  final payload = settingsFile.readAsStringSync();
+  final payload = legacySettingsFile.readAsStringSync();
   try {
     final settings = jsonDecode(payload);
     final settingsCachePath = settings['cachePath'] as String?;
     if (settingsCachePath != null && settingsCachePath != fvmDir) {
       var appConfig = ConfigRepository.loadFile();
       appConfig = appConfig.copyWith(cachePath: fvmDir);
       ConfigRepository.save(appConfig);
-      settingsFile.deleteSync(recursive: true);
+      legacySettingsFile.deleteSync(recursive: true);
       logger.success(
-        'We have moved the settings file ${settingsFile.path}'
+        'We have moved the settings file ${legacySettingsFile.path}'
         'Your settings have been migrated to $kAppConfigFile'
         'Your cachePath is now $settingsCachePath. FVM will exit now. Please run the command again.',
       );
       // Exit to prevent execution with wrong cache path
       exit(ExitCode.success.code);
     }
   } catch (_) {
-    logger.warn('Could not parse legact settings file');
+    logger.warn('Could not parse legacy settings file');
+    legacySettingsFile.deleteSync(recursive: true);
   }
 }
 

diff --git a/tool/homebrew.dart b/tool/homebrew.dart
@@ -1,10 +1,10 @@
-import 'dart:convert';
 import 'dart:io';
 
 import 'package:crypto/crypto.dart';
 import 'package:fvm/src/utils/http.dart';
 import 'package:grinder/grinder.dart';
 import 'package:http/http.dart' as http;
+import 'package:jsonc/jsonc.dart';
 import 'package:path/path.dart' as path;
 
 import 'grind.dart';
@@ -33,7 +33,7 @@ Future<void> _homebrewFormula() async {
 
   final response = await fetch(url.toString(), headers: headers);
 
-  final Map<String, dynamic> release = json.decode(response);
+  final Map<String, dynamic> release = jsonc.decode(response);
   final List assets = release['assets'];
   final Map<String, dynamic> assetData = {};