Skip to content

Commit f385b32

Browse files
committed
Upgrade
1 parent 4b9b884 commit f385b32

File tree

8 files changed

+17
-20
lines changed

8 files changed

+17
-20
lines changed

pkgs/intl4x/hook/build.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44

55
import 'dart:io';
66

7+
import 'package:code_assets/code_assets.dart';
78
import 'package:crypto/crypto.dart' show sha256;
9+
import 'package:hooks/hooks.dart';
810
import 'package:intl4x/src/hook_helpers/build_libs.g.dart' show buildLib;
911
import 'package:intl4x/src/hook_helpers/build_options.dart'
1012
show BuildModeEnum, BuildOptions, getBuildOptions;
1113
import 'package:intl4x/src/hook_helpers/hashes.dart' show fileHashes;
1214
import 'package:intl4x/src/hook_helpers/shared.dart' show assetId, package;
1315
import 'package:intl4x/src/hook_helpers/version.dart' show version;
14-
import 'package:native_assets_cli/code_assets.dart';
1516

1617
void main(List<String> args) async {
1718
await build(args, (input, output) async {

pkgs/intl4x/hook/link.dart

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
import 'dart:convert';
66
import 'dart:io';
77

8-
import 'package:collection/collection.dart';
8+
import 'package:code_assets/code_assets.dart' show LinkInputCodeAssets;
9+
import 'package:collection/collection.dart' show IterableExtension;
10+
import 'package:hooks/hooks.dart' show LinkInput, link;
911
import 'package:intl4x/src/hook_helpers/shared.dart' show assetId, package;
1012
import 'package:logging/logging.dart';
11-
import 'package:native_assets_cli/code_assets.dart';
1213
import 'package:native_toolchain_c/native_toolchain_c.dart';
1314
import 'package:record_use/record_use.dart' as record_use;
1415

@@ -37,14 +38,8 @@ Future<void> main(List<String> args) async {
3738
usedSymbols = null;
3839
} else {
3940
usedSymbols = usages
40-
.instancesOf(recordSymbolId)!
41-
.map(
42-
(instance) =>
43-
// Get the "symbol" field value from "RecordSymbol"
44-
(instance.instanceConstant.fields.values.first
45-
as record_use.StringConstant)
46-
.value,
47-
);
41+
.constantsOf(recordSymbolId)
42+
.map((instance) => instance['symbol'] as String);
4843
}
4944
print('Using symbols: $usedSymbols');
5045
final linkerOptions = LinkerOptions.treeshake(symbols: usedSymbols);

pkgs/intl4x/lib/src/hook_helpers/build_libs.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkgs/intl4x/lib/src/hook_helpers/build_options.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'dart:io';
77

88
// ignore: implementation_imports
99
import 'package:collection/collection.dart';
10-
import 'package:native_assets_cli/src/config.dart';
10+
import 'package:hooks/hooks.dart' show HookInputUserDefines;
1111
import 'package:path/path.dart' as path;
1212
import 'package:yaml/yaml.dart' show YamlMap, loadYaml;
1313

pkgs/intl4x/lib/src/hook_helpers/hashes.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// dart tool/regenerate_hashes.dart
88
//
99

10-
import 'package:native_assets_cli/code_assets.dart' show Architecture, OS;
10+
import 'package:code_assets/code_assets.dart' show Architecture, OS;
1111

1212
const fileHashes = <(OS, Architecture, String), String>{
1313
(OS.linux, Architecture.arm, 'dynamic'):

pkgs/intl4x/pubspec.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,16 @@ environment:
2121

2222
dependencies:
2323
args: ^2.4.2
24+
code_assets: ^0.19.0
2425
collection: ^1.19.1
2526
crypto: ^3.0.3
2627
ffi: ^2.1.0
28+
hooks: ^0.19.0
2729
logging: ^1.3.0
2830
meta: ^1.12.0
29-
native_assets_cli: ^0.17.0
30-
native_toolchain_c: ^0.14.0
31+
native_toolchain_c: ^0.16.0
3132
path: ^1.9.0
32-
record_use: ^0.3.0
33+
record_use: ^0.4.0
3334
yaml: ^3.1.3
3435

3536
dev_dependencies:

pkgs/intl4x/tool/build_libs.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkgs/intl4x/tool/regenerate_hashes.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
import 'dart:io';
66

7+
import 'package:code_assets/code_assets.dart' show Architecture;
78
import 'package:crypto/crypto.dart';
89
import 'package:intl4x/src/hook_helpers/version.dart';
9-
import 'package:native_assets_cli/code_assets.dart' show Architecture;
1010

1111
Future<void> main(List<String> args) async {
1212
final httpClient = HttpClient();
@@ -44,7 +44,7 @@ Future<void> main(List<String> args) async {
4444
// dart tool/regenerate_hashes.dart
4545
//
4646
47-
import 'package:native_assets_cli/code_assets.dart' show Architecture, OS;
47+
import 'package:code_assets/code_assets.dart' show Architecture, OS;
4848
4949
const fileHashes = <(OS, Architecture, String), String>{
5050
${fileHashes.map((key, value) => MapEntry(('OS.${key.$1}', 'Architecture.${key.$2}', "'${key.$3}'"), "'$value'")).entries.map((e) => ' ${e.key}:\n ${e.value},').join('\n')}

0 commit comments

Comments
 (0)