Skip to content

Commit 52fc301

Browse files
committed
Merge remote-tracking branch 'upstream/release/1.0.28' into dio-1.0.28
2 parents 87adeca + 056ae2a commit 52fc301

File tree

5 files changed

+5
-177
lines changed

5 files changed

+5
-177
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ dart:
66

77
install:
88
- git clone https://github.com/flutter/flutter.git -b stable --depth 1
9-
- export PATH=./flutter/bin:$PATH
9+
- export PATH=~/build/parse-community/Parse-SDK-Flutter/flutter/bin:$PATH
1010
- flutter doctor
1111

1212
script:
13-
- (cd packages/dart && dart pub get)
14-
- (cd packages/dart && dart test test/)
13+
- (cd packages/dart && pub get)
14+
- (cd packages/dart && pub run test)
1515
- (cd packages/flutter && flutter pub get)
1616
- (cd packages/flutter && flutter test --no-pub test/)
1717

example/.vscode/launch.json

Lines changed: 0 additions & 11 deletions
This file was deleted.
-52.4 KB
Binary file not shown.

example/android/gradlew

Lines changed: 0 additions & 160 deletions
This file was deleted.

packages/flutter/lib/parse_server_sdk.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,8 @@ class Parse extends sdk.Parse
9191
parseUserConstructor: parseUserConstructor,
9292
parseFileConstructor: parseFileConstructor,
9393
connectivityProvider: connectivityProvider ?? this,
94-
fileDirectory: fileDirectory ?? !sdk.parseIsWeb
95-
? (await getTemporaryDirectory()).path
96-
: null,
94+
fileDirectory: fileDirectory ??
95+
(!sdk.parseIsWeb ? (await getTemporaryDirectory()).path : null),
9796
appResumedStream: appResumedStream ?? _appResumedStreamController.stream,
9897
);
9998
}

0 commit comments

Comments
 (0)