Skip to content

Commit

Permalink
Upgrade runtime SDK to 3.5.0 (#7921)
Browse files Browse the repository at this point in the history
  • Loading branch information
isoos committed Aug 12, 2024
1 parent 91abd66 commit c3a6027
Show file tree
Hide file tree
Showing 29 changed files with 651 additions and 611 deletions.
232 changes: 116 additions & 116 deletions .github/workflows/dart.yml

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ Important changes to data models, configuration, and migrations between each
AppEngine version, listed here to ease deployment and troubleshooting.

## Next Release (replace with git tag when deployed)
* Bumped runtimeVersion to `2024.08.09`.
* Upgraded runtime Dart SDK to `3.5.0`.
* Upgraded dependencies including `mailer` and `googleapis`.

## `20240808t114400-all`
* Bumped runtimeVersion to `2024.08.08`.
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.app
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Keep version in-sync with .mono_repo.yml and app/lib/shared/versions.dart
FROM dart:3.4.0
FROM dart:3.5.0

# After install we remove the apt-index again to keep the docker image diff small.
RUN apt-get update && \
Expand Down
8 changes: 3 additions & 5 deletions app/lib/admin/actions/send_email.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.

import 'package:collection/collection.dart';

import '../../account/agent.dart';
import '../../account/backend.dart';
import '../../package/backend.dart';
Expand Down Expand Up @@ -67,17 +65,17 @@ without changing anything in it.
if (pkg!.publisherId != null) {
final list =
await publisherBackend.getAdminMemberEmails(ms.publisherId!);
emails.addAll(list.whereNotNull());
emails.addAll(list.nonNulls);
} else {
final list = await accountBackend
.lookupUsersById(pkg.uploaders ?? const <String>[]);
emails.addAll(list.map((e) => e?.email).whereNotNull());
emails.addAll(list.map((e) => e?.email).nonNulls);
}
break;
case ModerationSubjectKind.publisher:
final list =
await publisherBackend.getAdminMemberEmails(ms.publisherId!);
emails.addAll(list.whereNotNull());
emails.addAll(list.nonNulls);
break;
case ModerationSubjectKind.user:
emails.add(ms.email!);
Expand Down
7 changes: 3 additions & 4 deletions app/lib/shared/versions.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@ final RegExp runtimeVersionPattern = RegExp(r'^\d{4}\.\d{2}\.\d{2}$');
/// when the version switch happens.
const _acceptedRuntimeVersions = <String>[
// The current [runtimeVersion].
'2024.08.08',
'2024.08.09',
// Fallback runtime versions.
'2024.08.06',
'2024.08.08',
'2024.08.05',
'2024.07.18',
];

/// Sets the current runtime versions.
Expand Down Expand Up @@ -62,7 +61,7 @@ bool shouldGCVersion(String version) =>
version.compareTo(gcBeforeRuntimeVersion) < 0;

// keep in-sync with SDK version in .mono_repo.yml and Dockerfile
final String runtimeSdkVersion = '3.4.0';
final String runtimeSdkVersion = '3.5.0';
final String toolStableDartSdkVersion = '3.5.0';
final String toolStableFlutterSdkVersion = '3.24.0';

Expand Down
2 changes: 1 addition & 1 deletion app/mono_pkg.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# See https://github.com/dart-lang/mono_repo for details
sdk:
- 3.4.0
- 3.5.0

stages:
- smoke_test:
Expand Down
Loading

0 comments on commit c3a6027

Please sign in to comment.