Resolved conflicts and fix dependency_overrides

Author: jonasfj

app/lib/task/backend.dart

@@ -40,8 +40,6 @@ import 'package:pub_dev/shared/versions.dart'
         gcBeforeRuntimeVersion,
         shouldGCVersion,
         acceptedRuntimeVersions;
-import 'package:pub_dev/shared/versions.dart' as shared_versions
-    show runtimeVersion;
 import 'package:pub_dev/task/clock_control.dart';
 import 'package:pub_dev/task/cloudcompute/cloudcompute.dart';
 import 'package:pub_dev/task/global_lock.dart';
@@ -346,15 +344,10 @@ class TaskBackend {
       seen.removeWhere((_, updated) => updated.isBefore(since));
 
       // Wait until aborted or 10 minutes before scanning again!
-<<<<<<< HEAD
-      await abort.future
-          .timeoutWithClock(Duration(minutes: 10), onTimeout: () => null);
-=======
       await abort.future.timeoutWithClock(
         Duration(minutes: 10),
         onTimeout: () => null,
       );
->>>>>>> 9bf3c7bae (Initial migration of task backend to typed_sql)
     }
   }
 

app/pubspec.yaml

@@ -52,7 +52,7 @@ dependencies:
   ulid: '2.0.1'
   tar: '2.0.0'
   api_builder:
-  typed_sql: ^0.1.2
+  typed_sql: ^0.1.3
   postgres: ^3.5.6
 
 dev_dependencies:
@@ -64,7 +64,3 @@ dev_dependencies:
   source_gen: '^2.0.0'
   test: ^1.16.5
   xml: ^6.0.0
-
-dependency_overrides:
-  typed_sql:
-    path: /workspace/dart-neats/typed_sql

app/test/shared/test_services.dart

@@ -192,81 +192,6 @@ void testWithProfile(
   );
 }
 
-<<<<<<< HEAD
-=======
-/// Execute [fn] with [FakeTime.run] inside [testWithProfile].
-@isTest
-void testWithFakeTime(
-  String name,
-  FutureOr<void> Function(FakeTime fakeTime) fn, {
-  TestProfile? testProfile,
-  ImportSource? importSource,
-  Pattern? integrityProblem,
-  Iterable<Pattern>? expectedLogMessages,
-}) {
-  scopedTest(name, expectedLogMessages: expectedLogMessages, () async {
-    await FakeTime.run((fakeTime) async {
-      setupDebugEnvBasedLogging();
-      await withFakeServices(
-        fn: () async {
-          registerStaticFileCacheForTest(_staticFileCacheForTesting);
-
-          await importProfile(
-            profile: testProfile ?? defaultTestProfile,
-            source: importSource,
-          );
-          await nameTracker.reloadFromDatastore();
-          await generateFakeDownloadCountsInDatastore();
-          await indexUpdater.updateAllPackages();
-          await asyncQueue.ongoingProcessing;
-          fakeEmailSender.sentMessages.clear();
-
-          await fork(() async {
-            await fn(fakeTime);
-          });
-          await _postTestVerification(integrityProblem: integrityProblem);
-        },
-      );
-    });
-  });
-}
-
-void testWithClockControl(
-  String name,
-  FutureOr<void> Function(ClockController fakeTime) fn, {
-  TestProfile? testProfile,
-  ImportSource? importSource,
-  Pattern? integrityProblem,
-  Iterable<Pattern>? expectedLogMessages,
-}) {
-  scopedTest(name, expectedLogMessages: expectedLogMessages, () async {
-    await withClockControl((clockCtrl) async {
-      setupDebugEnvBasedLogging();
-      await withFakeServices(
-        fn: () async {
-          registerStaticFileCacheForTest(_staticFileCacheForTesting);
-
-          await importProfile(
-            profile: testProfile ?? defaultTestProfile,
-            source: importSource,
-          );
-          await nameTracker.reloadFromDatastore();
-          await generateFakeDownloadCountsInDatastore();
-          await indexUpdater.updateAllPackages();
-          await asyncQueue.ongoingProcessing;
-          fakeEmailSender.sentMessages.clear();
-
-          await fork(() async {
-            await fn(clockCtrl);
-          });
-          await _postTestVerification(integrityProblem: integrityProblem);
-        },
-      );
-    });
-  });
-}
-
->>>>>>> 9bf3c7bae (Initial migration of task backend to typed_sql)
 void setupTestsWithCallerAuthorizationIssues(
     Future Function(PubApiClient client) fn) {
   testWithProfile('No active user', fn: () async {

pubspec.lock

@@ -962,12 +962,13 @@ packages:
     source: hosted
     version: "1.4.0"
   typed_sql:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
-      path: "/workspace/dart-neats/typed_sql"
-      relative: false
-    source: path
-    version: "0.1.2"
+      name: typed_sql
+      sha256: b9cf7444aa0c02705fd0faf8156280aae75574bb614f4c3893128247e7839204
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.3"
   ulid:
     dependency: transitive
     description: