Skip to content

Commit 9ab8b6e

Browse files
authored
[deps] Roll dart-lang/native packages (#151403)
Pass in the minimum iOS and MacOS version. Roll dart-lang/native deps. Related issues: * flutter/flutter#145104 * Relevant discussion: flutter/flutter#148504
1 parent c206a47 commit 9ab8b6e

File tree

9 files changed

+36
-12
lines changed

9 files changed

+36
-12
lines changed

dev/integration_tests/link_hook/hook/build.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ void main(List<String> args) async {
2020
);
2121
final BuildOutput outputCatcher = BuildOutput();
2222
await cbuilder.run(
23-
buildConfig: config,
24-
buildOutput: outputCatcher,
23+
config: config,
24+
output: outputCatcher,
2525
logger: Logger('')
2626
..level = Level.ALL
2727
..onRecord.listen((LogRecord record) => print(record.message)),

dev/integration_tests/link_hook/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ environment:
88
dependencies:
99
cli_config: 0.2.0
1010
logging: 1.2.0
11-
native_assets_cli: 0.6.0
12-
native_toolchain_c: 0.4.2
11+
native_assets_cli: 0.6.1
12+
native_toolchain_c: 0.5.0
1313

1414
args: 2.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
1515
async: 2.11.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -67,4 +67,4 @@ dev_dependencies:
6767
webkit_inspection_protocol: 1.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6868
yaml_edit: 2.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6969

70-
# PUBSPEC CHECKSUM: 0444
70+
# PUBSPEC CHECKSUM: 3a44

packages/flutter_tools/lib/src/isolated/native_assets/ios/native_assets.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ Future<List<Uri>> buildNativeAssetsIOS({
107107
workingDirectory: projectUri,
108108
includeParentEnvironment: true,
109109
cCompilerConfig: await buildRunner.cCompilerConfig,
110+
// TODO(dcharkes): Fetch minimum iOS version from somewhere. https://github.com/flutter/flutter/issues/145104
111+
targetIOSVersion: 12,
110112
);
111113
ensureNativeAssetsBuildSucceed(buildResult);
112114
nativeAssets.addAll(buildResult.assets);
@@ -120,6 +122,8 @@ Future<List<Uri>> buildNativeAssetsIOS({
120122
includeParentEnvironment: true,
121123
cCompilerConfig: await buildRunner.cCompilerConfig,
122124
buildResult: buildResult,
125+
// TODO(dcharkes): Fetch minimum iOS version from somewhere. https://github.com/flutter/flutter/issues/145104
126+
targetIOSVersion: 12,
123127
);
124128
ensureNativeAssetsLinkSucceed(linkResult);
125129
nativeAssets.addAll(linkResult.assets);

packages/flutter_tools/lib/src/isolated/native_assets/macos/native_assets.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ Future<(Uri? nativeAssetsYaml, List<Uri> dependencies)> buildNativeAssetsMacOS({
128128
workingDirectory: projectUri,
129129
includeParentEnvironment: true,
130130
cCompilerConfig: await buildRunner.cCompilerConfig,
131+
// TODO(dcharkes): Fetch minimum MacOS version from somewhere. https://github.com/flutter/flutter/issues/145104
132+
targetMacOSVersion: 13,
131133
);
132134
ensureNativeAssetsBuildSucceed(buildResult);
133135
nativeAssets.addAll(buildResult.assets);
@@ -140,6 +142,8 @@ Future<(Uri? nativeAssetsYaml, List<Uri> dependencies)> buildNativeAssetsMacOS({
140142
includeParentEnvironment: true,
141143
cCompilerConfig: await buildRunner.cCompilerConfig,
142144
buildResult: buildResult,
145+
// TODO(dcharkes): Fetch minimum MacOS version from somewhere. https://github.com/flutter/flutter/issues/145104
146+
targetMacOSVersion: 13,
143147
);
144148
ensureNativeAssetsLinkSucceed(linkResult);
145149
nativeAssets.addAll(linkResult.assets);

packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ abstract class NativeAssetsBuildRunner {
6161
required Uri workingDirectory,
6262
CCompilerConfigImpl? cCompilerConfig,
6363
int? targetAndroidNdkApi,
64+
int? targetIOSVersion,
65+
int? targetMacOSVersion,
6466
IOSSdkImpl? targetIOSSdkImpl,
6567
});
6668

@@ -83,6 +85,8 @@ abstract class NativeAssetsBuildRunner {
8385
required BuildResult buildResult,
8486
CCompilerConfigImpl? cCompilerConfig,
8587
int? targetAndroidNdkApi,
88+
int? targetIOSVersion,
89+
int? targetMacOSVersion,
8690
IOSSdkImpl? targetIOSSdkImpl,
8791
});
8892

@@ -176,6 +180,8 @@ class NativeAssetsBuildRunnerImpl implements NativeAssetsBuildRunner {
176180
required Target target,
177181
required Uri workingDirectory,
178182
CCompilerConfigImpl? cCompilerConfig,
183+
int? targetIOSVersion,
184+
int? targetMacOSVersion,
179185
int? targetAndroidNdkApi,
180186
IOSSdkImpl? targetIOSSdkImpl,
181187
}) {
@@ -193,6 +199,8 @@ class NativeAssetsBuildRunnerImpl implements NativeAssetsBuildRunner {
193199
targetIOSSdk: targetIOSSdkImpl,
194200
workingDirectory: workingDirectory,
195201
packageLayout: packageLayout,
202+
targetIOSVersion: targetIOSVersion,
203+
targetMacOSVersion: targetMacOSVersion,
196204
);
197205
}
198206

@@ -229,6 +237,8 @@ class NativeAssetsBuildRunnerImpl implements NativeAssetsBuildRunner {
229237
required BuildResult buildResult,
230238
CCompilerConfigImpl? cCompilerConfig,
231239
int? targetAndroidNdkApi,
240+
int? targetIOSVersion,
241+
int? targetMacOSVersion,
232242
IOSSdkImpl? targetIOSSdkImpl,
233243
}) {
234244
final PackageLayout packageLayout = PackageLayout.fromPackageConfig(
@@ -246,6 +256,8 @@ class NativeAssetsBuildRunnerImpl implements NativeAssetsBuildRunner {
246256
workingDirectory: workingDirectory,
247257
packageLayout: packageLayout,
248258
buildResult: buildResult,
259+
targetIOSVersion: targetIOSVersion,
260+
targetMacOSVersion: targetMacOSVersion,
249261
);
250262
}
251263

packages/flutter_tools/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ dependencies:
5656

5757
cli_config: 0.2.0
5858
graphs: 2.3.1
59-
native_assets_builder: 0.7.0
60-
native_assets_cli: 0.6.0
59+
native_assets_builder: 0.7.1
60+
native_assets_cli: 0.6.1
6161

6262
# We depend on very specific internal implementation details of the
6363
# 'test' package, which change between versions, so when upgrading
@@ -120,4 +120,4 @@ dartdoc:
120120
# Exclude this package from the hosted API docs.
121121
nodoc: true
122122

123-
# PUBSPEC CHECKSUM: f5a9
123+
# PUBSPEC CHECKSUM: 90ab

packages/flutter_tools/templates/package_ffi/hook/build.dart.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ void main(List<String> args) async {
1616
dartBuildFiles: ['hook/build.dart'],
1717
);
1818
await cbuilder.run(
19-
buildConfig: config,
20-
buildOutput: output,
19+
config: config,
20+
output: output,
2121
logger: Logger('')
2222
..level = Level.ALL
2323
..onRecord.listen((record) => print(record.message)),

packages/flutter_tools/templates/package_ffi/pubspec.yaml.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ environment:
99
dependencies:
1010
cli_config: ^0.2.0
1111
logging: ^1.2.0
12-
native_assets_cli: ^0.6.0
13-
native_toolchain_c: ^0.4.2
12+
native_assets_cli: ^0.6.1
13+
native_toolchain_c: ^0.5.0
1414

1515
dev_dependencies:
1616
ffi: ^2.1.2

packages/flutter_tools/test/general.shard/isolated/fake_native_assets_build_runner.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ class FakeNativeAssetsBuildRunner implements NativeAssetsBuildRunner {
5656
required Uri workingDirectory,
5757
CCompilerConfigImpl? cCompilerConfig,
5858
int? targetAndroidNdkApi,
59+
int? targetIOSVersion,
60+
int? targetMacOSVersion,
5961
IOSSdkImpl? targetIOSSdkImpl,
6062
}) async {
6163
buildInvocations++;
@@ -73,6 +75,8 @@ class FakeNativeAssetsBuildRunner implements NativeAssetsBuildRunner {
7375
required native_assets_builder.BuildResult buildResult,
7476
CCompilerConfigImpl? cCompilerConfig,
7577
int? targetAndroidNdkApi,
78+
int? targetIOSVersion,
79+
int? targetMacOSVersion,
7680
IOSSdkImpl? targetIOSSdkImpl,
7781
}) async {
7882
linkInvocations++;

0 commit comments

Comments
 (0)