Skip to content

Commit aa369c0

Browse files
fix: dart format
1 parent 111884a commit aa369c0

File tree

3 files changed

+86
-63
lines changed

3 files changed

+86
-63
lines changed

.circleci/config.yml

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ orbs:
55
flutter: circleci/[email protected]
66
node: circleci/[email protected]
77
advanced-checkout: vsco/[email protected]
8+
ios: circleci/[email protected]
89

910
commands:
1011
setup_flutter:
@@ -90,9 +91,18 @@ jobs:
9091
steps:
9192
- advanced-checkout/shallow-checkout
9293
- run:
93-
name: Remove `patrol:` from example/pubspec.yaml
94+
name: Remove `patrol:` from dev_dependencies in example/pubspec.yaml
9495
command: |
95-
sed -i.bak '/^\s*patrol:/d' example/pubspec.yaml
96+
awk '
97+
BEGIN { inside_dev_deps = 0 }
98+
/^\s*dev_dependencies:/ { inside_dev_deps = 1; print; next }
99+
/^\s*\S+:/ && inside_dev_deps && !/^ *patrol:/ {
100+
inside_dev_deps = 0
101+
}
102+
inside_dev_deps && /^\s*patrol:/ { next }
103+
{ print }
104+
' example/pubspec.yaml > example/pubspec.cleaned.yaml
105+
mv example/pubspec.cleaned.yaml example/pubspec.yaml
96106
- install_flutter_and_dart_packages:
97107
generate_pigeons: true
98108
- run: flutter test --coverage
@@ -126,10 +136,9 @@ jobs:
126136
- setup_flutter
127137
- setup_patrol
128138
- android/start-emulator-and-run-tests:
129-
run-tests-working-directory: example
130139
additional-avd-args: --device 3
131140
system-image: system-images;android-33;default;x86_64
132-
test-command: patrol test -t integration_test/ --verbose
141+
test-command: cd example && patrol test -t integration_test/ --verbose
133142

134143
test_ios:
135144
macos:
@@ -161,21 +170,8 @@ jobs:
161170
- advanced-checkout/shallow-checkout
162171
- setup_ios
163172
- setup_patrol
164-
- run:
165-
name: Boot First Available Simulator and Print Info
166-
command: |
167-
# Find the first available shutdown simulator
168-
SIM_LINE=$(xcrun simctl list devices available | grep -m1 "Shutdown")
169-
SIM_NAME=$(echo "$SIM_LINE" | awk -F '[()]' '{print $1}' | xargs)
170-
DEVICE_ID=$(echo "$SIM_LINE" | awk -F '[()]' '{print $2}')
171-
172-
echo "Booting simulator: $SIM_NAME ($DEVICE_ID)"
173-
xcrun simctl boot "$DEVICE_ID"
174-
175-
sleep 10
176-
177-
# Confirm booted device
178-
xcrun simctl list | grep "$DEVICE_ID"
173+
- ios/preboot-simulator
174+
- ios/wait-until-simulator-booted
179175
- run:
180176
name: Run E2E Tests
181177
no_output_timeout: 30m

example/pubspec.lock

Lines changed: 71 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
11
# Generated by pub
22
# See https://dart.dev/tools/pub/glossary#lockfile
33
packages:
4+
archive:
5+
dependency: transitive
6+
description:
7+
name: archive
8+
sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
9+
url: "https://pub.dev"
10+
source: hosted
11+
version: "3.6.1"
12+
args:
13+
dependency: transitive
14+
description:
15+
name: args
16+
sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
17+
url: "https://pub.dev"
18+
source: hosted
19+
version: "2.7.0"
420
async:
521
dependency: transitive
622
description:
@@ -41,22 +57,14 @@ packages:
4157
url: "https://pub.dev"
4258
source: hosted
4359
version: "1.19.0"
44-
dispose_scope:
45-
dependency: transitive
46-
description:
47-
name: dispose_scope
48-
sha256: "48ec38ca2631c53c4f8fa96b294c801e55c335db5e3fb9f82cede150cfe5a2af"
49-
url: "https://pub.dev"
50-
source: hosted
51-
version: "2.1.0"
52-
equatable:
60+
crypto:
5361
dependency: transitive
5462
description:
55-
name: equatable
56-
sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
63+
name: crypto
64+
sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
5765
url: "https://pub.dev"
5866
source: hosted
59-
version: "2.0.7"
67+
version: "3.0.6"
6068
fake_async:
6169
dependency: transitive
6270
description:
@@ -73,6 +81,14 @@ packages:
7381
url: "https://pub.dev"
7482
source: hosted
7583
version: "7.0.0"
84+
fixnum:
85+
dependency: transitive
86+
description:
87+
name: fixnum
88+
sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
89+
url: "https://pub.dev"
90+
source: hosted
91+
version: "1.1.1"
7692
flutter:
7793
dependency: "direct main"
7894
description: flutter
@@ -101,14 +117,38 @@ packages:
101117
description: flutter
102118
source: sdk
103119
version: "0.0.0"
120+
googleapis_auth:
121+
dependency: transitive
122+
description:
123+
name: googleapis_auth
124+
sha256: af7c3a3edf9d0de2e1e0a77e994fae0a581c525fa7012af4fa0d4a52ed9484da
125+
url: "https://pub.dev"
126+
source: hosted
127+
version: "1.4.1"
128+
grpc:
129+
dependency: transitive
130+
description:
131+
name: grpc
132+
sha256: e93ee3bce45c134bf44e9728119102358c7cd69de7832d9a874e2e74eb8cab40
133+
url: "https://pub.dev"
134+
source: hosted
135+
version: "3.2.4"
104136
http:
105-
dependency: "direct main"
137+
dependency: transitive
106138
description:
107139
name: http
108-
sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
140+
sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
109141
url: "https://pub.dev"
110142
source: hosted
111-
version: "1.1.0"
143+
version: "0.13.6"
144+
http2:
145+
dependency: transitive
146+
description:
147+
name: http2
148+
sha256: "382d3aefc5bd6dc68c6b892d7664f29b5beb3251611ae946a98d35158a82bbfa"
149+
url: "https://pub.dev"
150+
source: hosted
151+
version: "2.3.1"
112152
http_parser:
113153
dependency: transitive
114154
description:
@@ -132,14 +172,19 @@ packages:
132172
url: "https://pub.dev"
133173
source: hosted
134174
version: "2.4.0"
135-
json_annotation:
175+
integration_test:
176+
dependency: transitive
177+
description: flutter
178+
source: sdk
179+
version: "0.0.0"
180+
js:
136181
dependency: transitive
137182
description:
138-
name: json_annotation
139-
sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
183+
name: js
184+
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
140185
url: "https://pub.dev"
141186
source: hosted
142-
version: "4.9.0"
187+
version: "0.6.7"
143188
leak_tracker:
144189
dependency: transitive
145190
description:
@@ -208,26 +253,10 @@ packages:
208253
dependency: "direct dev"
209254
description:
210255
name: patrol
211-
sha256: "254493e63a7307ee6080c2f6ab649f4dca404a9871d9b98d473563127c18823b"
212-
url: "https://pub.dev"
213-
source: hosted
214-
version: "3.15.2"
215-
patrol_finders:
216-
dependency: transitive
217-
description:
218-
name: patrol_finders
219-
sha256: "8787f9d5c3417b72e8959a55ad51c024cc0594d15e5db85bc179c4d8faa0c493"
220-
url: "https://pub.dev"
221-
source: hosted
222-
version: "2.7.2"
223-
patrol_log:
224-
dependency: transitive
225-
description:
226-
name: patrol_log
227-
sha256: "98b2701400c7a00b11533ab942bdeb44c3c714746e7cdb12e6cb93b6d06361da"
256+
sha256: a81546fbe25de76e9256e7340d1aa0e1603e6f7b0e4bb91b90a2e08e22992587
228257
url: "https://pub.dev"
229258
source: hosted
230-
version: "0.3.0"
259+
version: "1.1.0"
231260
platform:
232261
dependency: transitive
233262
description:
@@ -244,14 +273,14 @@ packages:
244273
url: "https://pub.dev"
245274
source: hosted
246275
version: "5.0.2"
247-
shelf:
276+
protobuf:
248277
dependency: transitive
249278
description:
250-
name: shelf
251-
sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
279+
name: protobuf
280+
sha256: "01dd9bd0fa02548bf2ceee13545d4a0ec6046459d847b6b061d8a27237108a08"
252281
url: "https://pub.dev"
253282
source: hosted
254-
version: "1.4.1"
283+
version: "2.1.0"
255284
sky_engine:
256285
dependency: transitive
257286
description: flutter
@@ -347,4 +376,4 @@ packages:
347376
version: "3.0.4"
348377
sdks:
349378
dart: ">=3.5.0 <4.0.0"
350-
flutter: ">=3.24.0"
379+
flutter: ">=3.18.0-18.0.pre.54"

example/pubspec.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ environment:
2323
dependencies:
2424
flutter:
2525
sdk: flutter
26-
http: ^0.13.0
2726
instabug_flutter:
2827
path: ../
2928
instabug_http_client: ^2.4.0
@@ -44,7 +43,6 @@ patrol:
4443
bundle_id: com.instabug.InstabugSample
4544

4645
dependency_overrides:
47-
http: 1.1.0
4846
instabug_flutter:
4947
path: ../
5048

0 commit comments

Comments
 (0)