Skip to content

Commit c3ce540

Browse files
authored
chore(serverpod_logging): Lower sdk constraint to 3.6, enable workspace, tweak ci, stop tracking pubspec.lock, format code (#119)
- lower the SDK floor to ^3.6.0, - pull the packages into the workspace, - stop tracking the root pubspec.lock, - reformat to 3.6 short style, - and tweak the CI matrix.
1 parent 048465e commit c3ce540

8 files changed

Lines changed: 79 additions & 691 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,13 @@ jobs:
4242
dart: [3.6, 3.12]
4343
package: [cli_tools, config, serverpod_logging]
4444
platform: [ubuntu-latest]
45-
exclude:
46-
- package: serverpod_logging
4745
include:
4846
- package: cli_tools
4947
platform: windows-latest
5048
dart: 3.6
5149
- package: cli_tools
5250
platform: macos-latest
5351
dart: 3.6
54-
- package: serverpod_logging
55-
dart: 3.10.3
56-
platform: ubuntu-latest
5752
runs-on: ${{ matrix.platform }}
5853
defaults:
5954
run:

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@
22

33
.idea/
44
*.iml
5+
6+
# Workspace of library packages; the root lockfile is regenerated by CI.
7+
pubspec.lock

‎packages/serverpod_logging/lib/src/log.dart‎

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -71,39 +71,39 @@ class Log {
7171
extension LogConvenience on Log {
7272
/// Logs [message] at [LogLevel.debug].
7373
void debug(String message, {Map<String, Object?>? metadata}) => this(
74-
LogLevel.debug,
75-
() => LogEntry(
76-
time: DateTime.now(),
77-
level: LogLevel.debug,
78-
message: message,
79-
scope: currentScope,
80-
metadata: metadata,
81-
),
82-
);
74+
LogLevel.debug,
75+
() => LogEntry(
76+
time: DateTime.now(),
77+
level: LogLevel.debug,
78+
message: message,
79+
scope: currentScope,
80+
metadata: metadata,
81+
),
82+
);
8383

8484
/// Logs [message] at [LogLevel.info].
8585
void info(String message, {Map<String, Object?>? metadata}) => this(
86-
LogLevel.info,
87-
() => LogEntry(
88-
time: DateTime.now(),
89-
level: LogLevel.info,
90-
message: message,
91-
scope: currentScope,
92-
metadata: metadata,
93-
),
94-
);
86+
LogLevel.info,
87+
() => LogEntry(
88+
time: DateTime.now(),
89+
level: LogLevel.info,
90+
message: message,
91+
scope: currentScope,
92+
metadata: metadata,
93+
),
94+
);
9595

9696
/// Logs [message] at [LogLevel.warning].
9797
void warning(String message, {Map<String, Object?>? metadata}) => this(
98-
LogLevel.warning,
99-
() => LogEntry(
100-
time: DateTime.now(),
101-
level: LogLevel.warning,
102-
message: message,
103-
scope: currentScope,
104-
metadata: metadata,
105-
),
106-
);
98+
LogLevel.warning,
99+
() => LogEntry(
100+
time: DateTime.now(),
101+
level: LogLevel.warning,
102+
message: message,
103+
scope: currentScope,
104+
metadata: metadata,
105+
),
106+
);
107107

108108
/// Logs [message] at [LogLevel.error], optionally attaching an [error]
109109
/// value and [stackTrace].
@@ -112,18 +112,19 @@ extension LogConvenience on Log {
112112
Object? error,
113113
StackTrace? stackTrace,
114114
Map<String, Object?>? metadata,
115-
}) => this(
116-
LogLevel.error,
117-
() => LogEntry(
118-
time: DateTime.now(),
119-
level: LogLevel.error,
120-
message: message,
121-
scope: currentScope,
122-
error: error,
123-
stackTrace: stackTrace,
124-
metadata: metadata,
125-
),
126-
);
115+
}) =>
116+
this(
117+
LogLevel.error,
118+
() => LogEntry(
119+
time: DateTime.now(),
120+
level: LogLevel.error,
121+
message: message,
122+
scope: currentScope,
123+
error: error,
124+
stackTrace: stackTrace,
125+
metadata: metadata,
126+
),
127+
);
127128

128129
/// Whether debug-level messages are currently forwarded to the writer.
129130
/// Use to gate expensive message construction:

‎packages/serverpod_logging/lib/src/log_types.dart‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,14 @@ class LogScope {
5858
required String id,
5959
required String label,
6060
Map<String, Object?>? metadata,
61-
}) => LogScope(
62-
id: id,
63-
label: label,
64-
startTime: DateTime.now(),
65-
parent: this,
66-
metadata: metadata,
67-
);
61+
}) =>
62+
LogScope(
63+
id: id,
64+
label: label,
65+
startTime: DateTime.now(),
66+
parent: this,
67+
metadata: metadata,
68+
);
6869
}
6970

7071
/// A single log entry. Always belongs to a [LogScope].
@@ -162,17 +163,18 @@ class MultiLogWriter extends LogWriter {
162163
required Duration duration,
163164
Object? error,
164165
StackTrace? stackTrace,
165-
}) => _writers
166-
.map(
167-
(w) => w.closeScope(
168-
scope,
169-
success: success,
170-
duration: duration,
171-
error: error,
172-
stackTrace: stackTrace,
173-
),
174-
)
175-
.wait;
166+
}) =>
167+
_writers
168+
.map(
169+
(w) => w.closeScope(
170+
scope,
171+
success: success,
172+
duration: duration,
173+
error: error,
174+
stackTrace: stackTrace,
175+
),
176+
)
177+
.wait;
176178

177179
@override
178180
Future<void> close() => _writers.map((w) => w.close()).wait;

‎packages/serverpod_logging/pubspec.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
name: serverpod_logging
22
description: Shared serverpod logging utilities.
3-
version: 0.0.1
3+
version: 0.1.0
44
repository: https://github.com/serverpod/serverpod
55
homepage: https://serverpod.dev
66
issue_tracker: https://github.com/serverpod/serverpod/issues
77

88
environment:
9-
sdk: ^3.10.3
9+
sdk: ^3.6.0
1010

11-
dependencies:
11+
resolution: workspace
12+
13+
dependencies:
1214
meta: ^1.15.0
1315

1416
dev_dependencies:

‎packages/serverpod_logging/test/log_progress_test.dart‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@ void main() {
1111
log = Log(writer);
1212
});
1313

14-
test('when the runner returns true, '
14+
test(
15+
'when the runner returns true, '
1516
'then the scope closes with success true', () async {
1617
await log.progress('op', () async => true);
1718

1819
expect(writer.closedScopes, hasLength(1));
1920
expect(writer.closedScopes.first.success, isTrue);
2021
});
2122

22-
test('when the runner returns false, '
23+
test(
24+
'when the runner returns false, '
2325
'then the scope closes with success false', () async {
2426
await log.progress('op', () async => false);
2527

@@ -37,14 +39,16 @@ void main() {
3739
log = Log(writer);
3840
});
3941

40-
test('when no isSuccess is provided, '
42+
test(
43+
'when no isSuccess is provided, '
4144
'then the scope closes with success true', () async {
4245
await log.progress<String>('op', () async => 'ok');
4346

4447
expect(writer.closedScopes.first.success, isTrue);
4548
});
4649

47-
test('when isSuccess is provided, '
50+
test(
51+
'when isSuccess is provided, '
4852
'then the scope uses its verdict', () async {
4953
await log.progress<String>(
5054
'op',
@@ -65,7 +69,8 @@ void main() {
6569
log = Log(writer);
6670
});
6771

68-
test('when the runner throws, '
72+
test(
73+
'when the runner throws, '
6974
'then the scope closes with success false and rethrows', () async {
7075
await expectLater(
7176
log.progress<bool>('op', () async => throw StateError('boom')),

0 commit comments

Comments
 (0)