firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[deps] Roll dart-lang/native packages (#151403)

Browse Source 
Pass in the minimum iOS and MacOS version.

Roll dart-lang/native deps.

Related issues:

* https://github.com/flutter/flutter/issues/145104
* Relevant discussion: https://github.com/flutter/flutter/pull/148504
This commit is contained in:
Daco Harkes 2024-07-09 09:41:35 +02:00 committed by GitHub
parent c206a47505
commit 9ab8b6e150
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/integration_tests/link_hook/hook/build.dart
View File

@ -20,8 +20,8 @@ void main(List<String> args) async {
);
final BuildOutput outputCatcher = BuildOutput();
await cbuilder.run(
buildConfig: config,
buildOutput: outputCatcher,
config: config,
output: outputCatcher,
logger: Logger('')
..level = Level.ALL
..onRecord.listen((LogRecord record) => print(record.message)),

6
dev/integration_tests/link_hook/pubspec.yaml
View File

@ -8,8 +8,8 @@ environment:
dependencies:
cli_config: 0.2.0
logging: 1.2.0
native_assets_cli: 0.6.0
native_toolchain_c: 0.4.2
native_assets_cli: 0.6.1
native_toolchain_c: 0.5.0
args: 2.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
async: 2.11.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@ -67,4 +67,4 @@ dev_dependencies:
webkit_inspection_protocol: 1.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
yaml_edit: 2.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
# PUBSPEC CHECKSUM: 0444
# PUBSPEC CHECKSUM: 3a44

4
packages/flutter_tools/lib/src/isolated/native_assets/ios/native_assets.dart
View File

@ -107,6 +107,8 @@ Future<List<Uri>> buildNativeAssetsIOS({
workingDirectory: projectUri,
includeParentEnvironment: true,
cCompilerConfig: await buildRunner.cCompilerConfig,
// TODO(dcharkes): Fetch minimum iOS version from somewhere. https://github.com/flutter/flutter/issues/145104
targetIOSVersion: 12,
);
ensureNativeAssetsBuildSucceed(buildResult);
nativeAssets.addAll(buildResult.assets);
@ -120,6 +122,8 @@ Future<List<Uri>> buildNativeAssetsIOS({
includeParentEnvironment: true,
cCompilerConfig: await buildRunner.cCompilerConfig,
buildResult: buildResult,
// TODO(dcharkes): Fetch minimum iOS version from somewhere. https://github.com/flutter/flutter/issues/145104
targetIOSVersion: 12,
);
ensureNativeAssetsLinkSucceed(linkResult);
nativeAssets.addAll(linkResult.assets);

4
packages/flutter_tools/lib/src/isolated/native_assets/macos/native_assets.dart
View File

@ -128,6 +128,8 @@ Future<(Uri? nativeAssetsYaml, List<Uri> dependencies)> buildNativeAssetsMacOS({
workingDirectory: projectUri,
includeParentEnvironment: true,
cCompilerConfig: await buildRunner.cCompilerConfig,
// TODO(dcharkes): Fetch minimum MacOS version from somewhere. https://github.com/flutter/flutter/issues/145104
targetMacOSVersion: 13,
);
ensureNativeAssetsBuildSucceed(buildResult);
nativeAssets.addAll(buildResult.assets);
@ -140,6 +142,8 @@ Future<(Uri? nativeAssetsYaml, List<Uri> dependencies)> buildNativeAssetsMacOS({
includeParentEnvironment: true,
cCompilerConfig: await buildRunner.cCompilerConfig,
buildResult: buildResult,
// TODO(dcharkes): Fetch minimum MacOS version from somewhere. https://github.com/flutter/flutter/issues/145104
targetMacOSVersion: 13,
);
ensureNativeAssetsLinkSucceed(linkResult);
nativeAssets.addAll(linkResult.assets);

12
packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart
View File

@ -61,6 +61,8 @@ abstract class NativeAssetsBuildRunner {
required Uri workingDirectory,
CCompilerConfigImpl? cCompilerConfig,
int? targetAndroidNdkApi,
int? targetIOSVersion,
int? targetMacOSVersion,
IOSSdkImpl? targetIOSSdkImpl,
});
@ -83,6 +85,8 @@ abstract class NativeAssetsBuildRunner {
required BuildResult buildResult,
CCompilerConfigImpl? cCompilerConfig,
int? targetAndroidNdkApi,
int? targetIOSVersion,
int? targetMacOSVersion,
IOSSdkImpl? targetIOSSdkImpl,
});
@ -176,6 +180,8 @@ class NativeAssetsBuildRunnerImpl implements NativeAssetsBuildRunner {
required Target target,
required Uri workingDirectory,
CCompilerConfigImpl? cCompilerConfig,
int? targetIOSVersion,
int? targetMacOSVersion,
int? targetAndroidNdkApi,
IOSSdkImpl? targetIOSSdkImpl,
}) {
@ -193,6 +199,8 @@ class NativeAssetsBuildRunnerImpl implements NativeAssetsBuildRunner {
targetIOSSdk: targetIOSSdkImpl,
workingDirectory: workingDirectory,
packageLayout: packageLayout,
targetIOSVersion: targetIOSVersion,
targetMacOSVersion: targetMacOSVersion,
);
}
@ -229,6 +237,8 @@ class NativeAssetsBuildRunnerImpl implements NativeAssetsBuildRunner {
required BuildResult buildResult,
CCompilerConfigImpl? cCompilerConfig,
int? targetAndroidNdkApi,
int? targetIOSVersion,
int? targetMacOSVersion,
IOSSdkImpl? targetIOSSdkImpl,
}) {
final PackageLayout packageLayout = PackageLayout.fromPackageConfig(
@ -246,6 +256,8 @@ class NativeAssetsBuildRunnerImpl implements NativeAssetsBuildRunner {
workingDirectory: workingDirectory,
packageLayout: packageLayout,
buildResult: buildResult,
targetIOSVersion: targetIOSVersion,
targetMacOSVersion: targetMacOSVersion,
);
}

6
packages/flutter_tools/pubspec.yaml
View File

@ -56,8 +56,8 @@ dependencies:
cli_config: 0.2.0
graphs: 2.3.1
native_assets_builder: 0.7.0
native_assets_cli: 0.6.0
native_assets_builder: 0.7.1
native_assets_cli: 0.6.1
# We depend on very specific internal implementation details of the
# 'test' package, which change between versions, so when upgrading
@ -120,4 +120,4 @@ dartdoc:
# Exclude this package from the hosted API docs.
nodoc: true
# PUBSPEC CHECKSUM: f5a9
# PUBSPEC CHECKSUM: 90ab

4
packages/flutter_tools/templates/package_ffi/hook/build.dart.tmpl
View File

@ -16,8 +16,8 @@ void main(List<String> args) async {
dartBuildFiles: ['hook/build.dart'],
);
await cbuilder.run(
buildConfig: config,
buildOutput: output,
config: config,
output: output,
logger: Logger('')
..level = Level.ALL
..onRecord.listen((record) => print(record.message)),

4
packages/flutter_tools/templates/package_ffi/pubspec.yaml.tmpl
View File

@ -9,8 +9,8 @@ environment:
dependencies:
cli_config: ^0.2.0
logging: ^1.2.0
native_assets_cli: ^0.6.0
native_toolchain_c: ^0.4.2
native_assets_cli: ^0.6.1
native_toolchain_c: ^0.5.0
dev_dependencies:
ffi: ^2.1.2

4
packages/flutter_tools/test/general.shard/isolated/fake_native_assets_build_runner.dart
View File

@ -56,6 +56,8 @@ class FakeNativeAssetsBuildRunner implements NativeAssetsBuildRunner {
required Uri workingDirectory,
CCompilerConfigImpl? cCompilerConfig,
int? targetAndroidNdkApi,
int? targetIOSVersion,
int? targetMacOSVersion,
IOSSdkImpl? targetIOSSdkImpl,
}) async {
buildInvocations++;
@ -73,6 +75,8 @@ class FakeNativeAssetsBuildRunner implements NativeAssetsBuildRunner {
required native_assets_builder.BuildResult buildResult,
CCompilerConfigImpl? cCompilerConfig,
int? targetAndroidNdkApi,
int? targetIOSVersion,
int? targetMacOSVersion,
IOSSdkImpl? targetIOSSdkImpl,
}) async {
linkInvocations++;