Skip to content

Commit 389489d

Browse files
committed
fix: ambiguous ios/arm64 and iossilumator/arm64, bump dep versions
1 parent 2bbb600 commit 389489d

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

.github/workflows/examples.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
jobs:
1515
windows:
1616
name: windows
17-
runs-on: windows-2019
17+
runs-on: windows-2022
1818
steps:
1919
- uses: actions/checkout@v4
2020
- uses: subosito/flutter-action@v2

lib/src/builder/builder.dart

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,13 @@ class CMakeBuilder implements Builder {
207207
}) async {
208208
// do not override user specified output directory if they also set buildLocal to true
209209
if (outDir == null && buildLocal) {
210-
final plat = input.config.code.targetOS.name.toLowerCase();
210+
final os = input.config.code.targetOS;
211+
final iosSdk = input.config.code.iOS.targetSdk;
212+
var plat = os.name.toLowerCase();
213+
// ios-simulator has both x86_64 and arm64, ios/arm64 is ambiguous
214+
if (os == OS.iOS && iosSdk == IOSSdk.iPhoneSimulator) {
215+
plat = "iossimulator";
216+
}
211217
final arch = input.config.code.targetArchitecture.name.toLowerCase();
212218
outDir = sourceDir.resolve('build/').resolve('$plat/').resolve(arch).normalizePath();
213219
}

pubspec.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: native_toolchain_cmake
22
description: >-
33
A library to invoke and build CMake projects for Dart Native Assets.
4-
version: 0.0.6-dev.0
4+
version: 0.0.6-dev.1
55
repository: https://github.com/rainyl/native_toolchain_cmake
66

77
topics:
@@ -15,13 +15,13 @@ environment:
1515

1616
dependencies:
1717
change_case: ^2.2.0
18-
code_assets: ^0.19.0
19-
glob: ^2.1.1
20-
hooks: ^0.19.0
21-
logging: ^1.1.1
22-
meta: ^1.9.1
18+
code_assets: ^0.19.4
19+
glob: ^2.1.3
20+
hooks: ^0.19.5
21+
logging: ^1.3.0
22+
meta: ^1.16.0
2323
path: ^1.9.1
24-
pub_semver: ^2.1.5
24+
pub_semver: ^2.2.0
2525

2626
dev_dependencies:
2727
collection: ^1.19.1

0 commit comments

Comments
 (0)