Upgrade ICU4X to different branch

dart-lang · Jul 24, 2024 · ca3f1ca · ca3f1ca
1 parent 809a26b
commit ca3f1ca
Show file tree

Hide file tree

Showing 18 changed files with 14 additions and 25 deletions.
diff --git a/pkgs/intl4x/lib/src/bindings/Bcp47ToIanaMapper.g.dart b/pkgs/intl4x/lib/src/bindings/Bcp47ToIanaMapper.g.dart
@@ -0,0 +1 @@
+../../../../../submodules/icu4x/ffi/capi/bindings/dart/Bcp47ToIanaMapper.g.dart
diff --git a/pkgs/intl4x/lib/src/bindings/CalendarError.g.dart b/pkgs/intl4x/lib/src/bindings/CalendarError.g.dart
diff --git a/pkgs/intl4x/lib/src/bindings/CollatorResolvedOptions.g.dart b/pkgs/intl4x/lib/src/bindings/CollatorResolvedOptions.g.dart
diff --git a/pkgs/intl4x/lib/src/bindings/DataError.g.dart b/pkgs/intl4x/lib/src/bindings/DataError.g.dart
diff --git a/pkgs/intl4x/lib/src/bindings/FixedDecimalLimitError.g.dart b/pkgs/intl4x/lib/src/bindings/FixedDecimalLimitError.g.dart
diff --git a/pkgs/intl4x/lib/src/bindings/FixedDecimalParseError.g.dart b/pkgs/intl4x/lib/src/bindings/FixedDecimalParseError.g.dart
diff --git a/pkgs/intl4x/lib/src/bindings/FixedDecimalRoundingIncrement.g.dart b/pkgs/intl4x/lib/src/bindings/FixedDecimalRoundingIncrement.g.dart
diff --git a/pkgs/intl4x/lib/src/bindings/FixedDecimalRoundingMode.g.dart b/pkgs/intl4x/lib/src/bindings/FixedDecimalRoundingMode.g.dart
diff --git a/pkgs/intl4x/lib/src/bindings/IanaToBcp47Mapper.g.dart b/pkgs/intl4x/lib/src/bindings/IanaToBcp47Mapper.g.dart
@@ -0,0 +1 @@
+../../../../../submodules/icu4x/ffi/capi/bindings/dart/IanaToBcp47Mapper.g.dart
diff --git a/pkgs/intl4x/lib/src/bindings/LocaleParseError.g.dart b/pkgs/intl4x/lib/src/bindings/LocaleParseError.g.dart
diff --git a/pkgs/intl4x/lib/src/bindings/ResolvedCollatorOptions.g.dart b/pkgs/intl4x/lib/src/bindings/ResolvedCollatorOptions.g.dart
@@ -0,0 +1 @@
+../../../../../submodules/icu4x/ffi/capi/bindings/dart/ResolvedCollatorOptions.g.dart
diff --git a/pkgs/intl4x/lib/src/bindings/RoundingIncrement.g.dart b/pkgs/intl4x/lib/src/bindings/RoundingIncrement.g.dart
@@ -0,0 +1 @@
+../../../../../submodules/icu4x/ffi/capi/bindings/dart/RoundingIncrement.g.dart
diff --git a/pkgs/intl4x/lib/src/bindings/TimeZoneInvalidIdError.g.dart b/pkgs/intl4x/lib/src/bindings/TimeZoneInvalidIdError.g.dart
diff --git a/pkgs/intl4x/lib/src/bindings/TimeZoneInvalidOffsetError.g.dart b/pkgs/intl4x/lib/src/bindings/TimeZoneInvalidOffsetError.g.dart
diff --git a/pkgs/intl4x/lib/src/datetime_format/datetime_format_4x.dart b/pkgs/intl4x/lib/src/datetime_format/datetime_format_4x.dart
@@ -100,7 +100,7 @@ class DateTimeFormat4X extends DateTimeFormatImpl {
       icu.Calendar.forKind(_data, calendarKind),
     );
     if (_zonedDateTimeFormatter != null) {
-      final ianaToBcp47Mapper = icu.TimeZoneIdMapper(_data);
+      final ianaToBcp47Mapper = icu.IanaToBcp47Mapper(_data);
       final timeZone = icu.CustomTimeZone.empty()
         ..trySetIanaTimeZoneId(ianaToBcp47Mapper, options.timeZone!);
       return _zonedDateTimeFormatter.formatDatetimeWithCustomTimeZone(

diff --git a/pkgs/intl4x/lib/src/locale/locale_4x.dart b/pkgs/intl4x/lib/src/locale/locale_4x.dart
@@ -9,8 +9,8 @@ import 'locale.dart';
 extension Locale4X on Locale {
   icu.Locale to4X() {
     final icu4xLocale = icu.Locale.und()..language = language;
-    if (region != null) icu4xLocale.setRegion(region!);
-    if (script != null) icu4xLocale.setScript(script!);
+    if (region != null) icu4xLocale.region = region!;
+    if (script != null) icu4xLocale.script = script!;
     return icu4xLocale;
   }
 }
diff --git a/pkgs/intl4x/lib/src/number_format/number_format_4x.dart b/pkgs/intl4x/lib/src/number_format/number_format_4x.dart
@@ -36,7 +36,7 @@ class NumberFormat4X extends NumberFormatImpl {
     final icu.FixedDecimal fixedDecimal;
     fixedDecimal = switch (number) {
       final int i => icu.FixedDecimal.fromInt(i),
-      final double d => icu.FixedDecimal.fromDoubleWithFloatingPrecision(d),
+      final double d => icu.FixedDecimal.fromDoubleWithDoublePrecision(d),
       final String s => icu.FixedDecimal.fromString(s),
       Object() => icu.FixedDecimal.fromString(number.toString()),
     };
@@ -103,16 +103,11 @@ class NumberFormat4X extends NumberFormatImpl {
       RoundingMode.floor => fixedDecimal.floor,
       RoundingMode.expand => fixedDecimal.expand,
       RoundingMode.trunc => fixedDecimal.trunc,
-      RoundingMode.halfCeil => (int position) => fixedDecimal.roundWithMode(
-          position, icu.FixedDecimalRoundingMode.halfCeil),
-      RoundingMode.halfFloor => (int position) => fixedDecimal.roundWithMode(
-          position, icu.FixedDecimalRoundingMode.halfFloor),
-      RoundingMode.halfExpand => (int position) => fixedDecimal.roundWithMode(
-          position, icu.FixedDecimalRoundingMode.halfExpand),
-      RoundingMode.halfTrunc => (int position) => fixedDecimal.roundWithMode(
-          position, icu.FixedDecimalRoundingMode.halfTrunc),
-      RoundingMode.halfEven => (int position) => fixedDecimal.roundWithMode(
-          position, icu.FixedDecimalRoundingMode.halfEven),
+      RoundingMode.halfCeil => fixedDecimal.halfCeil,
+      RoundingMode.halfFloor => fixedDecimal.halfFloor,
+      RoundingMode.halfExpand => fixedDecimal.halfExpand,
+      RoundingMode.halfTrunc => fixedDecimal.halfTrunc,
+      RoundingMode.halfEven => fixedDecimal.halfEven,
     };
     roundingFunction(maxSignificantPosition);
   }

diff --git a/submodules/icu4x b/submodules/icu4x