From 66a6945bb5e5f5d073a51bbc76caa1da02c965be Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 14 Nov 2024 12:09:46 +0100 Subject: [PATCH 1/5] Update web dependency constraint to `">=0.5.1 <2.0.0"` --- pkgs/intl/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/intl/pubspec.yaml b/pkgs/intl/pubspec.yaml index 46d3cf0c..24cd8046 100644 --- a/pkgs/intl/pubspec.yaml +++ b/pkgs/intl/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: http: ^1.0.0 meta: ^1.0.2 path: ^1.8.0 - web: ^0.5.0 + web: ">=0.5.1 <2.0.0" dev_dependencies: benchmark_harness: ^2.2.0 From 88f71cc5bb11d61333d15c723438533ab4cb4d4e Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 14 Nov 2024 12:12:02 +0100 Subject: [PATCH 2/5] Add changelog --- pkgs/intl/CHANGELOG.md | 4 ++++ pkgs/intl/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/intl/CHANGELOG.md b/pkgs/intl/CHANGELOG.md index 91f2153e..e56553d7 100644 --- a/pkgs/intl/CHANGELOG.md +++ b/pkgs/intl/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.20.1-wip + * Upgrade `package:web` dependency constraint to `">=0.5.1 <2.0.0"`, fixes + issue [#916](https://github.com/dart-lang/i18n/issues/916). + ## 0.20.0 * Fix caching of messages in `CompositeMessageLookup`. * Type `numberFormatSymbols` as a `Map`. diff --git a/pkgs/intl/pubspec.yaml b/pkgs/intl/pubspec.yaml index 24cd8046..0daaca8c 100644 --- a/pkgs/intl/pubspec.yaml +++ b/pkgs/intl/pubspec.yaml @@ -1,5 +1,5 @@ name: intl -version: 0.20.0 +version: 0.20.1-wip description: >- Contains code to deal with internationalized/localized messages, date and number formatting and parsing, bi-directional text, and other From b0a766e66251bc2cc144b169cbb3fca95585650d Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 14 Nov 2024 12:23:46 +0100 Subject: [PATCH 3/5] Upgrade to 1.1.0 instead --- pkgs/intl/CHANGELOG.md | 4 ++-- pkgs/intl/pubspec.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/intl/CHANGELOG.md b/pkgs/intl/CHANGELOG.md index e56553d7..a0c1234b 100644 --- a/pkgs/intl/CHANGELOG.md +++ b/pkgs/intl/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.20.1-wip - * Upgrade `package:web` dependency constraint to `">=0.5.1 <2.0.0"`, fixes - issue [#916](https://github.com/dart-lang/i18n/issues/916). + * Upgrade `package:web` dependency constraint to `1.1.0`, fixes issue + [#916](https://github.com/dart-lang/i18n/issues/916). ## 0.20.0 * Fix caching of messages in `CompositeMessageLookup`. diff --git a/pkgs/intl/pubspec.yaml b/pkgs/intl/pubspec.yaml index 0daaca8c..900bb64f 100644 --- a/pkgs/intl/pubspec.yaml +++ b/pkgs/intl/pubspec.yaml @@ -18,11 +18,11 @@ dependencies: http: ^1.0.0 meta: ^1.0.2 path: ^1.8.0 - web: ">=0.5.1 <2.0.0" + web: ^1.1.0 dev_dependencies: benchmark_harness: ^2.2.0 - ffi: ^1.0.0 + ffi: ^2.1.3 fixnum: ^1.0.0 - lints: ^4.0.0 + lints: ^5.1.0 test: ^1.16.0 From 4d9bd48171752deec840d7b120cad616c60b7c59 Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 14 Nov 2024 12:34:10 +0100 Subject: [PATCH 4/5] use lints v5.0 --- pkgs/intl/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/intl/pubspec.yaml b/pkgs/intl/pubspec.yaml index 900bb64f..98d011c0 100644 --- a/pkgs/intl/pubspec.yaml +++ b/pkgs/intl/pubspec.yaml @@ -24,5 +24,5 @@ dev_dependencies: benchmark_harness: ^2.2.0 ffi: ^2.1.3 fixnum: ^1.0.0 - lints: ^5.1.0 + lints: ^5.0.0 test: ^1.16.0 From 4b966665dce27a01b41704c2aa293dc685153470 Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 14 Nov 2024 15:42:18 +0100 Subject: [PATCH 5/5] Fix issues --- pkgs/intl/lib/intl.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/intl/lib/intl.dart b/pkgs/intl/lib/intl.dart index 7b823d73..add3dadf 100644 --- a/pkgs/intl/lib/intl.dart +++ b/pkgs/intl/lib/intl.dart @@ -119,7 +119,7 @@ class Intl { /// and pass the appropriate arguments to it. If provided, [name] must be /// globally unique in the program. It must match the enclosing function name, /// or if the function is a method of a class, [name] can also be of the form - /// _, to make it easier to distinguish messages with + /// `_`, to make it easier to distinguish messages with /// the same name but in different classes. /// /// The [desc] provides a description of the message usage.