remove target os and target arch toplevel

dart-lang · Feb 18, 2025 · c366cdd · c366cdd
1 parent 678a7d1
commit c366cdd
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 51 deletions.
diff --git a/pkgs/native_assets_cli/lib/src/code_assets/config.dart b/pkgs/native_assets_cli/lib/src/code_assets/config.dart
@@ -78,19 +78,12 @@ class CodeConfig {
       json.code!.string(_linkModePreferenceKey),
     );
     final targetArchitecture = Architecture.fromString(
-      json.code?.optionalString(
-            _targetArchitectureKey,
-            validValues: Architecture.values.map((a) => a.name),
-          ) ??
-          json.string(
-            _targetArchitectureKey,
-            validValues: Architecture.values.map((a) => a.name),
-          ),
-    );
-    final targetOS = OS.fromString(
-      json.code?.optionalString(_targetOSConfigKey) ??
-          json.string(_targetOSConfigKey),
+      json.code!.string(
+        _targetArchitectureKey,
+        validValues: Architecture.values.map((a) => a.name),
+      ),
     );
+    final targetOS = OS.fromString(json.code!.string(_targetOSConfigKey));
     final cCompiler = switch (json.code?.optionalMap(_compilerKey)) {
       final Map<String, Object?> map => CCompilerConfig.fromJson(map),
       null => null,
@@ -153,13 +146,12 @@ class IOSCodeConfig {
       _targetVersion = targetVersion;
 
   IOSCodeConfig.fromJson(Map<String, Object?> json)
-    : _targetVersion =
-          json.code?.optionalMap(_iosKey)?.optionalInt(_targetVersionKey) ??
-          json.optionalInt(_targetIOSVersionKeyDeprecated),
+    : _targetVersion = json.code
+          ?.optionalMap(_iosKey)
+          ?.optionalInt(_targetVersionKey),
       _targetSdk = switch (json.code
-              ?.optionalMap(_iosKey)
-              ?.optionalString(_targetSdkKey) ??
-          json.optionalString(_targetIOSSdkKeyDeprecated)) {
+          ?.optionalMap(_iosKey)
+          ?.optionalString(_targetSdkKey)) {
         null => null,
         String e => IOSSdk.fromString(e),
       };
@@ -181,9 +173,9 @@ class AndroidCodeConfig {
   AndroidCodeConfig({required int targetNdkApi}) : _targetNdkApi = targetNdkApi;
 
   AndroidCodeConfig.fromJson(Map<String, Object?> json)
-    : _targetNdkApi =
-          json.code?.optionalMap(_androidKey)?.optionalInt(_targetNdkApiKey) ??
-          json.optionalInt(_targetAndroidNdkApiKeyDeprecated);
+    : _targetNdkApi = json.code
+          ?.optionalMap(_androidKey)
+          ?.optionalInt(_targetNdkApiKey);
 }
 
 extension AndroidConfigSyntactic on AndroidCodeConfig {
@@ -201,9 +193,9 @@ class MacOSCodeConfig {
     : _targetVersion = targetVersion;
 
   MacOSCodeConfig.fromJson(Map<String, Object?> json)
-    : _targetVersion =
-          json.code?.optionalMap(_macosKey)?.optionalInt(_targetVersionKey) ??
-          json.optionalInt(_targetMacOSVersionKeyDeprecated);
+    : _targetVersion = json.code
+          ?.optionalMap(_macosKey)
+          ?.optionalInt(_targetVersionKey);
 }
 
 extension MacOSConfigSyntactic on MacOSCodeConfig {
@@ -267,14 +259,12 @@ extension CodeAssetBuildInputBuilder on HookConfigBuilder {
     MacOSCodeConfig? macOS,
   }) {
     if (targetArchitecture != null) {
-      json[_targetArchitectureKey] = targetArchitecture.toString();
       json.setNested([
         _configKey,
         _codeKey,
         _targetArchitectureKey,
       ], targetArchitecture.toString());
     }
-    json[_targetOSConfigKey] = targetOS.toString();
     json.setNested([
       _configKey,
       _codeKey,
@@ -292,16 +282,13 @@ extension CodeAssetBuildInputBuilder on HookConfigBuilder {
     // Note, using ?. instead of !. makes missing data be a semantic error
     // rather than a syntactic error to be caught in the validation.
     if (targetOS == OS.android) {
-      json[_targetAndroidNdkApiKeyDeprecated] = android?.targetNdkApi;
       json.setNested([
         _configKey,
         _codeKey,
         _androidKey,
         _targetNdkApiKey,
       ], android?.targetNdkApi);
     } else if (targetOS == OS.iOS) {
-      json[_targetIOSSdkKeyDeprecated] = iOS?.targetSdk.toString();
-      json[_targetIOSVersionKeyDeprecated] = iOS?.targetVersion;
       json.setNested([
         _configKey,
         _codeKey,
@@ -315,7 +302,6 @@ extension CodeAssetBuildInputBuilder on HookConfigBuilder {
         _targetVersionKey,
       ], iOS?.targetVersion);
     } else if (targetOS == OS.macOS) {
-      json[_targetMacOSVersionKeyDeprecated] = macOS?.targetVersion;
       json.setNested([
         _configKey,
         _codeKey,
@@ -349,13 +335,9 @@ extension CodeAssetLinkOutput on LinkOutputAssets {
 const String _compilerKey = 'c_compiler';
 const String _linkModePreferenceKey = 'link_mode_preference';
 const String _targetNdkApiKey = 'target_ndk_api';
-const String _targetAndroidNdkApiKeyDeprecated = 'target_android_ndk_api';
 const String _targetArchitectureKey = 'target_architecture';
 const String _targetSdkKey = 'target_sdk';
-const String _targetIOSSdkKeyDeprecated = 'target_ios_sdk';
 const String _targetVersionKey = 'target_version';
-const String _targetIOSVersionKeyDeprecated = 'target_ios_version';
-const String _targetMacOSVersionKeyDeprecated = 'target_macos_version';
 const String _targetOSConfigKey = 'target_os';
 
 const _configKey = 'config';

diff --git a/pkgs/native_assets_cli/test/build_config_test.dart b/pkgs/native_assets_cli/test/build_config_test.dart
@@ -92,13 +92,13 @@ void main() async {
           'config': {
             'build_asset_types': ['my-asset-type'],
             'linking_enabled': false,
+            'target_os': 'linux',
+            'link_mode_preference': 'prefer-static',
           },
-          'link_mode_preference': 'prefer-static',
           'out_dir': outDir.toFilePath(),
           'out_dir_shared': outputDirectoryShared.toFilePath(),
           'out_file': outFile.toFilePath(),
           'package_root': packageRootUri.toFilePath(),
-          'target_os': 'linux',
           'version': version,
           'package_name': packageName,
         };

diff --git a/pkgs/native_assets_cli/test/code_assets/config_test.dart b/pkgs/native_assets_cli/test/code_assets/config_test.dart
@@ -94,10 +94,6 @@ void main() async {
     'out_file': outFile.toFilePath(),
     'package_name': packageName,
     'package_root': packageRootUri.toFilePath(),
-    if (includeDeprecated && targetOS == OS.android)
-      'target_android_ndk_api': 30,
-    if (includeDeprecated) 'target_architecture': 'arm64',
-    if (includeDeprecated) 'target_os': targetOS.name,
     'version': '1.9.0',
   };
 
@@ -227,17 +223,19 @@ void main() async {
   test('BuildInput.config.code: invalid architecture', () {
     final input = {
       'config': {
-        'code': {'link_mode_preference': 'prefer-static'},
+        'code': {
+          'link_mode_preference': 'prefer-static',
+          'android': {'target_ndk_api': 30},
+          'target_architecture': 'invalid_architecture',
+          'target_os': 'android',
+        },
         'linking_enabled': false,
       },
       'out_dir': outDirUri.toFilePath(),
       'out_dir_shared': outputDirectoryShared.toFilePath(),
       'out_file': outFile.toFilePath(),
       'package_name': packageName,
       'package_root': packageRootUri.toFilePath(),
-      'target_android_ndk_api': 30,
-      'target_architecture': 'invalid_architecture',
-      'target_os': 'android',
       'version': latestVersion.toString(),
     };
     expect(() => BuildInput(input).config.code, throwsFormatException);
@@ -246,16 +244,18 @@ void main() async {
   test('LinkInput.config.code: invalid architecture', () {
     final input = {
       'config': {
-        'code': {'link_mode_preference': 'prefer-static'},
+        'code': {
+          'link_mode_preference': 'prefer-static',
+          'android': {'target_ndk_api': 30},
+          'target_architecture': 'invalid_architecture',
+          'target_os': 'android',
+        },
       },
       'out_dir': outDirUri.toFilePath(),
       'out_dir_shared': outputDirectoryShared.toFilePath(),
       'out_file': outFile.toFilePath(),
       'package_name': packageName,
       'package_root': packageRootUri.toFilePath(),
-      'target_android_ndk_api': 30,
-      'target_architecture': 'invalid_architecture',
-      'target_os': 'android',
       'version': latestVersion.toString(),
     };
     expect(() => LinkInput(input).config.code, throwsFormatException);

diff --git a/pkgs/native_assets_cli/test/link_config_test.dart b/pkgs/native_assets_cli/test/link_config_test.dart
@@ -79,7 +79,6 @@ void main() async {
           'out_dir_shared': outputDirectoryShared.toFilePath(),
           'out_file': outFile.toFilePath(),
           'package_root': packageRootUri.toFilePath(),
-          'target_os': 'linux',
           'version': version,
           'package_name': packageName,
         };
@@ -112,7 +111,6 @@ void main() async {
           'version': latestVersion.toString(),
           'package_name': packageName,
           'package_root': packageRootUri.toFilePath(),
-          'target_os': 'android',
           'assets': <String>[],
         }),
         throwsA(
@@ -133,7 +131,6 @@ void main() async {
           'out_file': outFile.toFilePath(),
           'package_name': packageName,
           'package_root': packageRootUri.toFilePath(),
-          'target_os': 'android',
           'assets': 'astring',
         }),
         throwsA(