Merge branch 'main' into adaptMessagesExample

dart-lang · Jul 29, 2024 · 9a4d6ca · 9a4d6ca
2 parents e1cfe57 + 8d63e87
commit 9a4d6ca
Show file tree

Hide file tree

Showing 221 changed files with 14,893 additions and 440 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+pkgs/intl4x/lib/src/bindings linguist-generated=true
diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml
@@ -17,7 +17,7 @@ jobs:
     run_all:
       runs-on: ubuntu-latest
       steps:
-        - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3
+        - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
           with:
             sdk: stable
 

diff --git a/.github/workflows/intl.yml b/.github/workflows/intl.yml
@@ -29,7 +29,7 @@ jobs:
             run-tests: true
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-      - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3
+      - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
         with:
           sdk: ${{matrix.sdk}}
 

diff --git a/.github/workflows/intl4x.yml b/.github/workflows/intl4x.yml
@@ -37,7 +37,7 @@ jobs:
         with:
           submodules: true
 
-      - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3
+      - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
         with:
           sdk: ${{matrix.sdk}}
 

diff --git a/.github/workflows/intl4x_artifacts.yml b/.github/workflows/intl4x_artifacts.yml
@@ -6,12 +6,14 @@ permissions:
 on:
   push:
     tags:
-      - 'intl4x-v.*'
+      - 'intl4x-icu*'
+  schedule:
+    - cron: '0 0 * * 0' # weekly
   workflow_dispatch:
 
 jobs:
   dart-libs:
-    name: "Build Dart binaries"
+    name: Build Dart binaries
     strategy:
       fail-fast: false
       matrix:
@@ -21,7 +23,7 @@ jobs:
     steps:
     - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
       with:
-        submodules: 'true'
+        submodules: true
 
     - name: Install Rust toolchains
       run: |
@@ -30,7 +32,7 @@ jobs:
     - name: Show the selected Rust toolchain
       run: rustup show
 
-    - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d
+    - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
       with:
         sdk: dev
 
@@ -59,14 +61,14 @@ jobs:
         cd ffi/dart
         dart pub get
         cd ../..
-        dart run ffi/dart/tool/build_libs.dart bin/android_arm android_arm
-        dart run ffi/dart/tool/build_libs.dart bin/android_arm64 android_arm64
-        dart run ffi/dart/tool/build_libs.dart bin/android_ia32 android_ia32
-        dart run ffi/dart/tool/build_libs.dart bin/android_x64 android_x64
-        dart run ffi/dart/tool/build_libs.dart bin/linux_arm linux_arm
-        dart run ffi/dart/tool/build_libs.dart bin/linux_arm64 linux_arm64
-        dart run ffi/dart/tool/build_libs.dart bin/linux_riscv64 linux_riscv64
-        dart run ffi/dart/tool/build_libs.dart bin/linux_x64 linux_x64
+        dart run ffi/dart/tool/build_libs.dart bin/android_arm android_arm dynamic default_components,experimental_components
+        dart run ffi/dart/tool/build_libs.dart bin/android_arm64 android_arm64 dynamic default_components,experimental_components
+        dart run ffi/dart/tool/build_libs.dart bin/android_ia32 android_ia32 dynamic default_components,experimental_components
+        dart run ffi/dart/tool/build_libs.dart bin/android_x64 android_x64 dynamic default_components,experimental_components
+        dart run ffi/dart/tool/build_libs.dart bin/linux_arm linux_arm dynamic default_components,experimental_components
+        dart run ffi/dart/tool/build_libs.dart bin/linux_arm64 linux_arm64 dynamic default_components,experimental_components
+        dart run ffi/dart/tool/build_libs.dart bin/linux_riscv64 linux_riscv64 dynamic default_components,experimental_components
+        dart run ffi/dart/tool/build_libs.dart bin/linux_x64 linux_x64 dynamic default_components,experimental_components
 
         cargo run -p icu_datagen -- --locales full --keys all --format blob --out bin/full.postcard
 
@@ -93,11 +95,11 @@ jobs:
         cd ffi/dart
         dart pub get
         cd ../..
-        dart run ffi/dart/tool/build_libs.dart bin/ios_arm ios_arm
-        dart run ffi/dart/tool/build_libs.dart bin/ios_arm64 ios_arm64
-        dart run ffi/dart/tool/build_libs.dart bin/ios_x64 ios_x64
-        dart run ffi/dart/tool/build_libs.dart bin/macos_arm64 macos_arm64
-        dart run ffi/dart/tool/build_libs.dart bin/macos_x64 macos_x64
+        dart run ffi/dart/tool/build_libs.dart bin/ios_arm ios_arm dynamic default_components,experimental_components
+        dart run ffi/dart/tool/build_libs.dart bin/ios_arm64 ios_arm64 dynamic default_components,experimental_components
+        dart run ffi/dart/tool/build_libs.dart bin/ios_x64 ios_x64 dynamic default_components,experimental_components
+        dart run ffi/dart/tool/build_libs.dart bin/macos_arm64 macos_arm64 dynamic default_components,experimental_components
+        dart run ffi/dart/tool/build_libs.dart bin/macos_x64 macos_x64 dynamic default_components,experimental_components
 
         cd provider/datagen # avoid global feature resolution
         rustup target add aarch64-apple-darwin
@@ -119,9 +121,9 @@ jobs:
         cd ffi/dart
         dart pub get
         cd ../..
-        dart run ffi/dart/tool/build_libs.dart bin/windows_arm64 windows_arm64
-        dart run ffi/dart/tool/build_libs.dart bin/windows_ia32 windows_ia32
-        dart run ffi/dart/tool/build_libs.dart bin/windows_x64 windows_x64
+        dart run ffi/dart/tool/build_libs.dart bin/windows_arm64 windows_arm64 dynamic default_components,experimental_components
+        dart run ffi/dart/tool/build_libs.dart bin/windows_ia32 windows_ia32 dynamic default_components,experimental_components
+        dart run ffi/dart/tool/build_libs.dart bin/windows_x64 windows_x64 dynamic default_components,experimental_components
 
         cd provider/datagen # avoid global feature resolution
         rustup target add aarch64-pc-windows-msvc
@@ -151,8 +153,8 @@ jobs:
         run: ls -R
 
       - name: Release
-        uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564
+        uses: softprops/action-gh-release@a74c6b72af54cfa997e81df42d94703d6313a2d0
         with:
           files: '**'
           fail_on_unmatched_files: true
-          body: "Build artifacts for `package:intl4x`, based on ICU4X at ref ${{ env.icu_version }}"
+          body: "Build artifacts for `package:intl4x`, based on ICU4X at ref ${{ github.ref_name }}"
diff --git a/.github/workflows/intl_translation.yml b/.github/workflows/intl_translation.yml
@@ -29,7 +29,7 @@ jobs:
             run-tests: true
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-      - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3
+      - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
         with:
           sdk: ${{matrix.sdk}}
 

diff --git a/.github/workflows/messages.yml b/.github/workflows/messages.yml
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-      - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3
+      - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
         with:
           sdk: ${{matrix.sdk}}
 

diff --git a/.github/workflows/messages_builder.yml b/.github/workflows/messages_builder.yml
@@ -29,7 +29,7 @@ jobs:
             run-tests: true
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-      - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3
+      - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
         with:
           sdk: ${{matrix.sdk}}
 

diff --git a/.github/workflows/messages_serializer.yml b/.github/workflows/messages_serializer.yml
@@ -29,7 +29,7 @@ jobs:
             run-tests: true
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-      - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3
+      - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
         with:
           sdk: ${{matrix.sdk}}
 

diff --git a/.github/workflows/messages_shrinker.yml b/.github/workflows/messages_shrinker.yml
@@ -29,7 +29,7 @@ jobs:
             run-tests: true
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-      - uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3
+      - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
         with:
           sdk: ${{matrix.sdk}}
 

diff --git a/pkgs/intl/CHANGELOG.md b/pkgs/intl/CHANGELOG.md
@@ -1,13 +1,14 @@
 ## 0.20.0-wip
- * Fix caching of messages in CompositeMessageLookup
+ * Fix caching of messages in `CompositeMessageLookup`.
  * Type `numberFormatSymbols` as a `Map<String, NumberSymbols>`.
  * Type `dateTimeSymbolMap` as a `Map<String, DateSymbols>`.
  * Add example for pub.dev.
  * Fix issues with AM/PM markers.
  * Update to CLDR v44.1.
  * Require Dart `^3.3`
  * Require `package:web` `^0.5.0`.
- * Support compiling to WASM
+ * Support compiling to WASM.
+ * Update to and account for `package:lints` `^4.0.0`.
 
 ## 0.19.0
  * Update to CLDR v44.

diff --git a/pkgs/intl/analysis_options.yaml b/pkgs/intl/analysis_options.yaml
@@ -13,6 +13,7 @@ linter:
     - directives_ordering
     - prefer_single_quotes
     - sort_pub_dependencies
+    - unnecessary_library_directive
     - unnecessary_parenthesis
 
     # These are works in progress.

diff --git a/pkgs/intl/example/pubspec.yaml b/pkgs/intl/example/pubspec.yaml
@@ -9,4 +9,4 @@ dependencies:
     path: ../
 
 dev_dependencies:
-  lints: ^3.0.0
+  lints: ^4.0.0
diff --git a/pkgs/intl/lib/date_symbol_data_custom.dart b/pkgs/intl/lib/date_symbol_data_custom.dart
@@ -5,6 +5,8 @@
 /// API to allow setting Date/Time formatting in a custom way.
 ///
 /// It does not actually provide any data - that's left to the user of the API.
+library;
+
 import 'date_symbols.dart';
 import 'src/date_format_internal.dart';
 

diff --git a/pkgs/intl/lib/date_symbol_data_file.dart b/pkgs/intl/lib/date_symbol_data_file.dart
@@ -4,8 +4,7 @@
 
 /// This file should be imported, along with date_format.dart in order to read
 /// locale data from files in the file system.
-
-library date_symbol_data_file;
+library;
 
 import 'package:path/path.dart' as path;
 

diff --git a/pkgs/intl/lib/date_symbol_data_http_request.dart b/pkgs/intl/lib/date_symbol_data_http_request.dart
@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 /// This file should be imported, along with date_format.dart in order to read
-/// locale data via http requests to a web server..
-library date_symbol_data_http_request;
+/// locale data via http requests to a web server.
+library;
 
 import 'date_symbols.dart';
 import 'intl.dart';

diff --git a/pkgs/intl/lib/date_symbol_data_local.dart b/pkgs/intl/lib/date_symbol_data_local.dart
@@ -5,20 +5,19 @@
 // BSD-style license that can be found in the LICENSE file.
 
 /// Date/time formatting symbols for all locales.
-///
-/// DO NOT EDIT. This file is autogenerated by script.  See
-/// 'http://go/generate_datetime_constants.py' using the --for_dart
-/// flag.
-/// File generated from CLDR ver. 44.1
-///
-/// Before checkin, this file could have been manually edited. This is
-/// to incorporate changes before we could correct CLDR. All manual
-/// modification must be documented in this section, and should be
-/// removed after those changes land to CLDR.
+// DO NOT EDIT. This file is autogenerated by script.  See
+// 'http://go/generate_datetime_constants.py' using the --for_dart
+// flag.
+// File generated from CLDR ver. 44.1
+//
+// Before checkin, this file could have been manually edited. This is
+// to incorporate changes before we could correct CLDR. All manual
+// modification must be documented in this section, and should be
+// removed after those changes land to CLDR.
+library;
 
 // MANUAL EDIT TO SUPPRESS WARNINGS IN GENERATED CODE
 // ignore_for_file: unnecessary_new, prefer_single_quotes, directives_ordering
-library date_symbol_data_local;
 
 import "date_symbols.dart";
 import "date_time_patterns.dart";

diff --git a/pkgs/intl/lib/date_symbols.dart b/pkgs/intl/lib/date_symbols.dart
@@ -1,7 +1,6 @@
 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
-library date_symbols;
 
 // Suppress naming lints, as changes would be breaking.
 // ignore_for_file: non_constant_identifier_names

diff --git a/pkgs/intl/lib/date_time_patterns.dart b/pkgs/intl/lib/date_time_patterns.dart
@@ -3,16 +3,14 @@
 // BSD-style license that can be found in the LICENSE file.
 
 /// Date/time formatting symbols for a large subset of locales.
-///
-/// DO NOT EDIT. This file is autogenerated from ICU data. See
-/// 'http://go/generate_datetime_pattern_dart.cc' (Google internal)
-/// File generated from CLDR ver. 44.1
+// DO NOT EDIT. This file is autogenerated from ICU data. See
+// 'http://go/generate_datetime_pattern_dart.cc' (Google internal)
+// File generated from CLDR ver. 44.1
+library;
 
 // MANUAL EDIT TO SUPPRESS WARNINGS IN GENERATED CODE
 // ignore_for_file: unnecessary_const
 
-library date_time_patterns;
-
 /// Returns a Map from locale names to another Map that goes from skeletons
 /// to the locale-specific formatting patterns.
 /// Internal use only. Call initializeDateFormatting instead.

diff --git a/pkgs/intl/lib/intl.dart b/pkgs/intl/lib/intl.dart
@@ -9,7 +9,7 @@
 /// For things that require locale or other data, there are multiple different
 /// ways of making that data available, which may require importing different
 /// libraries. See the class comments for more details.
-library intl;
+library;
 
 import 'dart:async';
 

diff --git a/pkgs/intl/lib/intl_browser.dart b/pkgs/intl/lib/intl_browser.dart
@@ -6,8 +6,7 @@
 /// when running in the web browser. You should import only one of this or
 /// intl_standalone.dart. Right now the only thing provided here is the
 /// ability to find the default locale from the browser.
-
-library intl_browser;
+library;
 
 import 'package:web/web.dart';
 import 'intl.dart';

diff --git a/pkgs/intl/lib/intl_default.dart b/pkgs/intl/lib/intl_default.dart
@@ -6,6 +6,7 @@
 /// when running in the web browser. You should import only one of this or
 /// intl_standalone.dart. Right now the only thing provided here is the
 /// ability to find the default locale from the browser.
+library;
 
 Future<String> findSystemLocale() => throw UnimplementedError(
     'This is a stub for either `intl_standalone` or `intl_browser`');
diff --git a/pkgs/intl/lib/intl_standalone.dart b/pkgs/intl/lib/intl_standalone.dart
@@ -6,8 +6,7 @@
 /// when running standalone. You should import only one of this or
 /// intl_browser.dart. Right now the only thing provided here is finding
 /// the operating system locale.
-
-library intl_standalone;
+library;
 
 import 'dart:io';
 import 'intl.dart';

diff --git a/pkgs/intl/lib/locale.dart b/pkgs/intl/lib/locale.dart
@@ -2,5 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-/// This library provides access to the [Locale] class.
+/// Provides access to the [Locale] class.
+library;
+
 export 'src/locale.dart';
diff --git a/pkgs/intl/lib/message_format.dart b/pkgs/intl/lib/message_format.dart
@@ -3,12 +3,11 @@
 // BSD-style license that can be found in the LICENSE file.
 
 // `MessageFormat` is a "locale aware printf", with plural / gender support.
-///
 /// `MessageFormat` prepares strings for display to users, with optional
 /// arguments (variables/placeholders). The arguments can occur in any order,
 /// which is necessary for translation into languages with different grammars.
 /// It supports syntax to represent plurals and select options.
-library message_format;
+library;
 
 import 'dart:collection';
 import 'intl.dart';
@@ -807,12 +806,12 @@ class _TypeAndVal<T, V> {
 enum _ElementType { string, block }
 
 class _ElementTypeAndVal extends _TypeAndVal<_ElementType, String> {
-  _ElementTypeAndVal(_ElementType type, String value) : super(type, value);
+  _ElementTypeAndVal(super.type, super.value);
 }
 
 /// Block type.
 enum _BlockType { plural, ordinal, select, simple, string, unknown }
 
 class _BlockTypeAndVal extends _TypeAndVal<_BlockType, Object> {
-  _BlockTypeAndVal(_BlockType type, Object value) : super(type, value);
+  _BlockTypeAndVal(super.type, super.value);
 }
diff --git a/pkgs/intl/lib/message_lookup_by_library.dart b/pkgs/intl/lib/message_lookup_by_library.dart
@@ -10,7 +10,7 @@
 ///
 /// See Intl class comment or `tests/message_format_test.dart` for more
 /// examples.
-library message_lookup_by_library;
+library;
 
 import 'package:intl/intl.dart';
 import 'package:intl/src/intl_helpers.dart';

diff --git a/pkgs/intl/lib/number_symbols.dart b/pkgs/intl/lib/number_symbols.dart
@@ -1,7 +1,6 @@
 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
-library number_symbols;
 
 // Suppress naming issues as changes would be breaking.
 // ignore_for_file: non_constant_identifier_names
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		pkgs/intl4x/lib/src/bindings linguist-generated=true