Skip to content

Commit 59a519f

Browse files
authored
[objective_c] Publish v9.2.0 (#2815)
1 parent c134d74 commit 59a519f

File tree

3 files changed

+24
-7
lines changed

3 files changed

+24
-7
lines changed

pkgs/ffigen/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# BSD-style license that can be found in the LICENSE file.
44

55
name: ffigen
6-
version: 20.1.1-dev
6+
version: 20.1.1
77
description: >
88
Generator for FFI bindings, using LibClang to parse C, Objective-C, and Swift
99
files.

pkgs/objective_c/hook/build.dart

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ void main(List<String> args) async {
4141
final packageName = input.packageName;
4242
final assetPath = input.outputDirectory.resolve(assetName);
4343
final srcDir = Directory.fromUri(input.packageRoot.resolve('src/'));
44-
45-
final arch = input.config.code.targetArchitecture;
46-
final target = '${clangArchName(arch)}-apple-${os.name}';
44+
final target = toTargetTriple(input.config.code);
4745

4846
final cFiles = <String>[];
4947
final mFiles = <String>[];
@@ -148,5 +146,24 @@ String firstLineOfStdout(String cmd, List<String> args) {
148146
.first;
149147
}
150148

151-
String clangArchName(Architecture arch) =>
152-
arch == Architecture.x64 ? 'x86_64' : arch.name;
149+
String toTargetTriple(CodeConfig codeConfig) {
150+
final architecture = codeConfig.targetArchitecture;
151+
if (codeConfig.targetOS == OS.iOS) {
152+
return appleClangIosTargetFlags[architecture]![codeConfig.iOS.targetSdk]!;
153+
}
154+
assert(codeConfig.targetOS == OS.macOS);
155+
return appleClangMacosTargetFlags[architecture]!;
156+
}
157+
158+
const appleClangMacosTargetFlags = {
159+
Architecture.arm64: 'arm64-apple-darwin',
160+
Architecture.x64: 'x86_64-apple-darwin',
161+
};
162+
163+
const appleClangIosTargetFlags = {
164+
Architecture.arm64: {
165+
IOSSdk.iPhoneOS: 'arm64-apple-ios',
166+
IOSSdk.iPhoneSimulator: 'arm64-apple-ios-simulator',
167+
},
168+
Architecture.x64: {IOSSdk.iPhoneSimulator: 'x86_64-apple-ios-simulator'},
169+
};

pkgs/objective_c/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
name: objective_c
66
description: 'A library to access Objective C from Flutter that acts as a support library for package:ffigen.'
7-
version: 9.2.0-dev
7+
version: 9.2.0
88
repository: https://github.com/dart-lang/native/tree/main/pkgs/objective_c
99
issue_tracker: https://github.com/dart-lang/native/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Aobjective_c
1010

0 commit comments

Comments
 (0)