Skip to content

[native_assets_cli] Remove lib/native_assets_cli_internal.dart #2235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkgs/native_assets_builder/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.18.0-wip

- Bump `package:native_assets_cli` to 0.18.0.

## 0.17.0

- Bump `package:native_assets_cli` to 0.17.0.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/native_assets_builder/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
`package:native_assets_builder` and `package:native_assets_cli/native_assets_cli_internal.dart` are used in [`package:dartdev`] and [`package:flutter_tools`].
`package:native_assets_builder` is used in [`package:dartdev`] and [`package:flutter_tools`].

Dartdev and Flutter Tools are the commandline interfaces for `dart ...` and `flutter ...` commands.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import 'package:file/file.dart';
import 'package:graphs/graphs.dart' as graphs;
import 'package:logging/logging.dart';
import 'package:meta/meta.dart';
import 'package:native_assets_cli/native_assets_cli_internal.dart';
import 'package:package_config/package_config.dart';

import '../package_layout/package_layout.dart';
Expand Down Expand Up @@ -209,3 +208,18 @@ class PackageGraph {
return buffer.toString();
}
}

/// The two types of scripts which are hooked into the compilation process.
///
/// The `build.dart` hook runs before, and the `link.dart` hook after
/// compilation. This enum holds static information about these hooks.
enum Hook {
link('link'),
build('build');

final String _scriptName;

const Hook(this._scriptName);

String get scriptName => '$_scriptName.dart';
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import 'dart:io' show Platform;
import 'package:file/file.dart';
import 'package:logging/logging.dart';
import 'package:meta/meta.dart';
import 'package:native_assets_cli/native_assets_cli_internal.dart';
import 'package:native_assets_cli/native_assets_cli_builder.dart';
import 'package:package_config/package_config.dart';
import 'package:yaml/yaml.dart';

Expand Down
2 changes: 1 addition & 1 deletion pkgs/native_assets_builder/lib/src/model/build_result.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +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.

import 'package:native_assets_cli/native_assets_cli_internal.dart';
import 'package:native_assets_cli/native_assets_cli_builder.dart';

/// The result of executing build hooks from all packages in the dependency tree
/// of the entry point application.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/native_assets_builder/lib/src/model/hook_result.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// BSD-style license that can be found in the LICENSE file.

import 'package:collection/collection.dart';
import 'package:native_assets_cli/native_assets_cli_internal.dart';
import 'package:native_assets_cli/native_assets_cli_builder.dart';

import '../../native_assets_builder.dart';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/// Dart SDK.
library;

import 'package:native_assets_cli/native_assets_cli_internal.dart';
import 'package:native_assets_cli/native_assets_cli_builder.dart';

import '../utils/yaml.dart';

Expand Down
2 changes: 1 addition & 1 deletion pkgs/native_assets_builder/lib/src/model/link_result.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +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.

import 'package:native_assets_cli/native_assets_cli_internal.dart';
import 'package:native_assets_cli/native_assets_cli_builder.dart';

/// The result of executing the link hooks from all packages in the dependency
/// tree of the entry point application.
Expand Down
4 changes: 2 additions & 2 deletions pkgs/native_assets_builder/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: native_assets_builder
description: >-
This package is the backend that invokes build hooks.
version: 0.17.0
version: 0.18.0-wip
repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_builder

resolution: workspace
Expand All @@ -16,7 +16,7 @@ dependencies:
graphs: ^2.3.2
logging: ^1.3.0
meta: ^1.16.0
native_assets_cli: ^0.17.0
native_assets_cli: ^0.18.0-wip
package_config: ^2.1.0
pub_semver: ^2.2.0
yaml: ^3.1.3
Expand Down
2 changes: 1 addition & 1 deletion pkgs/native_assets_builder/test/helpers.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import 'package:yaml/yaml.dart';

export 'package:native_assets_cli/code_assets_builder.dart';
export 'package:native_assets_cli/data_assets_builder.dart';
export 'package:native_assets_cli/native_assets_cli_internal.dart';
export 'package:native_assets_cli/native_assets_cli_builder.dart';

extension UriExtension on Uri {
String get name => pathSegments.where((e) => e != '').last;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// ignore_for_file: undefined_hidden_name

import 'package:native_assets_builder/src/model/kernel_assets.dart';
import 'package:native_assets_cli/native_assets_cli_internal.dart';
import 'package:native_assets_cli/native_assets_cli_builder.dart';
import 'package:test/test.dart';

void main() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ environment:
dependencies:
logging: ^1.3.0
meta: ^1.16.0
native_assets_cli: ^0.17.0
native_toolchain_c: ^0.14.0
native_assets_cli: ^0.18.0-wip
native_toolchain_c: ^0.15.0-wip

dev_dependencies:
lints: ^5.1.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
complex_link_helper:
path: ../complex_link_helper/
logging: ^1.3.0
native_assets_cli: ^0.17.0
native_assets_cli: ^0.18.0-wip

dev_dependencies:
lints: ^5.1.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ environment:
dependencies:
cli_config: ^0.2.0
logging: ^1.3.0
native_assets_cli: ^0.17.0
native_assets_cli: ^0.18.0-wip

dev_dependencies:
lints: ^5.1.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ environment:
dependencies:
cyclic_package_2:
path: ../cyclic_package_2
native_assets_cli: ^0.17.0
native_assets_cli: ^0.18.0-wip

dev_dependencies:
lints: ^5.1.1
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ environment:
dependencies:
cyclic_package_1:
path: ../cyclic_package_1
native_assets_cli: ^0.17.0
native_assets_cli: ^0.18.0-wip

dev_dependencies:
lints: ^5.1.1
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ environment:
dependencies:
fail_build:
path: ../fail_build/
native_assets_cli: ^0.17.0
native_assets_cli: ^0.18.0-wip

dev_dependencies:
ffigen: ^18.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ environment:
dependencies:
depend_on_fail_build:
path: ../depend_on_fail_build/
native_assets_cli: ^0.17.0
native_assets_cli: ^0.18.0-wip

dev_dependencies:
ffigen: ^18.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ environment:

dependencies:
logging: ^1.3.0
native_assets_cli: ^0.17.0
native_toolchain_c: ^0.14.0
native_assets_cli: ^0.18.0-wip
native_toolchain_c: ^0.15.0-wip

dev_dependencies:
lints: ^5.1.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ environment:
sdk: '>=3.7.0 <4.0.0'

dependencies:
native_assets_cli: ^0.17.0
native_assets_cli: ^0.18.0-wip

dev_dependencies:
ffigen: ^18.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ environment:
sdk: '>=3.7.0 <4.0.0'

dependencies:
native_assets_cli: ^0.17.0
native_assets_cli: ^0.18.0-wip

dev_dependencies:
ffigen: ^18.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ environment:
dependencies:
fail_on_os_sdk_version_linker:
path: ../fail_on_os_sdk_version_linker/
native_assets_cli: ^0.17.0
native_assets_cli: ^0.18.0-wip

dev_dependencies:
ffigen: ^18.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ environment:
sdk: '>=3.7.0 <4.0.0'

dependencies:
native_assets_cli: ^0.17.0
native_assets_cli: ^0.18.0-wip

dev_dependencies:
ffigen: ^18.0.0
Expand Down
4 changes: 2 additions & 2 deletions pkgs/native_assets_builder/test_data/native_add/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ environment:

dependencies:
logging: ^1.3.0
native_assets_cli: ^0.17.0
native_toolchain_c: ^0.14.0
native_assets_cli: ^0.18.0-wip
native_toolchain_c: ^0.15.0-wip

dev_dependencies:
ffigen: ^18.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ environment:

dependencies:
logging: ^1.3.0
native_assets_cli: ^0.17.0
native_toolchain_c: ^0.14.0
native_assets_cli: ^0.18.0-wip
native_toolchain_c: ^0.15.0-wip

dev_dependencies:
ffigen: ^18.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ dependencies:
logging: ^1.3.0
native_add:
path: ../native_add/
native_assets_cli: ^0.17.0
native_toolchain_c: ^0.14.0
native_assets_cli: ^0.18.0-wip
native_toolchain_c: ^0.15.0-wip

dev_dependencies:
ffigen: ^18.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ environment:

dependencies:
logging: ^1.3.0
native_assets_cli: ^0.17.0
native_toolchain_c: ^0.14.0
native_assets_cli: ^0.18.0-wip
native_toolchain_c: ^0.15.0-wip

dev_dependencies:
ffigen: ^18.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ environment:

dependencies:
logging: ^1.3.0
native_assets_cli: ^0.17.0
native_toolchain_c: ^0.14.0
native_assets_cli: ^0.18.0-wip
native_toolchain_c: ^0.15.0-wip

dev_dependencies:
ffigen: ^18.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ environment:
dependencies:
logging: ^1.3.0
meta: ^1.16.0
native_assets_cli: ^0.17.0
native_assets_cli: ^0.18.0-wip

dev_dependencies:
lints: ^5.1.1
Expand Down
4 changes: 2 additions & 2 deletions pkgs/native_assets_builder/test_data/no_hook/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ environment:

dependencies:
logging: ^1.3.0
native_assets_cli: ^0.17.0
native_toolchain_c: ^0.14.0
native_assets_cli: ^0.18.0-wip
native_toolchain_c: ^0.15.0-wip

dev_dependencies:
ffigen: ^18.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ environment:
sdk: '>=3.7.0 <4.0.0'

dependencies:
native_assets_cli: ^0.17.0
native_assets_cli: ^0.18.0-wip
package_with_metadata:
path: ../package_with_metadata/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ environment:
sdk: '>=3.7.0 <4.0.0'

dependencies:
native_assets_cli: ^0.17.0
native_assets_cli: ^0.18.0-wip

dev_dependencies:
lints: ^5.1.1
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ environment:

dependencies:
logging: ^1.3.0
native_assets_cli: ^0.17.0
native_assets_cli: ^0.18.0-wip

dev_dependencies:
lints: ^5.1.1
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ environment:

dependencies:
logging: ^1.1.1
native_assets_cli: ^0.17.0
native_toolchain_c: ^0.14.0
native_assets_cli: ^0.18.0-wip
native_toolchain_c: ^0.15.0-wip

dev_dependencies:
ffigen: ^18.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ environment:

dependencies:
logging: ^1.1.1
native_assets_cli: ^0.17.0
native_toolchain_c: ^0.14.0
native_assets_cli: ^0.18.0-wip
native_toolchain_c: ^0.15.0-wip
reusable_dynamic_library:
path: ../reusable_dynamic_library/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ environment:

dependencies:
logging: ^1.3.0
native_assets_cli: ^0.17.0
native_assets_cli: ^0.18.0-wip

dev_dependencies:
lints: ^5.1.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ environment:
dependencies:
cli_config: ^0.2.0
logging: ^1.3.0
native_assets_cli: ^0.17.0
native_assets_cli: ^0.18.0-wip

dev_dependencies:
lints: ^5.1.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ environment:

dependencies:
logging: ^1.3.0
native_assets_cli: ^0.17.0
native_toolchain_c: ^0.14.0
native_assets_cli: ^0.18.0-wip
native_toolchain_c: ^0.15.0-wip

dev_dependencies:
ffigen: ^18.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ environment:

dependencies:
crypto: ^3.0.6
native_assets_cli: ^0.17.0
native_assets_cli: ^0.18.0-wip

dev_dependencies:
lints: ^5.1.1
Loading