cleanup

dart-lang · Jan 10, 2025 · d76dd6b · d76dd6b
1 parent 418ef82
commit d76dd6b
Showing 19 changed files with 34 additions and 31 deletions.
diff --git a/pkgs/native_assets_builder/lib/src/build_runner/build_runner.dart b/pkgs/native_assets_builder/lib/src/build_runner/build_runner.dart
@@ -146,7 +146,7 @@ class NativeAssetsBuildRunner {
       inputBuilder.setupShared(
         packageName: package.name,
         packageRoot: packageLayout.packageRoot(package.name),
-        outputFile: outDirUri.resolve('../output.json'),
+        outputFile: buildDirUri.resolve('output.json'),
         outputDirectory: outDirUri,
         outputDirectoryShared: outDirSharedUri,
       );
@@ -245,7 +245,7 @@ class NativeAssetsBuildRunner {
       inputBuilder.setupShared(
         packageName: package.name,
         packageRoot: packageLayout.packageRoot(package.name),
-        outputFile: outDirUri.resolve('../output.json'),
+        outputFile: buildDirUri.resolve('output.json'),
         outputDirectory: outDirUri,
         outputDirectoryShared: outDirSharedUri,
       );

diff --git a/pkgs/native_assets_cli/example/build/download_asset/tool/build.dart b/pkgs/native_assets_cli/example/build/download_asset/tool/build.dart
@@ -70,13 +70,15 @@ BuildInput createBuildInput(
       packageRoot.resolve('.dart_tool/download_asset/$targetName/');
   final outputDirectoryShared =
       packageRoot.resolve('.dart_tool/download_asset/shared/');
+  final outputFile =
+      packageRoot.resolve('.dart_tool/download_asset/output.json');
 
   final os = OS.fromString(osString);
   final inputBuilder = BuildInputBuilder()
     ..setupShared(
         packageRoot: packageRoot,
         packageName: 'download_asset',
-        outputFile: outputDirectory.resolve('../output.json'),
+        outputFile: outputFile,
         outputDirectory: outputDirectory,
         outputDirectoryShared: outputDirectoryShared)
     ..config.setupShared(

diff --git a/pkgs/native_assets_cli/lib/test.dart b/pkgs/native_assets_cli/lib/test.dart
@@ -40,6 +40,7 @@ Future<void> testBuildHook({
         Directory(await tempDir.resolveSymbolicLinks()).uri.normalizePath();
     final outputDirectory = tempUri.resolve('output/');
     final outputDirectoryShared = tempUri.resolve('output_shared/');
+    final outputFile = tempUri.resolve('output.json');
 
     await Directory.fromUri(outputDirectory).create();
     await Directory.fromUri(outputDirectoryShared).create();
@@ -49,7 +50,7 @@ Future<void> testBuildHook({
       ..setupShared(
         packageRoot: Directory.current.uri,
         packageName: _readPackageNameFromPubspec(),
-        outputFile: outputDirectory.resolve('../output.json'),
+        outputFile: outputFile,
         outputDirectory: outputDirectory,
         outputDirectoryShared: outputDirectoryShared,
       )

diff --git a/pkgs/native_assets_cli/test/code_assets/validation_test.dart b/pkgs/native_assets_cli/test/code_assets/validation_test.dart
@@ -34,7 +34,7 @@ void main() {
       ..setupShared(
         packageName: packageName,
         packageRoot: tempUri,
-        outputFile: outDirUri.resolve('../output.json'),
+        outputFile: tempUri.resolve('output.json'),
         outputDirectory: outDirUri,
         outputDirectoryShared: outDirSharedUri,
       )

diff --git a/pkgs/native_assets_cli/test/data_assets/validation_test.dart b/pkgs/native_assets_cli/test/data_assets/validation_test.dart
@@ -34,7 +34,7 @@ void main() {
       ..setupShared(
         packageName: packageName,
         packageRoot: tempUri,
-        outputFile: outDirUri.resolve('../output.json'),
+        outputFile: tempUri.resolve('output.json'),
         outputDirectory: outDirUri,
         outputDirectoryShared: outDirSharedUri,
       )

diff --git a/pkgs/native_assets_cli/test/validation_test.dart b/pkgs/native_assets_cli/test/validation_test.dart
@@ -34,7 +34,7 @@ void main() {
       ..setupShared(
         packageName: packageName,
         packageRoot: tempUri,
-        outputFile: outDirUri.resolve('../output.json'),
+        outputFile: tempUri.resolve('output.json'),
         outputDirectory: outDirUri,
         outputDirectoryShared: outDirSharedUri,
       )

diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_build_failure_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_build_failure_test.dart
@@ -34,7 +34,7 @@ void main() {
       ..setupShared(
         packageName: name,
         packageRoot: tempUri,
-        outputFile: tempUri.resolve('../output.json'),
+        outputFile: tempUri.resolve('output.json'),
         outputDirectory: tempUri,
         outputDirectoryShared: tempUri2,
       )

diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_android_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_android_test.dart
@@ -148,7 +148,7 @@ Future<Uri> buildLib(
     ..setupShared(
       packageName: name,
       packageRoot: tempUri,
-      outputFile: tempUri.resolve('../output.json'),
+      outputFile: tempUri.resolve('output.json'),
       outputDirectory: tempUri,
       outputDirectoryShared: tempUriShared,
     )

diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_ios_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_ios_test.dart
@@ -77,7 +77,7 @@ void main() {
                 ..setupShared(
                   packageName: name,
                   packageRoot: tempUri,
-                  outputFile: tempUri.resolve('../output.json'),
+                  outputFile: tempUri.resolve('output.json'),
                   outputDirectory: tempUri,
                   outputDirectoryShared: tempUri2,
                 )
@@ -233,7 +233,7 @@ Future<Uri> buildLib(
     ..setupShared(
       packageName: name,
       packageRoot: tempUri,
-      outputFile: tempUri.resolve('../output.json'),
+      outputFile: tempUri.resolve('output.json'),
       outputDirectory: tempUri,
       outputDirectoryShared: tempUri2,
     )

diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_linux_host_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_linux_host_test.dart
@@ -46,7 +46,7 @@ void main() {
           ..setupShared(
             packageName: name,
             packageRoot: tempUri,
-            outputFile: tempUri.resolve('../output.json'),
+            outputFile: tempUri.resolve('output.json'),
             outputDirectory: tempUri,
             outputDirectoryShared: tempUri2,
           )

diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_macos_host_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_macos_host_test.dart
@@ -61,7 +61,7 @@ void main() {
             ..setupShared(
               packageName: name,
               packageRoot: tempUri,
-              outputFile: tempUri.resolve('../output.json'),
+              outputFile: tempUri.resolve('output.json'),
               outputDirectory: tempUri,
               outputDirectoryShared: tempUri2,
             )
@@ -162,7 +162,7 @@ Future<Uri> buildLib(
     ..setupShared(
       packageName: name,
       packageRoot: tempUri,
-      outputFile: tempUri.resolve('../output.json'),
+      outputFile: tempUri.resolve('output.json'),
       outputDirectory: tempUri,
       outputDirectoryShared: tempUri2,
     )

diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_windows_host_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_windows_host_test.dart
@@ -65,7 +65,7 @@ void main() {
           ..setupShared(
             packageName: name,
             packageRoot: tempUri,
-            outputFile: tempUri.resolve('../output.json'),
+            outputFile: tempUri.resolve('output.json'),
             outputDirectory: tempUri,
             outputDirectoryShared: tempUri2,
           )

diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_test.dart
@@ -51,7 +51,7 @@ void main() {
           ..setupShared(
             packageName: name,
             packageRoot: tempUri,
-            outputFile: tempUri.resolve('../output.json'),
+            outputFile: tempUri.resolve('output.json'),
             outputDirectory: tempUri,
             outputDirectoryShared: tempUri2,
           )
@@ -134,7 +134,7 @@ void main() {
             ..setupShared(
               packageName: name,
               packageRoot: tempUri,
-              outputFile: tempUri.resolve('../output.json'),
+              outputFile: tempUri.resolve('output.json'),
               outputDirectory: tempUri,
               outputDirectoryShared: tempUri2,
             )
@@ -244,7 +244,7 @@ void main() {
       ..setupShared(
         packageName: name,
         packageRoot: tempUri,
-        outputFile: tempUri.resolve('../output.json'),
+        outputFile: tempUri.resolve('output.json'),
         outputDirectory: tempUri,
         outputDirectoryShared: tempUri2,
       )
@@ -311,7 +311,7 @@ void main() {
       ..setupShared(
         packageName: name,
         packageRoot: tempUri,
-        outputFile: tempUri.resolve('../output.json'),
+        outputFile: tempUri.resolve('output.json'),
         outputDirectory: tempUri,
         outputDirectoryShared: tempUri2,
       )
@@ -369,7 +369,7 @@ void main() {
       ..setupShared(
         packageName: name,
         packageRoot: tempUri,
-        outputFile: tempUri.resolve('../output.json'),
+        outputFile: tempUri.resolve('output.json'),
         outputDirectory: tempUri,
         outputDirectoryShared: tempUri2,
       )
@@ -439,7 +439,7 @@ void main() {
       ..setupShared(
         packageName: name,
         packageRoot: tempUri,
-        outputFile: tempUri.resolve('../output.json'),
+        outputFile: tempUri.resolve('output.json'),
         outputDirectory: tempUri,
         outputDirectoryShared: tempUri2,
       )
@@ -513,7 +513,7 @@ void main() {
       ..setupShared(
         packageName: name,
         packageRoot: tempUri,
-        outputFile: tempUri.resolve('../output.json'),
+        outputFile: tempUri.resolve('output.json'),
         outputDirectory: tempUri,
         outputDirectoryShared: tempUri2,
       )
@@ -598,7 +598,7 @@ void main() {
       ..setupShared(
         packageName: name,
         packageRoot: tempUri,
-        outputFile: tempUri.resolve('../output.json'),
+        outputFile: tempUri.resolve('output.json'),
         outputDirectory: tempUri,
         outputDirectoryShared: tempUri2,
       )
@@ -700,7 +700,7 @@ Future<void> testDefines({
     ..setupShared(
       packageName: name,
       packageRoot: tempUri,
-      outputFile: tempUri.resolve('../output.json'),
+      outputFile: tempUri.resolve('output.json'),
       outputDirectory: tempUri,
       outputDirectoryShared: tempUri2,
     )

diff --git a/pkgs/native_toolchain_c/test/cbuilder/compiler_resolver_test.dart b/pkgs/native_toolchain_c/test/cbuilder/compiler_resolver_test.dart
@@ -47,7 +47,7 @@ void main() {
         ..setupShared(
           packageName: 'dummy',
           packageRoot: tempUri,
-          outputFile: tempUri.resolve('../output.json'),
+          outputFile: tempUri.resolve('output.json'),
           outputDirectory: tempUri,
           outputDirectoryShared: tempUri2,
         )
@@ -93,7 +93,7 @@ void main() {
       ..setupShared(
         packageName: 'dummy',
         packageRoot: tempUri,
-        outputFile: tempUri.resolve('../output.json'),
+        outputFile: tempUri.resolve('output.json'),
         outputDirectoryShared: tempUri2,
         outputDirectory: tempUri,
       )

diff --git a/pkgs/native_toolchain_c/test/cbuilder/objective_c_test.dart b/pkgs/native_toolchain_c/test/cbuilder/objective_c_test.dart
@@ -40,7 +40,7 @@ void main() {
       ..setupShared(
         packageName: name,
         packageRoot: tempUri,
-        outputFile: tempUri.resolve('../output.json'),
+        outputFile: tempUri.resolve('output.json'),
         outputDirectory: tempUri,
         outputDirectoryShared: tempUri2,
       )

diff --git a/pkgs/native_toolchain_c/test/clinker/build_testfiles.dart b/pkgs/native_toolchain_c/test/clinker/build_testfiles.dart
@@ -30,7 +30,7 @@ Future<Uri> buildTestArchive(
     ..setupShared(
       packageName: name,
       packageRoot: tempUri,
-      outputFile: tempUri.resolve('../output.json'),
+      outputFile: tempUri.resolve('output.json'),
       outputDirectory: tempUri,
       outputDirectoryShared: tempUri2,
     )

diff --git a/pkgs/native_toolchain_c/test/clinker/objects_test.dart b/pkgs/native_toolchain_c/test/clinker/objects_test.dart
@@ -35,7 +35,7 @@ Future<void> main() async {
       ..setupShared(
         packageName: 'testpackage',
         packageRoot: tempUri,
-        outputFile: tempUri.resolve('../output.json'),
+        outputFile: tempUri.resolve('output.json'),
         outputDirectory: tempUri,
         outputDirectoryShared: tempUri2,
       )

diff --git a/pkgs/native_toolchain_c/test/clinker/throws_test.dart b/pkgs/native_toolchain_c/test/clinker/throws_test.dart
@@ -26,7 +26,7 @@ Future<void> main() async {
           ..setupShared(
             packageName: 'testpackage',
             packageRoot: tempUri,
-            outputFile: tempUri.resolve('../output.json'),
+            outputFile: tempUri.resolve('output.json'),
             outputDirectoryShared: tempUri2,
             outputDirectory: tempUri,
           )

diff --git a/pkgs/native_toolchain_c/test/clinker/treeshake_helper.dart b/pkgs/native_toolchain_c/test/clinker/treeshake_helper.dart
@@ -65,7 +65,7 @@ Future<void> runTests(List<Architecture> architectures) async {
           ..setupShared(
             packageName: 'testpackage',
             packageRoot: tempUri,
-            outputFile: tempUri.resolve('../output.json'),
+            outputFile: tempUri.resolve('output.json'),
             outputDirectory: tempUri,
             outputDirectoryShared: tempUri2,
           )