Merge branch 'main' into release_ui

Author: liamappelbe

.github/workflows/native.yaml

@@ -66,9 +66,6 @@ jobs:
       - run: dart pub get -C test_data/native_add_duplicate/
         if: ${{ matrix.package == 'native_assets_builder' }}
 
-      - run: dart pub get -C test_data/native_add_v1_0_0/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
       - run: dart pub get -C test_data/native_add_add_source/
         if: ${{ matrix.package == 'native_assets_builder' }}
 

pkgs/native_assets_builder/CHANGELOG.md

@@ -4,6 +4,11 @@
   hooks to prevent concurrency issues with shared output caching.
 - Fix test packages with RecordUse annotations
   [#1586](https://github.com/dart-lang/native/issues/1586).
+- Update SDK constraint to 3.5.0+
+- Rename the environment variables we use to communicate CCompilerConfig from
+  Dart CI test runner to the `package:native_assets_builder` for testing the
+  dart-lang/native repository to make it clear those are not intended to be used
+  by end-users.
 
 ## 0.8.3
 

pkgs/native_assets_builder/lib/src/build_runner/build_runner.dart

@@ -158,6 +158,43 @@ class NativeAssetsBuildRunner {
     assert(hook == Hook.link || buildResult == null);
     assert(hook == Hook.build || linkingEnabled == null);
 
+    // Specifically for running our tests on Dart CI with the test runner, we
+    // recognize specific variables to setup the C Compiler configuration.
+    if (cCompilerConfig == null) {
+      String? unparseKey(String key) =>
+          'DART_HOOK_TESTING_${key.replaceAll('.', '__').toUpperCase()}';
+
+      final env = Platform.environment;
+      String? lookup(String key) => env[unparseKey(key)];
+
+      final cc = lookup(CCompilerConfigImpl.ccConfigKeyFull);
+      final ar = lookup(CCompilerConfigImpl.arConfigKeyFull);
+      final ld = lookup(CCompilerConfigImpl.ldConfigKeyFull);
+      final envScript = lookup(CCompilerConfigImpl.envScriptConfigKeyFull);
+      final envScriptArgs =
+          lookup(CCompilerConfigImpl.envScriptArgsConfigKeyFull)
+              ?.split(' ')
+              .map((arg) => arg.trim())
+              .where((arg) => arg.isNotEmpty)
+              .toList();
+      final hasEnvScriptArgs =
+          envScriptArgs != null && envScriptArgs.isNotEmpty;
+
+      if (cc != null ||
+          ar != null ||
+          ld != null ||
+          envScript != null ||
+          hasEnvScriptArgs) {
+        cCompilerConfig = CCompilerConfigImpl(
+          archiver: ar != null ? Uri.file(ar) : null,
+          compiler: cc != null ? Uri.file(cc) : null,
+          envScript: envScript != null ? Uri.file(envScript) : null,
+          envScriptArgs: hasEnvScriptArgs ? envScriptArgs : null,
+          linker: ld != null ? Uri.file(ld) : null,
+        );
+      }
+    }
+
     packageLayout ??= await PackageLayout.fromRootPackageRoot(workingDirectory);
     final (buildPlan, packageGraph, planSuccess) = await _makePlan(
       hook: hook,
@@ -624,9 +661,6 @@ ${result.stdout}
 
     try {
       final output = HookOutputImpl.readFromFile(file: config.outputFile) ??
-          (config.outputFileV1_1_0 == null
-              ? null
-              : HookOutputImpl.readFromFile(file: config.outputFileV1_1_0!)) ??
           HookOutputImpl();
 
       final validateResult = await validate(

pkgs/native_assets_builder/pubspec.yaml

@@ -7,7 +7,7 @@ repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_bui
 publish_to: none
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: '>=3.5.0 <4.0.0'
 
 dependencies:
   collection: ^1.18.0

pkgs/native_assets_builder/test/build_runner/build_runner_run_in_isolation_test.dart

@@ -13,7 +13,9 @@ import 'helpers.dart';
 const Timeout longTimeout = Timeout(Duration(minutes: 5));
 
 void main() async {
-  String unparseKey(String key) => key.replaceAll('.', '__').toUpperCase();
+  String unparseKey(String key) =>
+      'DART_HOOK_TESTING_${key.replaceAll('.', '__').toUpperCase()}';
+
   final arKey = unparseKey(CCompilerConfigImpl.arConfigKeyFull);
   final ccKey = unparseKey(CCompilerConfigImpl.ccConfigKeyFull);
   final ldKey = unparseKey(CCompilerConfigImpl.ldConfigKeyFull);

pkgs/native_assets_builder/test/build_runner/v1_0_0_test.dart

@@ -123,7 +123,8 @@ final pkgNativeAssetsBuilderUri = findPackageRoot('native_assets_builder');
 
 final testDataUri = pkgNativeAssetsBuilderUri.resolve('test_data/');
 
-String unparseKey(String key) => key.replaceAll('.', '__').toUpperCase();
+String unparseKey(String key) =>
+    'DART_HOOK_TESTING_${key.replaceAll('.', '__').toUpperCase()}';
 
 /// Archiver provided by the environment.
 ///

pkgs/native_assets_builder/test/helpers.dart

@@ -46,14 +46,6 @@
 - fail_on_os_sdk_version_linker/pubspec.yaml
 - fail_on_os_sdk_version/hook/build.dart
 - fail_on_os_sdk_version/pubspec.yaml
-- native_add_v1_0_0/build.dart
-- native_add_v1_0_0/ffigen.yaml
-- native_add_v1_0_0/lib/native_add.dart
-- native_add_v1_0_0/lib/src/native_add_bindings_generated.dart
-- native_add_v1_0_0/lib/src/native_add.dart
-- native_add_v1_0_0/pubspec.yaml
-- native_add_v1_0_0/src/native_add.c
-- native_add_v1_0_0/src/native_add.h
 - native_add/ffigen.yaml
 - native_add/hook/build.dart
 - native_add/lib/native_add.dart

pkgs/native_assets_builder/test_data/manifest.yaml

@@ -1,10 +1,22 @@
-## 0.8.1-wip
+## 0.9.0-wip
 
 - Add `BuildConfig` and `LinkConfig` `outputDirectoryShared`.
 - Remove `package:native_assets_cli/locking.dart` with `runUnderDirectoryLock`.
   Hook writers should not use this, the `native_assets_builder` does this.
 - Fix example packages with RecordUse annotations
   [#1586](https://github.com/dart-lang/native/issues/1586).
+- Remove v1.0 / v1.1 related serialization
+- Update SDK constraint to 3.5.0+
+- Remove (deprecated) support for accepting yaml as config
+- Remove usage of `package:cli_config` and `package:args`: it minimizes
+  dependencies and it simplifies logic any hook has to do (as it no longer has
+  to look into environment variables, arguments and json file, determine which
+  has presence over other, etc)
+- Use `DART_HOOK_TESTING` prefix for environment variables used for testing on
+  Dart CI
+- No longer try to resolve uris encoded in `config.json` against any base uri.
+  The `hook/{build,link}.dart` invoker has to ensure the uris it encodes can be
+  opened as-is (i.e. without resolving against any base uri)
 
 ## 0.8.0
 

pkgs/native_assets_builder/test_data/native_add_v1_0_0/build.dart

@@ -30,7 +30,7 @@ extension on LinkConfig {
   RecordedUsages get usages {
     final usagesFile = recordedUsagesFile;
     final usagesContent = File.fromUri(usagesFile!).readAsStringSync();
-    final usagesJson = jsonDecode(usagesContent) as Map<String, dynamic>;
+    final usagesJson = jsonDecode(usagesContent) as Map<String, Object?>;
     final usages = RecordedUsages.fromJson(usagesJson);
     return usages;
   }

pkgs/native_assets_builder/test_data/native_add_v1_0_0/ffigen.yaml

@@ -4,7 +4,6 @@
 
 import 'package:pub_semver/pub_semver.dart';
 
-import '../model/target.dart';
 import '../utils/json.dart';
 import '../utils/map.dart';
 import 'architecture.dart';

pkgs/native_assets_builder/test_data/native_add_v1_0_0/lib/native_add.dart

@@ -2,12 +2,14 @@
 // 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 'dart:convert';
 import 'dart:io';
 
-import 'package:cli_config/cli_config.dart';
 import 'package:collection/collection.dart';
 import 'package:pub_semver/pub_semver.dart';
 
+import '../args_parser.dart';
+import '../json_utils.dart';
 import '../model/hook.dart';
 import '../model/metadata.dart';
 import '../utils/json.dart';

pkgs/native_assets_builder/test_data/native_add_v1_0_0/lib/src/native_add.dart

@@ -7,7 +7,6 @@ import 'dart:io';
 
 import 'package:collection/collection.dart';
 import 'package:pub_semver/pub_semver.dart';
-import 'package:yaml/yaml.dart' show loadYaml;
 
 import '../model/dependencies.dart';
 import '../model/metadata.dart';

pkgs/native_assets_builder/test_data/native_add_v1_0_0/lib/src/native_add_bindings_generated.dart

@@ -5,11 +5,11 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:cli_config/cli_config.dart';
 import 'package:collection/collection.dart';
 import 'package:crypto/crypto.dart';
 import 'package:pub_semver/pub_semver.dart';
 
+import '../json_utils.dart';
 import '../model/hook.dart';
 import '../model/metadata.dart';
 import '../model/target.dart';
@@ -22,7 +22,6 @@ import 'ios_sdk.dart';
 import 'link_config.dart';
 import 'link_mode_preference.dart';
 import 'os.dart';
-
 part '../model/hook_config.dart';
 
 /// The shared properties of a [LinkConfig] and a [BuildConfig].

pkgs/native_assets_builder/test_data/native_add_v1_0_0/manifest.yaml

@@ -4,12 +4,12 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:args/args.dart';
-import 'package:cli_config/cli_config.dart';
 import 'package:collection/collection.dart';
 import 'package:meta/meta.dart';
 import 'package:pub_semver/pub_semver.dart';
 
+import '../args_parser.dart';
+import '../json_utils.dart';
 import '../model/hook.dart';
 import '../utils/map.dart';
 import 'architecture.dart';