Skip to content

Commit d18ce92

Browse files
Merge pull request #290 from cleandart/fix-ci-format-step
Format on Dart 2.10.4, only check formatting on stable runs
2 parents 1cebe7f + 5dafc5e commit d18ce92

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.travis.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
language: dart
22

33
dart:
4+
# We need 2.9.2 to verify the Chrome MemoryInfo workaround: https://github.com/cleandart/react-dart/pull/280
5+
# TODO remove the workaround as well as this config once SDK lower bound is >=2.9.3
46
- 2.9.2
57
- stable
68
- dev
@@ -14,7 +16,7 @@ cache:
1416
before_script:
1517
- dartanalyzer .
1618
- |
17-
if [ "$TRAVIS_DART_VERSION" != "dev" ]; then
19+
if [ "$TRAVIS_DART_VERSION" == "stable" ]; then
1820
dartfmt --line-length=120 --dry-run --set-exit-if-changed .
1921
fi
2022
- pub run dependency_validator -i build_runner,build_test,build_web_compilers

test/lifecycle_test/util.dart

+5-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ mixin LifecycleTestHelper on Component {
4040
'context': context,
4141
});
4242

43-
var lifecycleCallback = props == null ? staticProps == null ? null : staticProps[memberName] : props[memberName];
43+
var lifecycleCallback = props == null
44+
? staticProps == null
45+
? null
46+
: staticProps[memberName]
47+
: props[memberName];
4448
if (lifecycleCallback != null) {
4549
return Function.apply(
4650
lifecycleCallback,

0 commit comments

Comments
 (0)