Skip to content

Commit 9db69d9

Browse files
authored
fix: updated close logic for isolates (#72)
* fix: updated close logic for isolate spawn * better error handling * add cause prefix * fix: windows tests * fix: using api 29 for android * chore: updated xcode assets * fix: disable cache android * fix: no impeller for ios and macos * chore: updated xcode assets
1 parent 1686db5 commit 9db69d9

File tree

17 files changed

+132
-106
lines changed

17 files changed

+132
-106
lines changed

.github/workflows/tests_android.yml

+2-24
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,6 @@ jobs:
1212
runs-on: macos-13
1313
steps:
1414
- uses: actions/checkout@v3
15-
- uses: actions/cache@v3
16-
with:
17-
path: |
18-
~/.gradle/caches
19-
~/.gradle/wrapper
20-
key: gradle-android
21-
- uses: actions/cache@v3
22-
id: avd-cache
23-
with:
24-
path: |
25-
~/.android/avd/*
26-
~/.android/adb*
27-
key: avd-android
2815
- uses: actions/setup-java@v3
2916
with:
3017
distribution: 'temurin'
@@ -35,19 +22,10 @@ jobs:
3522
flutter-version: '3.x'
3623
channel: 'stable'
3724
- run: flutter pub get
38-
- if: steps.avd-cache.outputs.cache-hit != 'true'
39-
uses: reactivecircus/android-emulator-runner@v2
40-
with:
41-
api-level: 30
42-
avd-name: PhoneAPI30
43-
force-avd-creation: false
44-
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
45-
disable-animations: false
46-
script: echo "Generated AVD snapshot for caching."
4725
- uses: reactivecircus/android-emulator-runner@v2
4826
with:
49-
api-level: 30
50-
avd-name: PhoneAPI30
27+
api-level: 29
28+
avd-name: PhoneAPI29
5129
force-avd-creation: false
5230
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
5331
disable-animations: true

.github/workflows/tests_ios.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ jobs:
2323
run: |
2424
flutter pub get
2525
cd example/ios && pod install
26-
- run: "cd example && flutter test --verbose integration_test/app_test.dart"
26+
- run: "cd example && flutter test --verbose --no-enable-impeller integration_test/app_test.dart"

.github/workflows/tests_macos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ jobs:
2121
flutter config --enable-macos-desktop
2222
flutter pub get
2323
cd example/macos && pod install
24-
- run: "cd example && flutter test --verbose -d macos integration_test/app_test.dart"
24+
- run: "cd example && flutter test --verbose --no-enable-impeller -d macos integration_test/app_test.dart"
2525
- run: "cd example && flutter test --verbose test/app_test.dart"

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 3.6.3
2+
- Updated Isolate spawn logic to close gracefully
3+
14
## 3.6.2
25
- Add Android namespace, thanks to @nilsreichardt
36

example/ios/Flutter/AppFrameworkInfo.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>11.0</string>
24+
<string>12.0</string>
2525
</dict>
2626
</plist>

example/ios/Podfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '11.0'
2+
# platform :ios, '12.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

example/ios/Podfile.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ EXTERNAL SOURCES:
2020

2121
SPEC CHECKSUMS:
2222
fast_rsa: 514f0e9ecb93c6222fe4cb61e20a3d7125e734d1
23-
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
24-
integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5
23+
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
24+
integration_test: ce0a3ffa1de96d1a89ca0ac26fca7ea18a749ef4
2525

26-
PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
26+
PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011
2727

28-
COCOAPODS: 1.11.3
28+
COCOAPODS: 1.14.3

example/ios/Runner.xcodeproj/project.pbxproj

+5-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 51;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -155,7 +155,7 @@
155155
97C146E61CF9000F007C117D /* Project object */ = {
156156
isa = PBXProject;
157157
attributes = {
158-
LastUpgradeCheck = 1300;
158+
LastUpgradeCheck = 1510;
159159
ORGANIZATIONNAME = "";
160160
TargetAttributes = {
161161
97C146ED1CF9000F007C117D = {
@@ -199,10 +199,12 @@
199199
/* Begin PBXShellScriptBuildPhase section */
200200
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
201201
isa = PBXShellScriptBuildPhase;
202+
alwaysOutOfDate = 1;
202203
buildActionMask = 2147483647;
203204
files = (
204205
);
205206
inputPaths = (
207+
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
206208
);
207209
name = "Thin Binary";
208210
outputPaths = (
@@ -213,6 +215,7 @@
213215
};
214216
9740EEB61CF901F6004384FC /* Run Script */ = {
215217
isa = PBXShellScriptBuildPhase;
218+
alwaysOutOfDate = 1;
216219
buildActionMask = 2147483647;
217220
files = (
218221
);

example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

example/ios/Runner/Info.plist

+2
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,7 @@
4343
<false/>
4444
<key>CADisableMinimumFrameDurationOnPhone</key>
4545
<true/>
46+
<key>UIApplicationSupportsIndirectInputEvents</key>
47+
<true/>
4648
</dict>
4749
</plist>

example/macos/Podfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ SPEC CHECKSUMS:
1919

2020
PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7
2121

22-
COCOAPODS: 1.12.1
22+
COCOAPODS: 1.14.3

example/macos/Runner.xcodeproj/project.pbxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
isa = PBXProject;
204204
attributes = {
205205
LastSwiftUpdateCheck = 0920;
206-
LastUpgradeCheck = 1300;
206+
LastUpgradeCheck = 1510;
207207
ORGANIZATIONNAME = "The Flutter Authors";
208208
TargetAttributes = {
209209
33CC10EC2044A3C60003C045 = {

example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)