diff --git a/lib/src/config/pubspec_config.dart b/lib/src/config/pubspec_config.dart
index 89dc763..7d4a95f 100644
--- a/lib/src/config/pubspec_config.dart
+++ b/lib/src/config/pubspec_config.dart
@@ -4,8 +4,10 @@ import '../utils/file_utils.dart';
 import 'config_exception.dart';
 
 class PubspecConfig {
+  bool? _flutter = false;
   bool? _enabled;
   String? _className;
+  String? _proxyName;
   String? _mainLocale;
   String? _arbDir;
   String? _outputDir;
@@ -26,37 +28,51 @@ class PubspecConfig {
           "Failed to extract config from the 'pubspec.yaml' file.\nExpected YAML map but got ${pubspecYaml.runtimeType}.");
     }
 
-    var flutterIntlConfig = pubspecYaml['flutter_intl'];
-    if (flutterIntlConfig == null) {
-      return;
-    }
+    var intlConfig = pubspecYaml['flutter_intl'];
+    if (intlConfig == null) {
+      intlConfig = pubspecYaml['intl'];
+
+      if( intlConfig==null)
+        throw ConfigException(
+            "Failed to detect flutter or dart context: no 'flutter_intl' or 'intl' keys found into 'pubspec.yaml' file.");
+
+      _flutter = false;
+    } else
+      _flutter = true;
 
-    _enabled = flutterIntlConfig['enabled'] is bool
-        ? flutterIntlConfig['enabled']
+    _enabled = intlConfig['enabled'] is bool
+        ? intlConfig['enabled']
         : null;
-    _className = flutterIntlConfig['class_name'] is String
-        ? flutterIntlConfig['class_name']
+    _className = intlConfig['class_name'] is String
+        ? intlConfig['class_name']
         : null;
-    _mainLocale = flutterIntlConfig['main_locale'] is String
-        ? flutterIntlConfig['main_locale']
+    _proxyName = intlConfig['proxy_class_name'] is String
+        ? intlConfig['proxy_class_name']
         : null;
-    _arbDir = flutterIntlConfig['arb_dir'] is String
-        ? flutterIntlConfig['arb_dir']
+    _mainLocale = intlConfig['main_locale'] is String
+        ? intlConfig['main_locale']
         : null;
-    _outputDir = flutterIntlConfig['output_dir'] is String
-        ? flutterIntlConfig['output_dir']
+    _arbDir = intlConfig['arb_dir'] is String
+        ? intlConfig['arb_dir']
         : null;
-    _useDeferredLoading = flutterIntlConfig['use_deferred_loading'] is bool
-        ? flutterIntlConfig['use_deferred_loading']
+    _outputDir = intlConfig['output_dir'] is String
+        ? intlConfig['output_dir']
+        : null;
+    _useDeferredLoading = intlConfig['use_deferred_loading'] is bool
+        ? intlConfig['use_deferred_loading']
         : null;
     _localizelyConfig =
-        LocalizelyConfig.fromConfig(flutterIntlConfig['localizely']);
+        LocalizelyConfig.fromConfig(intlConfig['localizely']);
   }
 
+  bool? get flutter => _flutter;
+
   bool? get enabled => _enabled;
 
   String? get className => _className;
 
+  String? get proxyClassName => _proxyName;
+
   String? get mainLocale => _mainLocale;
 
   String? get arbDir => _arbDir;
diff --git a/lib/src/constants/constants.dart b/lib/src/constants/constants.dart
index 48f52b8..4276d69 100644
--- a/lib/src/constants/constants.dart
+++ b/lib/src/constants/constants.dart
@@ -1,5 +1,6 @@
 import 'package:path/path.dart';
 
+const defaultFlutter = false;
 const defaultClassName = 'S';
 const defaultMainLocale = 'en';
 final defaultArbDir = join('lib', 'l10n');
diff --git a/lib/src/generator/generator.dart b/lib/src/generator/generator.dart
index 853346c..3fa2b14 100644
--- a/lib/src/generator/generator.dart
+++ b/lib/src/generator/generator.dart
@@ -1,5 +1,7 @@
 import 'dart:convert';
 
+import 'package:intl_utils/src/generator/templates_proxy.dart';
+
 import '../config/pubspec_config.dart';
 import '../constants/constants.dart';
 import '../utils/file_utils.dart';
@@ -12,16 +14,25 @@ import 'templates.dart';
 /// The generator of localization files.
 class Generator {
   late String _className;
+  late String _proxyClassName;
   late String _mainLocale;
   late String _arbDir;
   late String _outputDir;
   late bool _useDeferredLoading;
   late bool _otaEnabled;
+  late bool _flutter;
 
   /// Creates a new generator with configuration from the 'pubspec.yaml' file.
   Generator() {
     var pubspecConfig = PubspecConfig();
 
+    _flutter = defaultFlutter;
+    if( pubspecConfig.flutter!=null )
+      _flutter = pubspecConfig.flutter!;
+    else {
+      warning("Config parameter 'flutter_int' or 'intl' required.");
+    }
+
     _className = defaultClassName;
     if (pubspecConfig.className != null) {
       if (isValidClassName(pubspecConfig.className!)) {
@@ -32,6 +43,16 @@ class Generator {
       }
     }
 
+    _proxyClassName = defaultClassName;
+    if (pubspecConfig.proxyClassName != null) {
+      if (isValidClassName(pubspecConfig.proxyClassName!)) {
+        _proxyClassName = pubspecConfig.proxyClassName!;
+      } else {
+        warning(
+            "Config parameter 'proxy_class_name' requires valid 'UpperCamelCase' value.");
+      }
+    }
+
     _mainLocale = defaultMainLocale;
     if (pubspecConfig.mainLocale != null) {
       if (isValidLocale(pubspecConfig.mainLocale!)) {
@@ -86,12 +107,18 @@ class Generator {
   Future<void> _updateGeneratedDir() async {
     var labels = _getLabelsFromMainArbFile();
     var locales = _orderLocales(getLocales(_arbDir));
-    var content =
-        generateL10nDartFileContent(_className, labels, locales, _otaEnabled);
-    var formattedContent = formatDartContent(content, 'l10n.dart');
 
+    var content = generateL10nDartFileContent(_flutter, _className, labels, locales, _otaEnabled);
+    var formattedContent = formatDartContent(content, 'l10n.dart');
     await updateL10nDartFile(formattedContent, _outputDir);
 
+    if( _proxyClassName!=null && _proxyClassName.isNotEmpty ) {
+      content = generateL10nProxyDartFileContent(_flutter, _proxyClassName, labels, locales);
+      formattedContent = formatDartContent(content, 'l10n_proxy.dart');
+      await updateL10nProxyDartFile(formattedContent, _outputDir);
+      info("$_proxyClassName generated");
+    }
+
     var intlDir = getIntlDirectory(_outputDir);
     if (intlDir == null) {
       await createIntlDirectory(_outputDir);
diff --git a/lib/src/generator/templates.dart b/lib/src/generator/templates.dart
index 3c63dae..37d70b7 100644
--- a/lib/src/generator/templates.dart
+++ b/lib/src/generator/templates.dart
@@ -2,8 +2,9 @@ import '../utils/utils.dart';
 import 'label.dart';
 
 String generateL10nDartFileContent(
-    String className, List<Label> labels, List<String> locales,
+    bool flutter, String className, List<Label> labels, List<String> locales,
     [bool otaEnabled = false]) {
+  if( flutter )
   return """
 // GENERATED CODE - DO NOT MODIFY BY HAND
 import 'package:flutter/material.dart';
@@ -84,7 +85,59 @@ ${locales.map((locale) => _generateLocale(locale)).join("\n")}
 }
 """
       .trim();
+  else
+    return """
+// GENERATED CODE - DO NOT MODIFY BY HAND
+import 'package:intl/intl.dart';${otaEnabled ? '\n${_generateLocalizelySdkImport()}' : ''}
+import 'package:intl/locale.dart';
+import 'intl/messages_all.dart';
+
+// **************************************************************************
+// Generator: Intl IDE plugin
+// Made by acorn371
+// **************************************************************************
+
+// ignore_for_file: non_constant_identifier_names, lines_longer_than_80_chars
+// ignore_for_file: join_return_with_assignment, prefer_final_in_for_each
+// ignore_for_file: avoid_redundant_argument_values, avoid_escaping_inner_quotes
+
+class $className {
+  $className();
+
+  static $className? _current;
+
+  static $className get current {
+    assert(_current != null, 'No instance of $className was loaded. Try to initialize the $className delegate before accessing $className.current.');
+    return _current!;
+  }
+
+  static Future<$className> init([Locale? locale]) {
+    if( locale==null)
+      locale = Locale.parse(Intl.getCurrentLocale());
+
+    return load(locale);
+  }
+
+  static Future<$className> load(Locale locale) {
+    final name = (locale.countryCode?.isEmpty ?? false) ? locale.languageCode : locale.toString();
+    final localeName = Intl.canonicalizedLocale(name);${otaEnabled ? '\n${_generateMetadataSetter()}' : ''} 
+    return initializeMessages(localeName).then((_) {
+      Intl.defaultLocale = localeName;
+      final instance = $className();
+      $className._current = instance;
+ 
+      return instance;
+    });
+  } 
+
+
+${otaEnabled ? '\n${_generateMetadata(labels)}\n' : ''}
+${labels.map((label) => label.generateDartGetter()).join("\n\n")}
 }
+"""
+        .trim();
+}
+
 
 String _generateLocale(String locale) {
   var parts = locale.split('_');
diff --git a/lib/src/generator/templates_proxy.dart b/lib/src/generator/templates_proxy.dart
new file mode 100644
index 0000000..bc76d3e
--- /dev/null
+++ b/lib/src/generator/templates_proxy.dart
@@ -0,0 +1,67 @@
+import 'label.dart';
+
+String generateL10nProxyDartFileContent( bool flutter, String className, List<Label> labels, List<String> locales) {
+    return """
+// GENERATED CODE - DO NOT MODIFY BY HAND
+import 'package:intl/message_lookup_by_library.dart';
+${_generateLocaleImport(locales)}
+
+// **************************************************************************
+// Generator: Intl IDE plugin
+// Made by acorn371
+// **************************************************************************
+
+// ignore_for_file: non_constant_identifier_names, lines_longer_than_80_chars
+// ignore_for_file: join_return_with_assignment, prefer_final_in_for_each
+// ignore_for_file: avoid_redundant_argument_values, avoid_escaping_inner_quotes
+
+class _DummyMessageLookup extends MessageLookupByLibrary {
+  final String localeName;
+
+  _DummyMessageLookup(this.localeName);
+  
+  dynamic operator [](String messageName) => MessageLookupByLibrary.simpleMessage("(unknown locale '\$localeName') \$messageName");
+  
+  @override
+  Map<String, dynamic> get messages => {};
+}
+
+MessageLookupByLibrary _find(String localeName) {
+  switch (localeName) {
+    ${_generateLocaleCase(locales, "\t\t")}
+    default:
+      return _DummyMessageLookup(localeName);
+  }
+}
+
+class $className {
+  ${_generateMessages(labels,"\t")}
+}
+
+""".trim();
+}
+
+
+String _generateLocaleImport(List<String> locales) {
+  final StringBuffer buffer = StringBuffer();
+  for( final locale in locales)
+    buffer.writeln("import 'intl/messages_$locale.dart' as messages_$locale;");
+
+  return buffer.toString();
+}
+
+String _generateLocaleCase(List<String> locales, String padding) {
+  final StringBuffer buffer = StringBuffer();
+  for( final locale in locales)
+    buffer..writeln("${padding}case '$locale':")..writeln("${padding}\treturn messages_$locale.messages;");
+
+  return buffer.toString();
+}
+
+String _generateMessages(List<Label> labels, String padding) {
+  final StringBuffer buffer = StringBuffer();
+  for( final label in labels)
+    buffer.writeln("${padding}static String ${label.name}(String localeName) => _find(localeName)['${label.name}']();");
+
+  return buffer.toString();
+}
\ No newline at end of file
diff --git a/lib/src/intl_translation/extract_messages.dart b/lib/src/intl_translation/extract_messages.dart
index dd60a0b..0b95fda 100644
--- a/lib/src/intl_translation/extract_messages.dart
+++ b/lib/src/intl_translation/extract_messages.dart
@@ -272,7 +272,7 @@ class MessageFindingVisitor extends GeneralizingAstVisitor {
   /// encountered before seeing the Intl.message call.
   @override
   void visitMethodDeclaration(MethodDeclaration node) {
-    name = node.name.name;
+    name = node.name.lexeme;
     parameters = node.parameters?.parameters ?? _emptyParameterList;
     documentation = node.documentationComment;
     super.visitMethodDeclaration(node);
@@ -285,7 +285,7 @@ class MessageFindingVisitor extends GeneralizingAstVisitor {
   /// encountered before seeing the Intl.message call.
   @override
   void visitFunctionDeclaration(FunctionDeclaration node) {
-    name = node.name.name;
+    name = node.name.lexeme;
     parameters =
         node.functionExpression.parameters?.parameters ?? _emptyParameterList;
     documentation = node.documentationComment;
@@ -302,7 +302,7 @@ class MessageFindingVisitor extends GeneralizingAstVisitor {
     // We don't support names in list declarations,
     // e.g. String first, second = Intl.message(...);
     if (node.fields.variables.length == 1) {
-      name = node.fields.variables.first.name.name;
+      name = node.fields.variables.first.name.lexeme;
     } else {
       name = null;
     }
@@ -321,7 +321,7 @@ class MessageFindingVisitor extends GeneralizingAstVisitor {
     // We don't support names in list declarations,
     // e.g. String first, second = Intl.message(...);
     if (node.variables.variables.length == 1) {
-      name = node.variables.variables.first.name.name;
+      name = node.variables.variables.first.name.lexeme;
     } else {
       name = null;
     }
@@ -435,7 +435,7 @@ class MessageFindingVisitor extends GeneralizingAstVisitor {
     message.sourcePosition = node.offset;
     message.endPosition = node.end;
     message.arguments = parameters
-        ?.map((x) => x.identifier?.name)
+        ?.map((x) => x.name?.lexeme)
         .where((x) => x != null)
         .cast<String>()
         .toList();
diff --git a/lib/src/intl_translation/src/intl_message.dart b/lib/src/intl_translation/src/intl_message.dart
index 3c34b59..f36c98b 100644
--- a/lib/src/intl_translation/src/intl_message.dart
+++ b/lib/src/intl_translation/src/intl_message.dart
@@ -180,7 +180,7 @@ abstract class Message {
         .toList();
     NamedExpression? args = namedExpArgs.isNotEmpty ? namedExpArgs.first : null;
 
-    var parameterNames = outerArgs.map((x) => x.identifier?.name).toList();
+    var parameterNames = outerArgs.map((x) => x.name?.lexeme).toList();
     var hasArgs = args != null;
     var hasParameters = outerArgs.isNotEmpty;
     if (!nameAndArgsGenerated && !hasArgs && hasParameters) {
@@ -291,16 +291,16 @@ abstract class Message {
   /// For a method foo in class Bar we allow either "foo" or "Bar_Foo" as the
   /// name.
   static String? classPlusMethodName(MethodInvocation node, String? outerName) {
-    ClassOrMixinDeclaration? classNode(n) {
+    ClassDeclaration? classNode(n) {
       if (n == null) return null;
-      if (n is ClassOrMixinDeclaration) return n;
+      if (n is ClassDeclaration) return n;
       return classNode(n.parent);
     }
 
     var classDeclaration = classNode(node);
     return classDeclaration == null
         ? null
-        : '${classDeclaration.name.token}_$outerName';
+        : '${classDeclaration.name}_$outerName';
   }
 
   /// Turn a value, typically read from a translation file or created out of an
diff --git a/lib/src/utils/file_utils.dart b/lib/src/utils/file_utils.dart
index 5084f8a..8496c26 100644
--- a/lib/src/utils/file_utils.dart
+++ b/lib/src/utils/file_utils.dart
@@ -86,6 +86,11 @@ Future<void> updateArbFile(
 String getL10nDartFilePath(String outputDir) =>
     path.join(getRootDirectoryPath(), outputDir, 'l10n.dart');
 
+/// Gets l10nProxy Dart file path.
+String getL10nProxyDartFilePath(String outputDir) =>
+    path.join(getRootDirectoryPath(), outputDir, 'l10n_proxy.dart');
+
+
 /// Updates l10n Dart file.
 Future<void> updateL10nDartFile(String content, String outputDir) async {
   var l10nDartFilePath = getL10nDartFilePath(outputDir);
@@ -98,6 +103,17 @@ Future<void> updateL10nDartFile(String content, String outputDir) async {
   await l10nDartFile.writeAsString(content);
 }
 
+Future<void> updateL10nProxyDartFile(String content, String outputDir) async {
+  var l10nDartFilePath = getL10nProxyDartFilePath(outputDir);
+  var l10nDartFile = File(l10nDartFilePath);
+
+  if (!l10nDartFile.existsSync()) {
+    await l10nDartFile.create(recursive: true);
+  }
+
+  await l10nDartFile.writeAsString(content);
+}
+
 /// Gets intl directory path.
 String getIntlDirectoryPath(String outputDir) =>
     path.join(getRootDirectoryPath(), outputDir, 'intl');
diff --git a/pubspec.lock b/pubspec.lock
index 35901cc..0330065 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,491 +5,569 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      url: "https://pub.dartlang.org"
+      sha256: "36a321c3d2cbe01cbcb3540a87b8843846e0206df3e691fa7b23e19e78de6d49"
+      url: "https://pub.dev"
     source: hosted
-    version: "40.0.0"
+    version: "65.0.0"
   analyzer:
     dependency: "direct main"
     description:
       name: analyzer
-      url: "https://pub.dartlang.org"
+      sha256: dfe03b90ec022450e22513b5e5ca1f01c0c01de9c3fba2f7fd233cb57a6b9a07
+      url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "6.3.0"
   archive:
     dependency: "direct main"
     description:
       name: archive
-      url: "https://pub.dartlang.org"
+      sha256: eb33140ede1b4039f4ad631f7bf3cfa58e24514e8bf87184bc32f17541af87fc
+      url: "https://pub.dev"
     source: hosted
     version: "3.3.0"
   args:
     dependency: "direct main"
     description:
       name: args
-      url: "https://pub.dartlang.org"
+      sha256: b003c3098049a51720352d219b0bb5f219b60fbfb68e7a4748139a06a5676515
+      url: "https://pub.dev"
     source: hosted
     version: "2.3.1"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.9.0"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      sha256: "5bbf32bc9e518d41ec49718e2931cd4527292c9b0c6d2dffcf7fe6b9a8a8cf72"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
   build:
     dependency: transitive
     description:
       name: build
-      url: "https://pub.dartlang.org"
+      sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.4.1"
   build_config:
     dependency: transitive
     description:
       name: build_config
-      url: "https://pub.dartlang.org"
+      sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.1"
   build_daemon:
     dependency: transitive
     description:
       name: build_daemon
-      url: "https://pub.dartlang.org"
+      sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65"
+      url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "4.0.0"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
-      url: "https://pub.dartlang.org"
+      sha256: "6c4dd11d05d056e76320b828a1db0fc01ccd376922526f8e9d6c796a5adbac20"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.9"
+    version: "2.2.1"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      url: "https://pub.dartlang.org"
+      sha256: "67d591d602906ef9201caf93452495ad1812bea2074f04e25dbd7c133785821b"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.11"
+    version: "2.4.7"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      url: "https://pub.dartlang.org"
+      sha256: f4d6244cc071ba842c296cb1c4ee1b31596b9f924300647ac7a1445493471a3f
+      url: "https://pub.dev"
     source: hosted
     version: "7.2.3"
   built_collection:
     dependency: transitive
     description:
       name: built_collection
-      url: "https://pub.dartlang.org"
+      sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100"
+      url: "https://pub.dev"
     source: hosted
     version: "5.1.1"
   built_value:
     dependency: transitive
     description:
       name: built_value
-      url: "https://pub.dartlang.org"
+      sha256: "9334e4d598ea41862dd812f64b6ce959e83afab265e59d3248802c05d7cef109"
+      url: "https://pub.dev"
     source: hosted
     version: "8.3.3"
   checked_yaml:
     dependency: transitive
     description:
       name: checked_yaml
-      url: "https://pub.dartlang.org"
+      sha256: dd007e4fb8270916820a0d66e24f619266b60773cddd082c6439341645af2659
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.1"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
   code_builder:
     dependency: transitive
     description:
       name: code_builder
-      url: "https://pub.dartlang.org"
+      sha256: b2151ce26a06171005b379ecff6e08d34c470180ffe16b8e14b6d52be292b55f
+      url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "4.8.0"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
+    version: "1.18.0"
   convert:
     dependency: transitive
     description:
       name: convert
-      url: "https://pub.dartlang.org"
+      sha256: "196284f26f69444b7f5c50692b55ec25da86d9e500451dc09333bf2e3ad69259"
+      url: "https://pub.dev"
     source: hosted
     version: "3.0.2"
   coverage:
     dependency: transitive
     description:
       name: coverage
-      url: "https://pub.dartlang.org"
+      sha256: "6decd50dd13e6031c9c6d94c135ba2e3ccf09d94d29e2f1129a2dbadc911f007"
+      url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      url: "https://pub.dartlang.org"
+      sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
+      url: "https://pub.dev"
     source: hosted
     version: "3.0.2"
   dart_style:
     dependency: "direct main"
     description:
       name: dart_style
-      url: "https://pub.dartlang.org"
+      sha256: "40ae61a5d43feea6d24bd22c0537a6629db858963b99b4bc1c3db80676f32368"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.2.3"
+    version: "2.3.4"
   file:
     dependency: transitive
     description:
       name: file
-      url: "https://pub.dartlang.org"
+      sha256: b69516f2c26a5bcac4eee2e32512e1a5205ab312b3536c1c1227b2b942b5f9ad
+      url: "https://pub.dev"
     source: hosted
     version: "6.1.2"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
-      url: "https://pub.dartlang.org"
+      sha256: "04be3e934c52e082558cc9ee21f42f5c1cd7a1262f4c63cd0357c08d5bba81ec"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.1"
   frontend_server_client:
     dependency: transitive
     description:
       name: frontend_server_client
-      url: "https://pub.dartlang.org"
+      sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "3.2.0"
   glob:
     dependency: transitive
     description:
       name: glob
-      url: "https://pub.dartlang.org"
+      sha256: c51b4fdfee4d281f49b8c957f1add91b815473597f76bcf07377987f66a55729
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
   graphs:
     dependency: transitive
     description:
       name: graphs
-      url: "https://pub.dartlang.org"
+      sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.3.1"
   http:
     dependency: "direct main"
     description:
       name: http
-      url: "https://pub.dartlang.org"
+      sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139
+      url: "https://pub.dev"
     source: hosted
-    version: "0.13.4"
+    version: "1.1.2"
   http_multi_server:
     dependency: transitive
     description:
       name: http_multi_server
-      url: "https://pub.dartlang.org"
+      sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
+      url: "https://pub.dev"
     source: hosted
     version: "3.2.1"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      url: "https://pub.dartlang.org"
+      sha256: db3060f22889f3d9d55f6a217565486737037eec3609f7f3eca4d0c67ee0d8a0
+      url: "https://pub.dev"
     source: hosted
     version: "4.0.1"
   intl:
     dependency: "direct main"
     description:
       name: intl
-      url: "https://pub.dartlang.org"
+      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.17.0"
+    version: "0.18.1"
   io:
     dependency: transitive
     description:
       name: io
-      url: "https://pub.dartlang.org"
+      sha256: "0d4c73c3653ab85bf696d51a9657604c900a370549196a91f33e4c39af760852"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.3"
   js:
     dependency: transitive
     description:
       name: js
-      url: "https://pub.dartlang.org"
+      sha256: a5e201311cb08bf3912ebbe9a2be096e182d703f881136ec1e81a2338a9e120d
+      url: "https://pub.dev"
     source: hosted
     version: "0.6.4"
   json_annotation:
     dependency: transitive
     description:
       name: json_annotation
-      url: "https://pub.dartlang.org"
+      sha256: "53cddd9d4a2d253d977dbbd21642f20f580a6a65fcc05d9d69b9f0ecc264cad9"
+      url: "https://pub.dev"
     source: hosted
     version: "4.5.0"
   lints:
     dependency: "direct dev"
     description:
       name: lints
-      url: "https://pub.dartlang.org"
+      sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.1"
   logging:
     dependency: transitive
     description:
       name: logging
-      url: "https://pub.dartlang.org"
+      sha256: "293ae2d49fd79d4c04944c3a26dfd313382d5f52e821ec57119230ae16031ad4"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.12.12"
+    version: "0.12.16"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.11.0"
   mime:
     dependency: transitive
     description:
       name: mime
-      url: "https://pub.dartlang.org"
+      sha256: dab22e92b41aa1255ea90ddc4bc2feaf35544fd0728e209638cad041a6e3928a
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
   mockito:
     dependency: "direct dev"
     description:
       name: mockito
-      url: "https://pub.dartlang.org"
+      sha256: "4b693867cee1853c9d1d7ecc1871f27f39b2ef2c13c0d8d8507dfe5bebd8aaf1"
+      url: "https://pub.dev"
     source: hosted
-    version: "5.2.0"
+    version: "5.4.3"
   node_preamble:
     dependency: transitive
     description:
       name: node_preamble
-      url: "https://pub.dartlang.org"
+      sha256: "8ebdbaa3b96d5285d068f80772390d27c21e1fa10fb2df6627b1b9415043608d"
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.1"
   package_config:
     dependency: transitive
     description:
       name: package_config
-      url: "https://pub.dartlang.org"
+      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
   path:
     dependency: "direct main"
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      url: "https://pub.dev"
     source: hosted
     version: "1.8.2"
   petitparser:
     dependency: "direct main"
     description:
       name: petitparser
-      url: "https://pub.dartlang.org"
+      sha256: "2ebb289dc4764ec397f5cd3ca9881c6d17196130a7d646ed022a0dd9c2e25a71"
+      url: "https://pub.dev"
     source: hosted
     version: "5.0.0"
   pool:
     dependency: transitive
     description:
       name: pool
-      url: "https://pub.dartlang.org"
+      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
+      url: "https://pub.dev"
     source: hosted
     version: "1.5.1"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      url: "https://pub.dartlang.org"
+      sha256: "816c1a640e952d213ddd223b3e7aafae08cd9f8e1f6864eed304cc13b0272b07"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      url: "https://pub.dartlang.org"
+      sha256: "3686efe4a4613a4449b1a4ae08670aadbd3376f2e78d93e3f8f0919db02a7256"
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
   shelf:
     dependency: transitive
     description:
       name: shelf
-      url: "https://pub.dartlang.org"
+      sha256: f27c6406c89ab3921ed4a3bbdc38d48676f8b78fe537cbdbeb0d2c0f661026d7
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
   shelf_packages_handler:
     dependency: transitive
     description:
       name: shelf_packages_handler
-      url: "https://pub.dartlang.org"
+      sha256: aef74dc9195746a384843102142ab65b6a4735bb3beea791e63527b88cc83306
+      url: "https://pub.dev"
     source: hosted
     version: "3.0.1"
   shelf_static:
     dependency: transitive
     description:
       name: shelf_static
-      url: "https://pub.dartlang.org"
+      sha256: e792b76b96a36d4a41b819da593aff4bdd413576b3ba6150df5d8d9996d2e74c
+      url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
-      url: "https://pub.dartlang.org"
+      sha256: "6db16374bc3497d21aa0eebe674d3db9fdf82082aac0f04dc7b44e4af5b08afc"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
   source_gen:
     dependency: transitive
     description:
       name: source_gen
-      url: "https://pub.dartlang.org"
+      sha256: fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.2"
+    version: "1.4.0"
   source_map_stack_trace:
     dependency: transitive
     description:
       name: source_map_stack_trace
-      url: "https://pub.dartlang.org"
+      sha256: "8c463326277f68a628abab20580047b419c2ff66756fd0affd451f73f9508c11"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
   source_maps:
     dependency: transitive
     description:
       name: source_maps
-      url: "https://pub.dartlang.org"
+      sha256: "52de2200bb098de739794c82d09c41ac27b2e42fd7e23cce7b9c74bf653c7296"
+      url: "https://pub.dev"
     source: hosted
     version: "0.10.10"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      sha256: e3320978e3715725e62f04358fd249c1efe5999297b2c6acd626a817593281b0
+      url: "https://pub.dev"
     source: hosted
     version: "1.9.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      sha256: f8d9f247e2f9f90e32d1495ff32dac7e4ae34ffa7194c5ff8fcc0fd0e52df774
+      url: "https://pub.dev"
     source: hosted
     version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      sha256: db47e4797198ee601990820437179bb90219f918962318d494ada2b4b11e6f6d
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
   stream_transform:
     dependency: transitive
     description:
       name: stream_transform
-      url: "https://pub.dartlang.org"
+      sha256: ed464977cb26a1f41537e177e190c67223dbd9f4f683489b6ab2e5d211ec564e
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      sha256: "862015c5db1f3f3c4ea3b94dc2490363a84262994b88902315ed74be1155612f"
+      url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
   test:
     dependency: "direct dev"
     description:
       name: test
-      url: "https://pub.dartlang.org"
+      sha256: a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f
+      url: "https://pub.dev"
     source: hosted
-    version: "1.21.3"
+    version: "1.24.9"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.4.11"
+    version: "0.6.1"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      url: "https://pub.dartlang.org"
+      sha256: a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a
+      url: "https://pub.dev"
     source: hosted
-    version: "0.4.15"
+    version: "0.5.9"
   timing:
     dependency: transitive
     description:
       name: timing
-      url: "https://pub.dartlang.org"
+      sha256: c386d07d7f5efc613479a7c4d9d64b03710b03cfaa7e8ad5f2bfb295a1f0dfad
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.dartlang.org"
+      sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5"
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
   vm_service:
     dependency: transitive
     description:
       name: vm_service
-      url: "https://pub.dartlang.org"
+      sha256: c638564e9762c620ac8a14db3e51963ddea2f8c450c60c04e87212f29be27e02
+      url: "https://pub.dev"
     source: hosted
     version: "9.0.0"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      url: "https://pub.dartlang.org"
+      sha256: e42dfcc48f67618344da967b10f62de57e04bae01d9d3af4c2596f3712a88c99
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.1"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: edc8a9573dd8c5a83a183dae1af2b6fd4131377404706ca4e5420474784906fa
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.0"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      url: "https://pub.dartlang.org"
+      sha256: "3a969ddcc204a3e34e863d204b29c0752716f78b6f9cc8235083208d268a4ccd"
+      url: "https://pub.dev"
     source: hosted
     version: "2.2.0"
   webkit_inspection_protocol:
     dependency: transitive
     description:
       name: webkit_inspection_protocol
-      url: "https://pub.dartlang.org"
+      sha256: f66577ed748712574b076e48a300aa3d8bc7aba93e83490c679707187e135ee4
+      url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
   yaml:
     dependency: "direct main"
     description:
       name: yaml
-      url: "https://pub.dartlang.org"
+      sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370"
+      url: "https://pub.dev"
     source: hosted
     version: "3.1.1"
 sdks:
-  dart: ">=2.16.0 <3.0.0"
+  dart: ">=3.2.0 <4.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index a496102..3e55227 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,18 +1,19 @@
 name: intl_utils
 description: intl_utils is a dart library that generates Dart localization code from ARB file. Generated code relies on Intl library.
-version: 2.7.0
+version: 2.8.1
 homepage: https://github.com/localizely/intl_utils
 
 environment:
-  sdk: ">=2.14.0 <3.0.0"
+  sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
-  analyzer: ">=3.0.0 <5.0.0"
+  analyzer: ^6.2.0
   archive: ^3.0.0
   args: ^2.0.0
   dart_style: ^2.0.0
-  http: ^0.13.0
-  intl: ^0.17.0
+#  http: ^0.13.0
+  http: ^1.1.2
+  intl: ^0.18.1
   path: ^1.8.0
   petitparser: ">=4.0.0 <6.0.0"
   yaml: ^3.0.0