From 9aafcfd79d5a1d411d03b4012f2f9ff2abb22a50 Mon Sep 17 00:00:00 2001
From: Brett Sutton <bsutton@noojee.com.au>
Date: Thu, 12 Jan 2023 15:03:05 +1100
Subject: [PATCH] Released 3.1.0-beta.1.

---
 lib/src/pub/oauth2.dart | 4 ++--
 pubspec.lock            | 2 +-
 pubspec.yaml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/src/pub/oauth2.dart b/lib/src/pub/oauth2.dart
index 7229bb1..7811e5f 100644
--- a/lib/src/pub/oauth2.dart
+++ b/lib/src/pub/oauth2.dart
@@ -110,7 +110,7 @@ Future<T> withClient<T>(SystemCache cache, Future<T> Function(Client) fn) {
       // Be sure to save the credentials even when an error happens.
       _saveCredentials(cache, client.credentials);
     });
-  }).catchError((error) {
+  }).catchError((Object error) {
     if (error is ExpirationException) {
       log.error("Pub's authorization to upload packages has expired and "
           "can't be automatically refreshed.");
@@ -226,7 +226,7 @@ Future<Client> _authorize() async {
   // Spin up a one-shot HTTP server to receive the authorization code from the
   // Google OAuth2 server via redirect. This server will close itself as soon as
   // the code is received.
-  var completer = Completer();
+  var completer = Completer<Client>();
   var server = await bindServer('localhost', 0);
   shelf_io.serveRequests(server, (request) {
     if (request.url.path.isNotEmpty) {
diff --git a/pubspec.lock b/pubspec.lock
index c75eb2c..80c8c5f 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -359,7 +359,7 @@ packages:
     source: hosted
     version: "3.5.1"
   shelf:
-    dependency: "direct dev"
+    dependency: "direct main"
     description:
       name: shelf
       url: "https://pub.dartlang.org"
diff --git a/pubspec.yaml b/pubspec.yaml
index fff29db..b0f6288 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -55,6 +55,7 @@ dependencies:
   random_string: 2.3.1
   scope: 3.0.0
   settings_yaml: 3.5.1
+  shelf: 1.2.0
   source_map_stack_trace: 2.1.0
   source_maps: 0.10.10
   source_span: 1.8.1
@@ -81,7 +82,6 @@ dev_dependencies:
   analyzer: 2.3.0
   lint_hard: 1.0.4
   matcher: 0.12.11
-  shelf: 1.2.0
   shelf_packages_handler: 3.0.0
   shelf_static: 1.1.0
   shelf_web_socket: 1.0.1