diff --git a/.fvmrc b/.fvmrc index 679f8e11..34136bbd 100644 --- a/.fvmrc +++ b/.fvmrc @@ -1,4 +1,4 @@ { - "flutter": "3.24.5", + "flutter": "3.27.0", "flavors": {} } \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf61c61f..57494ea6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ on: env: FLUTTER_VERSION_OLDEST: "3.19.6" - FLUTTER_VERSION_NEWEST: "3.24.5" + FLUTTER_VERSION_NEWEST: "3.27.0" jobs: format: diff --git a/.github/workflows/publish_template.yml b/.github/workflows/publish_template.yml index 5741679d..b19c66f0 100644 --- a/.github/workflows/publish_template.yml +++ b/.github/workflows/publish_template.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v3 - uses: subosito/flutter-action@v2 with: - flutter-version: '3.24.5' + flutter-version: '3.27.0' channel: 'stable' - name: Dependencies (core) run: flutter pub get diff --git a/slang/lib/src/api/translation_overrides.dart b/slang/lib/src/api/translation_overrides.dart index 81eb86c4..f02c963d 100644 --- a/slang/lib/src/api/translation_overrides.dart +++ b/slang/lib/src/api/translation_overrides.dart @@ -157,7 +157,7 @@ extension TranslationOverridesStringExt on String { }); } - /// Replaces every ${_root.} with the real string + /// Replaces every `${_root.}` with the real string String applyLinks(TranslationMetadata meta, Map param) { return replaceDartNormalizedInterpolation(replacer: (match) { final nodeParam = match.substring(2, match.length - 1); diff --git a/slang/lib/src/builder/builder/translation_model_builder.dart b/slang/lib/src/builder/builder/translation_model_builder.dart index cb06c0fc..3b64fac0 100644 --- a/slang/lib/src/builder/builder/translation_model_builder.dart +++ b/slang/lib/src/builder/builder/translation_model_builder.dart @@ -32,8 +32,8 @@ class TranslationModelBuilder { /// Builds the i18n model for ONE locale /// - /// The [map] must be of type Map and all children may of type - /// String, num, List or Map. + /// The [map] must be of type `Map` and all children may of type + /// `String`, `num`, `List` or `Map`. /// /// If [baseData] is set and [BuildModelConfig.fallbackStrategy] is [FallbackStrategy.baseLocale], /// then the base translations will be added to contexts where the translation is missing. @@ -889,8 +889,8 @@ Set _parseAttributes(ObjectNode node) { /// Applies the generic type defined in the interface for all empty lists. /// -/// By default, empty lists are considered to be List -/// But when interfaces are used, it can differ: e.g. List +/// By default, empty lists are considered to be `List` +/// But when interfaces are used, it can differ: e.g. `List` void _fixEmptyLists({ required ObjectNode node, required Interface interface, diff --git a/slang/lib/src/builder/decoder/base_decoder.dart b/slang/lib/src/builder/decoder/base_decoder.dart index c7c52cef..444579b4 100644 --- a/slang/lib/src/builder/decoder/base_decoder.dart +++ b/slang/lib/src/builder/decoder/base_decoder.dart @@ -6,9 +6,9 @@ import 'package:slang/src/builder/model/enums.dart'; abstract class BaseDecoder { /// Transforms the raw string (json, yaml, csv) - /// to a standardized map structure of Map + /// to a standardized map structure of `Map` /// - /// Children are Map, List or String + /// Children are `Map`, `List` or `String` /// /// No case transformations, etc! Only the raw data represented as a tree. Map decode(String raw); diff --git a/slang/lib/src/builder/model/node.dart b/slang/lib/src/builder/model/node.dart index 38903afc..d3e0b01d 100644 --- a/slang/lib/src/builder/model/node.dart +++ b/slang/lib/src/builder/model/node.dart @@ -88,7 +88,7 @@ abstract interface class LeafNode {} /// The super class for [ListNode] and [ObjectNode] abstract class IterableNode extends Node { - /// The generic type of the container, i.e. Map or List + /// The generic type of the container, i.e. `Map` or `List` String _genericType; String get genericType => _genericType; diff --git a/slang/lib/src/builder/utils/map_utils.dart b/slang/lib/src/builder/utils/map_utils.dart index d90a48ec..f10954d7 100644 --- a/slang/lib/src/builder/utils/map_utils.dart +++ b/slang/lib/src/builder/utils/map_utils.dart @@ -2,7 +2,7 @@ import 'package:collection/collection.dart'; import 'package:slang/src/builder/utils/node_utils.dart'; class MapUtils { - /// converts Map to Map for all children + /// converts `Map` to `Map` for all children /// forcing all keys to be strings static Map deepCast(Map source) { return source.map((key, value) { diff --git a/slang/lib/src/builder/utils/regex_utils.dart b/slang/lib/src/builder/utils/regex_utils.dart index 335239f6..691ef096 100644 --- a/slang/lib/src/builder/utils/regex_utils.dart +++ b/slang/lib/src/builder/utils/regex_utils.dart @@ -50,7 +50,7 @@ class RegexUtils { RegExp(r'^((\w|\<|\>|,)+)(\?)? (\w+)(\(.+\))?$'); /// Matches the generic of the list - /// List + /// `List` /// 1 - MyGeneric static final RegExp genericRegex = RegExp(r'^List<((?:\w| |<|>)+)>$'); diff --git a/slang/pubspec.yaml b/slang/pubspec.yaml index 926f15a3..753b4749 100644 --- a/slang/pubspec.yaml +++ b/slang/pubspec.yaml @@ -1,6 +1,6 @@ name: slang description: Localization / Internationalization (i18n) solution. Use JSON, YAML, CSV, or ARB files to create typesafe translations via source generation. -version: 4.3.0 +version: 4.4.0 repository: https://github.com/slang-i18n/slang topics: - i18n diff --git a/slang_build_runner/CHANGELOG.md b/slang_build_runner/CHANGELOG.md index 869ece02..cf5f1b25 100644 --- a/slang_build_runner/CHANGELOG.md +++ b/slang_build_runner/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.4.0 + +- bump `slang` to `4.4.0` + ## 4.3.0 - bump `slang` to `4.3.0` diff --git a/slang_build_runner/pubspec.yaml b/slang_build_runner/pubspec.yaml index e61720ac..4fee804e 100644 --- a/slang_build_runner/pubspec.yaml +++ b/slang_build_runner/pubspec.yaml @@ -1,6 +1,6 @@ name: slang_build_runner description: build_runner integration for slang. This library ensures that slang is recognized by build_runner. -version: 4.3.0 +version: 4.4.0 repository: https://github.com/slang-i18n/slang environment: @@ -12,7 +12,7 @@ dependencies: glob: ^2.0.2 # Use a tight version to ensure that all features are available - slang: '>=4.3.0 <4.4.0' + slang: '>=4.4.0 <4.5.0' dev_dependencies: lints: any diff --git a/slang_flutter/CHANGELOG.md b/slang_flutter/CHANGELOG.md index bebf01a9..adf8ba85 100644 --- a/slang_flutter/CHANGELOG.md +++ b/slang_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.4.0 + +- bump `slang` to `4.4.0` + ## 4.3.0 - bump `slang` to `4.3.0` diff --git a/slang_flutter/pubspec.yaml b/slang_flutter/pubspec.yaml index 7eaa471e..cc1e5be9 100644 --- a/slang_flutter/pubspec.yaml +++ b/slang_flutter/pubspec.yaml @@ -1,6 +1,6 @@ name: slang_flutter description: Flutter support for slang. This library provides helpful Flutter API. -version: 4.3.0 +version: 4.4.0 repository: https://github.com/slang-i18n/slang environment: @@ -14,7 +14,7 @@ dependencies: sdk: flutter # Use a tight version to ensure that all features are available - slang: '>=4.3.0 <4.4.0' + slang: '>=4.4.0 <4.5.0' dev_dependencies: flutter_test: