Merge branch 'main' into fixYetAgain

dart-lang · Aug 22, 2024 · 3122181 · 3122181
2 parents 8dceff4 + 4312cd4
commit 3122181
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml
@@ -19,7 +19,7 @@ jobs:
       steps:
         - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
           with:
-            sdk: stable
+            sdk: dev
 
         - uses: actions/checkout@7739b9ba2efcda9dde65ad1e3c2dbe65b41dfba7
 

diff --git a/.github/workflows/intl4x.yml b/.github/workflows/intl4x.yml
@@ -30,7 +30,7 @@ jobs:
         working-directory: pkgs/intl4x
     strategy:
       matrix:
-        sdk: [stable, dev] # {pkgs.versions}
+        sdk: [dev]
         os: [ubuntu-latest, windows-latest, macos-latest]
         include:
           - sdk: dev

diff --git a/.github/workflows/intl4x_artifacts.yml b/.github/workflows/intl4x_artifacts.yml
@@ -145,7 +145,7 @@ jobs:
     - name: Upload artifacts
       uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b
       with:
-        name: dart-${{matrix.os}}-libs
+        name: dart-${{matrix.os}}-${{ matrix.compiletype }}-libs
         path: submodules/icu4x/bin
 
   check_hashes:
@@ -176,7 +176,7 @@ jobs:
         run: |
           cd pkgs/intl4x
           dart pub get
-          dart --enable-experiment=native-assets tool/generate_hashes.dart
+          dart --enable-experiment=native-assets tool/regenerate_hashes.dart
           git diff --exit-code
 
   release:

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -13,6 +13,7 @@ jobs:
     if: ${{ github.repository_owner == 'dart-lang' }}
     uses: dart-lang/ecosystem/.github/workflows/publish.yaml@main
     with:
+      sdk: dev
       write-comments: false
       checkout_submodules: true
       ignore-packages: "submodules"
diff --git a/pkgs/intl4x/CHANGELOG.md b/pkgs/intl4x/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.10.0
+
+- Upgrade minimum SDK to `3.6.0-0`.
+
 ## 0.9.2
 
 - Copy files instead of symlinking, for easier upgrading.

diff --git a/pkgs/intl4x/lib/src/hook_helpers/hashes.dart b/pkgs/intl4x/lib/src/hook_helpers/hashes.dart
@@ -2,9 +2,9 @@
 // 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 FILE IS AUTOGENERATED BY `tool/generate_hashes.dart`. TO UPDATE, RUN
+// THIS FILE IS AUTOGENERATED BY `tool/regenerate_hashes.dart`. TO UPDATE, RUN
 //
-//    dart --enable-experiment=native-assets run tool/generate_hashes.dart
+//    dart --enable-experiment=native-assets run tool/regenerate_hashes.dart
 //
 
 import 'package:native_assets_cli/native_assets_cli.dart';

diff --git a/pkgs/intl4x/pubspec.yaml b/pkgs/intl4x/pubspec.yaml
@@ -1,7 +1,7 @@
 name: intl4x
 description: >-
   A lightweight modular library for internationalization (i18n) functionality.
-version: 0.9.2
+version: 0.10.0
 repository: https://github.com/dart-lang/i18n/tree/main/pkgs/intl4x
 platforms:
   web:
@@ -14,7 +14,7 @@ topics:
   - i18n
 
 environment:
-  sdk: ">=3.3.0 <4.0.0"
+  sdk: ">=3.6.0-0 <4.0.0"
 
 dependencies:
   crypto: ^3.0.3

diff --git a/pkgs/intl4x/tool/regenerate_hashes.dart b/pkgs/intl4x/tool/regenerate_hashes.dart
@@ -33,9 +33,9 @@ Future<void> main(List<String> args) async {
 // 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 FILE IS AUTOGENERATED BY `tool/generate_hashes.dart`. TO UPDATE, RUN
+// THIS FILE IS AUTOGENERATED BY `tool/regenerate_hashes.dart`. TO UPDATE, RUN
 //
-//    dart --enable-experiment=native-assets run tool/generate_hashes.dart
+//    dart --enable-experiment=native-assets run tool/regenerate_hashes.dart
 //
 
 import 'package:native_assets_cli/native_assets_cli.dart';