Skip to content

Commit 7128f5a

Browse files
authored
chore(examples): Update tasks example (#262)
1 parent ce91691 commit 7128f5a

File tree

22 files changed

+85
-104
lines changed

22 files changed

+85
-104
lines changed

.github/workflows/examples.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ jobs:
2929
- name: Setup Melos
3030
run: dart pub global activate melos
3131
- name: Get Packages
32-
run: melos exec -c 1 --dir-exists=celest -- flutter pub get
32+
run: |
33+
melos exec -c 1 --dir-exists=celest -- flutter pub get
34+
melos exec --dir-exists=celest -- dart pub get -C celest
35+
melos exec --dir-exists=celest -- dart pub get -C celest/client
3336
- name: Analyze
3437
run: melos exec -c 1 --dir-exists=celest -- flutter analyze --fatal-infos --fatal-warnings
3538
- name: Format

examples/tasks/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
*.swp
66
.DS_Store
77
.atom/
8+
.build/
89
.buildlog/
910
.history
1011
.svn/
12+
.swiftpm/
1113
migrate_working_dir/
1214

1315
# IntelliJ related

examples/tasks/android/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ gradle-wrapper.jar
55
/gradlew.bat
66
/local.properties
77
GeneratedPluginRegistrant.java
8+
.cxx/
89

910
# Remember to never publicly share your keystore.
1011
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app

examples/tasks/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.7.10'
2+
ext.kotlin_version = '1.8.10'
33
repositories {
44
google()
55
mavenCentral()

examples/tasks/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip

examples/tasks/android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pluginManagement {
2323

2424
plugins {
2525
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
26-
id "com.android.application" version "7.3.0" apply false
26+
id "com.android.application" version "8.5.1" apply false
2727
}
2828

2929
include ":app"

examples/tasks/celest/client/lib/src/functions.dart

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,9 @@ import 'package:drift/src/remote/communication.dart' as _$drift_communication;
2020
import 'package:drift/src/runtime/cancellation_zone.dart'
2121
as _$drift_cancellation_zone;
2222
import 'package:drift/src/runtime/exceptions.dart' as _$drift_exceptions;
23-
import 'package:google_cloud/src/bad_configuration_exception.dart'
24-
as _$google_cloud_bad_configuration_exception;
25-
import 'package:google_cloud/src/bad_request_exception.dart'
26-
as _$google_cloud_bad_request_exception;
2723
import 'package:hrana/src/exception.dart' as _$hrana_exception;
2824
import 'package:http/src/exception.dart' as _$http_exception;
25+
import 'package:path/src/path_exception.dart' as _$path_path_exception;
2926
import 'package:shelf/src/hijack_exception.dart' as _$shelf_hijack_exception;
3027
import 'package:sqlite3/src/exception.dart' as _$sqlite3_exception;
3128
import 'package:sqlite3/src/vfs.dart' as _$sqlite3_vfs;
@@ -379,20 +376,6 @@ class CelestFunctionsTasks {
379376
.deserialize<IsolateSpawnException>(errorValue),
380377
stackTrace,
381378
);
382-
case 'google_cloud.BadConfigurationException':
383-
Error.throwWithStackTrace(
384-
_$celest.Serializers.instance.deserialize<
385-
_$google_cloud_bad_configuration_exception
386-
.BadConfigurationException>(errorValue),
387-
stackTrace,
388-
);
389-
case 'google_cloud.BadRequestException':
390-
Error.throwWithStackTrace(
391-
_$celest.Serializers.instance.deserialize<
392-
_$google_cloud_bad_request_exception
393-
.BadRequestException>(errorValue),
394-
stackTrace,
395-
);
396379
case 'http.ClientException':
397380
Error.throwWithStackTrace(
398381
_$celest.Serializers.instance
@@ -419,17 +402,23 @@ class CelestFunctionsTasks {
419402
errorValue),
420403
stackTrace,
421404
);
405+
case 'sqlite3.VfsException':
406+
Error.throwWithStackTrace(
407+
_$celest.Serializers.instance
408+
.deserialize<_$sqlite3_vfs.VfsException>(errorValue),
409+
stackTrace,
410+
);
422411
case 'drift.ConnectionClosedException':
423412
Error.throwWithStackTrace(
424413
_$celest.Serializers.instance
425414
.deserialize<_$drift_communication.ConnectionClosedException>(
426415
errorValue),
427416
stackTrace,
428417
);
429-
case 'sqlite3.VfsException':
418+
case 'path.PathException':
430419
Error.throwWithStackTrace(
431420
_$celest.Serializers.instance
432-
.deserialize<_$sqlite3_vfs.VfsException>(errorValue),
421+
.deserialize<_$path_path_exception.PathException>(errorValue),
433422
stackTrace,
434423
);
435424
case 'hrana.ConnectionClosed':

examples/tasks/celest/client/lib/src/serializers.dart

Lines changed: 19 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,9 @@ import 'package:drift/src/remote/communication.dart' as _$drift_communication;
1717
import 'package:drift/src/runtime/cancellation_zone.dart'
1818
as _$drift_cancellation_zone;
1919
import 'package:drift/src/runtime/exceptions.dart' as _$drift_exceptions;
20-
import 'package:google_cloud/src/bad_configuration_exception.dart'
21-
as _$google_cloud_bad_configuration_exception;
22-
import 'package:google_cloud/src/bad_request_exception.dart'
23-
as _$google_cloud_bad_request_exception;
2420
import 'package:hrana/src/exception.dart' as _$hrana_exception;
2521
import 'package:http/src/exception.dart' as _$http_exception;
22+
import 'package:path/src/path_exception.dart' as _$path_path_exception;
2623
import 'package:shelf/src/hijack_exception.dart' as _$shelf_hijack_exception;
2724
import 'package:sqlite3/src/exception.dart' as _$sqlite3_exception;
2825
import 'package:sqlite3/src/vfs.dart' as _$sqlite3_vfs;
@@ -455,10 +452,16 @@ void initSerializers({_$celest.Serializers? serializers}) {
455452
));
456453
_$celest.Serializers.instance.put(
457454
_$celest.Serializer.define<WebSocketException, Map<String, Object?>?>(
458-
serialize: ($value) => <String, Object?>{r'message': $value.message},
455+
serialize: ($value) => <String, Object?>{
456+
r'message': $value.message,
457+
if ($value.httpStatusCode case final httpStatusCode?)
458+
r'httpStatusCode': httpStatusCode,
459+
},
459460
deserialize: ($serialized) {
460461
return WebSocketException(
461-
(($serialized?[r'message'] as String?)) ?? '');
462+
(($serialized?[r'message'] as String?)) ?? '',
463+
($serialized?[r'httpStatusCode'] as num?)?.toInt(),
464+
);
462465
},
463466
));
464467
_$celest.Serializers.instance.put(_$celest.Serializer.define<
@@ -950,44 +953,6 @@ void initSerializers({_$celest.Serializers? serializers}) {
950953
);
951954
},
952955
));
953-
_$celest.Serializers.instance.put(_$celest.Serializer.define<
954-
_$google_cloud_bad_configuration_exception.BadConfigurationException,
955-
Map<String, Object?>>(
956-
serialize: ($value) => <String, Object?>{
957-
r'message': $value.message,
958-
if ($value.details case final details?) r'details': details,
959-
},
960-
deserialize: ($serialized) {
961-
return _$google_cloud_bad_configuration_exception
962-
.BadConfigurationException(
963-
($serialized[r'message'] as String),
964-
details: ($serialized[r'details'] as String?),
965-
);
966-
},
967-
));
968-
_$celest.Serializers.instance.put(_$celest.Serializer.define<
969-
_$google_cloud_bad_request_exception.BadRequestException,
970-
Map<String, Object?>>(
971-
serialize: ($value) => <String, Object?>{
972-
r'statusCode': $value.statusCode,
973-
r'message': $value.message,
974-
if ($value.innerError case final innerError?)
975-
r'innerError': innerError,
976-
if (_$celest.Serializers.instance
977-
.serialize<StackTrace?>($value.innerStack)
978-
case final innerStack?)
979-
r'innerStack': innerStack,
980-
},
981-
deserialize: ($serialized) {
982-
return _$google_cloud_bad_request_exception.BadRequestException(
983-
($serialized[r'statusCode'] as num).toInt(),
984-
($serialized[r'message'] as String),
985-
innerError: $serialized[r'innerError'],
986-
innerStack: _$celest.Serializers.instance
987-
.deserialize<StackTrace?>($serialized[r'innerStack']),
988-
);
989-
},
990-
));
991956
_$celest.Serializers.instance.put(_$celest.Serializer.define<
992957
_$hrana_exception.ConnectionClosed, Map<String, Object?>?>(
993958
serialize: ($value) => const <String, Object?>{},
@@ -1024,6 +989,14 @@ void initSerializers({_$celest.Serializers? serializers}) {
1024989
);
1025990
},
1026991
));
992+
_$celest.Serializers.instance.put(_$celest.Serializer.define<
993+
_$path_path_exception.PathException, Map<String, Object?>>(
994+
serialize: ($value) => <String, Object?>{r'message': $value.message},
995+
deserialize: ($serialized) {
996+
return _$path_path_exception.PathException(
997+
($serialized[r'message'] as String));
998+
},
999+
));
10271000
_$celest.Serializers.instance.put(_$celest.Serializer.define<
10281001
_$shelf_hijack_exception.HijackException, Map<String, Object?>?>(
10291002
serialize: ($value) => const <String, Object?>{},
@@ -1039,6 +1012,7 @@ void initSerializers({_$celest.Serializers? serializers}) {
10391012
r'explanation': explanation,
10401013
r'extendedResultCode': $value.extendedResultCode,
10411014
r'resultCode': $value.resultCode,
1015+
if ($value.offset case final offset?) r'offset': offset,
10421016
if ($value.operation case final operation?) r'operation': operation,
10431017
if ($value.causingStatement case final causingStatement?)
10441018
r'causingStatement': causingStatement,
@@ -1054,6 +1028,7 @@ void initSerializers({_$celest.Serializers? serializers}) {
10541028
($serialized[r'parametersToStatement'] as Iterable<Object?>?)
10551029
?.toList(),
10561030
($serialized[r'operation'] as String?),
1031+
($serialized[r'offset'] as num?)?.toInt(),
10571032
);
10581033
},
10591034
));

examples/tasks/celest/client/lib/tasks_client.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import 'package:tasks_client/src/functions.dart';
1616
import 'package:tasks_client/src/serializers.dart';
1717

1818
export 'package:celest_backend/src/database/task_database.dart'
19-
show Task, Priority;
19+
show Priority, Task;
2020
export 'package:celest_backend/src/functions/tasks.dart' show ServerException;
2121

2222
final Celest celest = Celest();
@@ -26,8 +26,8 @@ enum CelestEnvironment {
2626

2727
Uri get baseUri => switch (this) {
2828
local => _$celest.kIsWeb || !Platform.isAndroid
29-
? Uri.parse('http://localhost:56903')
30-
: Uri.parse('http://10.0.2.2:56903'),
29+
? Uri.parse('http://localhost:53358')
30+
: Uri.parse('http://10.0.2.2:53358'),
3131
};
3232
}
3333

examples/tasks/celest/client/pubspec.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: The Celest client for todo.
33
publish_to: none
44

55
environment:
6-
sdk: ^3.4.0
6+
sdk: ^3.5.0
77

88
dependencies:
99
celest: ^1.0.0
@@ -24,4 +24,6 @@ dependency_overrides:
2424
path: ../../../../packages/celest_cloud
2525
celest_core:
2626
path: ../../../../packages/celest_core
27-
dev_dependencies: {}
27+
dev_dependencies:
28+
lints: ^5.0.0
29+
test: ^1.25.0

0 commit comments

Comments
 (0)