diff --git a/lib/analytics/analytics.dart b/lib/analytics/analytics.dart
index 32d3879c..9fb93444 100644
--- a/lib/analytics/analytics.dart
+++ b/lib/analytics/analytics.dart
@@ -1,7 +1,7 @@
-import 'dart:io' show Platform;
-
 import 'package:flutter/material.dart';
 
+import 'package:universal_io/io.dart' show Platform;
+
 import 'package:gitjournal/app.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/utils/logger.dart';
diff --git a/lib/analytics/experiment.dart b/lib/analytics/experiment.dart
index 58527168..cd2ec8b0 100644
--- a/lib/analytics/experiment.dart
+++ b/lib/analytics/experiment.dart
@@ -1,6 +1,5 @@
-import 'dart:io' show Platform;
-
 import 'package:device_info_plus/device_info_plus.dart';
+import 'package:universal_io/io.dart' show Platform;
 
 // - https://support.google.com/firebase/answer/7029846?hl=en
 // - https://support.google.com/firebase/answer/6317485?hl=en
diff --git a/lib/apis/github.dart b/lib/apis/github.dart
index 2a87666d..bdcf74ab 100644
--- a/lib/apis/github.dart
+++ b/lib/apis/github.dart
@@ -1,11 +1,11 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:io' show HttpHeaders;
 
 import 'package:flutter/foundation.dart' as foundation;
 import 'package:flutter/services.dart';
 
 import 'package:http/http.dart' as http;
+import 'package:universal_io/io.dart' show HttpHeaders;
 import 'package:url_launcher/url_launcher.dart';
 
 import 'package:gitjournal/utils/logger.dart';
diff --git a/lib/apis/gitlab.dart b/lib/apis/gitlab.dart
index 617f6dac..be78a824 100644
--- a/lib/apis/gitlab.dart
+++ b/lib/apis/gitlab.dart
@@ -1,12 +1,12 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:io' show HttpHeaders;
 import 'dart:math';
 
 import 'package:flutter/foundation.dart' as foundation;
 import 'package:flutter/services.dart';
 
 import 'package:http/http.dart' as http;
+import 'package:universal_io/io.dart' show HttpHeaders;
 import 'package:url_launcher/url_launcher.dart';
 
 import 'package:gitjournal/utils/logger.dart';
diff --git a/lib/app.dart b/lib/app.dart
index 8974491f..c9bf3ada 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:io' show Platform;
 
 import 'package:flutter/foundation.dart' as foundation;
 import 'package:flutter/material.dart';
@@ -15,6 +14,7 @@ import 'package:quick_actions/quick_actions.dart';
 import 'package:receive_sharing_intent/receive_sharing_intent.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:universal_io/io.dart' show Platform;
 
 import 'package:gitjournal/analytics/analytics.dart';
 import 'package:gitjournal/app_router.dart';
diff --git a/lib/core/git_repo.dart b/lib/core/git_repo.dart
index f5616346..f380e5f1 100644
--- a/lib/core/git_repo.dart
+++ b/lib/core/git_repo.dart
@@ -1,10 +1,10 @@
 import 'dart:async';
-import 'dart:io' show Platform, Directory;
 
 import 'package:dart_git/dart_git.dart';
 import 'package:dart_git/utils/result.dart';
 import 'package:git_bindings/git_bindings.dart' as gb;
 import 'package:path/path.dart' as p;
+import 'package:universal_io/io.dart' show Platform, Directory;
 
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
diff --git a/lib/core/md_yaml_doc_loader.dart b/lib/core/md_yaml_doc_loader.dart
index 184bcab1..d9ee801b 100644
--- a/lib/core/md_yaml_doc_loader.dart
+++ b/lib/core/md_yaml_doc_loader.dart
@@ -1,8 +1,8 @@
-import 'dart:io';
 import 'dart:isolate';
 
 import 'package:dart_git/utils/result.dart';
 import 'package:synchronized/synchronized.dart';
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/core/md_yaml_doc.dart';
 import 'package:gitjournal/core/md_yaml_doc_codec.dart';
diff --git a/lib/core/note.dart b/lib/core/note.dart
index 8960cf51..f8f167b2 100644
--- a/lib/core/note.dart
+++ b/lib/core/note.dart
@@ -14,10 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import 'dart:io';
-
 import 'package:dart_git/utils/result.dart';
 import 'package:path/path.dart' as p;
+import 'package:universal_io/io.dart';
 import 'package:uuid/uuid.dart';
 
 import 'package:gitjournal/core/links_loader.dart';
diff --git a/lib/core/notes_cache.dart b/lib/core/notes_cache.dart
index d216b917..7c25dc2d 100644
--- a/lib/core/notes_cache.dart
+++ b/lib/core/notes_cache.dart
@@ -1,10 +1,10 @@
 import 'dart:convert';
-import 'dart:io';
 
 import 'package:flutter/material.dart';
 
 import 'package:collection/collection.dart';
 import 'package:path/path.dart' as p;
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_config.dart';
diff --git a/lib/core/notes_folder_fs.dart b/lib/core/notes_folder_fs.dart
index 802f356d..1236fc08 100644
--- a/lib/core/notes_folder_fs.dart
+++ b/lib/core/notes_folder_fs.dart
@@ -1,10 +1,10 @@
 import 'dart:collection';
-import 'dart:io';
 
 import 'package:easy_localization/easy_localization.dart';
 import 'package:path/path.dart' as p;
 import 'package:path/path.dart';
 import 'package:synchronized/synchronized.dart';
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/utils/logger.dart';
 import 'note.dart';
diff --git a/lib/core/org_links_handler.dart b/lib/core/org_links_handler.dart
index 268baf6d..2f476037 100644
--- a/lib/core/org_links_handler.dart
+++ b/lib/core/org_links_handler.dart
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import 'dart:developer';
-import 'dart:io';
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -24,6 +23,7 @@ import 'package:flutter/widgets.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:org_flutter/org_flutter.dart';
 import 'package:path/path.dart';
+import 'package:universal_io/io.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import 'package:gitjournal/core/note.dart';
diff --git a/lib/error_reporting.dart b/lib/error_reporting.dart
index a0d87248..37990a2b 100644
--- a/lib/error_reporting.dart
+++ b/lib/error_reporting.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:io' show Platform;
 
 import 'package:flutter/foundation.dart';
 
@@ -8,6 +7,7 @@ import 'package:package_info_plus/package_info_plus.dart';
 import 'package:sentry/sentry.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:stack_trace/stack_trace.dart';
+import 'package:universal_io/io.dart' show Platform;
 
 import 'package:gitjournal/.env.dart';
 import 'package:gitjournal/app.dart';
diff --git a/lib/experiments/main_zeroconf.dart b/lib/experiments/main_zeroconf.dart
index 1ff940e5..2d2e2a1e 100644
--- a/lib/experiments/main_zeroconf.dart
+++ b/lib/experiments/main_zeroconf.dart
@@ -1,13 +1,13 @@
 /*
 
 import 'dart:async';
-import 'dart:io';
 
 import 'package:flutter/material.dart';
 
 import 'package:bonsoir/bonsoir.dart';
 import 'package:device_info/device_info.dart';
 import 'package:provider/provider.dart';
+import 'package:universal_io/io.dart';
 
 /// Plugin's main method.
 void main() => runApp(BonsoirExampleMainWidget());
diff --git a/lib/features.dart b/lib/features.dart
index 3ad93271..425435bc 100644
--- a/lib/features.dart
+++ b/lib/features.dart
@@ -1,6 +1,5 @@
-import 'dart:io' show Platform;
-
 import 'package:easy_localization/easy_localization.dart';
+import 'package:universal_io/io.dart' show Platform;
 
 class Features {
   // Make the desktop version always pro, for now.
diff --git a/lib/iap/iap.dart b/lib/iap/iap.dart
index 94cc7e83..bc3f9183 100644
--- a/lib/iap/iap.dart
+++ b/lib/iap/iap.dart
@@ -1,9 +1,9 @@
 import 'dart:convert';
-import 'dart:io' show Platform;
 
 import 'package:http/http.dart' as http;
 import 'package:in_app_purchase/in_app_purchase.dart';
 import 'package:in_app_purchase/store_kit_wrappers.dart';
+import 'package:universal_io/io.dart' show Platform;
 
 import 'package:gitjournal/app.dart';
 import 'package:gitjournal/error_reporting.dart';
diff --git a/lib/repository.dart b/lib/repository.dart
index f3817e0e..1b70d828 100644
--- a/lib/repository.dart
+++ b/lib/repository.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:io';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -13,6 +12,7 @@ import 'package:path/path.dart' as p;
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:synchronized/synchronized.dart';
 import 'package:time/time.dart';
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/analytics/analytics.dart';
 import 'package:gitjournal/core/git_repo.dart';
diff --git a/lib/settings/settings_git_remote.dart b/lib/settings/settings_git_remote.dart
index fab8a392..0eff6b07 100644
--- a/lib/settings/settings_git_remote.dart
+++ b/lib/settings/settings_git_remote.dart
@@ -1,5 +1,3 @@
-import 'dart:io';
-
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
@@ -7,6 +5,7 @@ import 'package:dart_git/dart_git.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:path/path.dart' as p;
 import 'package:provider/provider.dart';
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/repository.dart';
 import 'package:gitjournal/settings/git_config.dart';
diff --git a/lib/settings/settings_migrations.dart b/lib/settings/settings_migrations.dart
index f44f1315..7e825588 100644
--- a/lib/settings/settings_migrations.dart
+++ b/lib/settings/settings_migrations.dart
@@ -1,7 +1,6 @@
-import 'dart:io';
-
 import 'package:path/path.dart' as p;
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
diff --git a/lib/settings/settings_screen.dart b/lib/settings/settings_screen.dart
index e970792a..47b839f6 100644
--- a/lib/settings/settings_screen.dart
+++ b/lib/settings/settings_screen.dart
@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import 'dart:io';
-
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
@@ -29,6 +27,7 @@ import 'package:path/path.dart' as p;
 import 'package:path_provider/path_provider.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:provider/provider.dart';
+import 'package:universal_io/io.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import 'package:gitjournal/core/notes_folder_config.dart';
diff --git a/lib/settings/storage_config.dart b/lib/settings/storage_config.dart
index ec45fb84..849950a5 100644
--- a/lib/settings/storage_config.dart
+++ b/lib/settings/storage_config.dart
@@ -1,10 +1,9 @@
-import 'dart:io' show Platform;
-
 import 'package:flutter/foundation.dart';
 
 import 'package:icloud_documents_path/icloud_documents_path.dart';
 import 'package:path/path.dart' as p;
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:universal_io/io.dart' show Platform;
 
 import 'package:gitjournal/settings/settings_sharedpref.dart';
 
diff --git a/lib/setup/clone.dart b/lib/setup/clone.dart
index 4b716da6..19d64ed4 100644
--- a/lib/setup/clone.dart
+++ b/lib/setup/clone.dart
@@ -1,10 +1,10 @@
 import 'dart:async';
-import 'dart:io' show Directory, File;
 
 import 'package:dart_git/dart_git.dart';
 import 'package:dart_git/exceptions.dart';
 import 'package:function_types/function_types.dart';
 import 'package:path/path.dart' as p;
+import 'package:universal_io/io.dart' show Directory, File;
 
 import 'package:gitjournal/utils/logger.dart';
 
diff --git a/lib/setup/clone_auto_select.dart b/lib/setup/clone_auto_select.dart
index 70677f54..201b9e86 100644
--- a/lib/setup/clone_auto_select.dart
+++ b/lib/setup/clone_auto_select.dart
@@ -1,4 +1,4 @@
-import 'dart:io' show Platform;
+import 'package:universal_io/io.dart' show Platform;
 
 import 'clone_gitExec.dart' as git_exec;
 import 'clone_libgit2.dart' as libgit2;
diff --git a/lib/setup/key_editors.dart b/lib/setup/key_editors.dart
index 07baa4a5..fb007d7b 100644
--- a/lib/setup/key_editors.dart
+++ b/lib/setup/key_editors.dart
@@ -1,9 +1,8 @@
-import 'dart:io';
-
 import 'package:flutter/material.dart';
 
 import 'package:easy_localization/easy_localization.dart';
 import 'package:file_picker/file_picker.dart';
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/utils/logger.dart';
 
diff --git a/lib/setup/screens.dart b/lib/setup/screens.dart
index 538ad72d..a0b93f82 100644
--- a/lib/setup/screens.dart
+++ b/lib/setup/screens.dart
@@ -1,5 +1,3 @@
-import 'dart:io' show Platform, Directory;
-
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
@@ -10,6 +8,7 @@ import 'package:function_types/function_types.dart';
 import 'package:path/path.dart' as p;
 import 'package:provider/provider.dart';
 import 'package:time/time.dart';
+import 'package:universal_io/io.dart' show Platform, Directory;
 import 'package:url_launcher/url_launcher.dart';
 
 import 'package:gitjournal/analytics/analytics.dart';
diff --git a/lib/ssh/keygen.dart b/lib/ssh/keygen.dart
index 01d6fd64..2179aa92 100644
--- a/lib/ssh/keygen.dart
+++ b/lib/ssh/keygen.dart
@@ -1,9 +1,9 @@
 import 'dart:convert';
-import 'dart:io';
 
 import 'package:basic_utils/basic_utils.dart';
 import 'package:git_bindings/git_bindings.dart' as gb;
 import 'package:path/path.dart' as p;
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/ssh/binary_length_value.dart';
 import 'package:gitjournal/utils/logger.dart';
diff --git a/lib/ssh/main_keygen.dart-exp b/lib/ssh/main_keygen.dart-exp
index 8741257d..3e1051ed 100644
--- a/lib/ssh/main_keygen.dart-exp
+++ b/lib/ssh/main_keygen.dart-exp
@@ -1,6 +1,5 @@
 import 'dart:convert';
-import 'dart:io';
-
+import 'package:universal_io/io.dart';
 import 'package:cryptography/cryptography.dart';
 
 import './binary_length_value.dart';
diff --git a/lib/utils/git_desktop.dart b/lib/utils/git_desktop.dart
index 05f3ae10..a59b2467 100644
--- a/lib/utils/git_desktop.dart
+++ b/lib/utils/git_desktop.dart
@@ -1,10 +1,10 @@
 // GIT_SSH_COMMAND='ssh -i private_key_file -o IdentitiesOnly=yes' git clone user@host:repo.git
 
 import 'dart:convert';
-import 'dart:io';
 
 import 'package:dart_git/utils/file_extensions.dart';
 import 'package:dart_git/utils/result.dart';
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/utils/logger.dart';
 
diff --git a/lib/utils/logger.dart b/lib/utils/logger.dart
index 00ab1d9a..24a5c7e7 100644
--- a/lib/utils/logger.dart
+++ b/lib/utils/logger.dart
@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'dart:io';
 
 import 'package:flutter/foundation.dart' as foundation;
 
@@ -8,6 +7,7 @@ import 'package:path/path.dart' as p;
 import 'package:path_provider/path_provider.dart';
 import 'package:stack_trace/stack_trace.dart';
 import 'package:time/time.dart';
+import 'package:universal_io/io.dart';
 
 // FIXME: Only catch Exception? type. Something else needs to be done with Errors
 class Log {
diff --git a/lib/widgets/app_drawer.dart b/lib/widgets/app_drawer.dart
index 49207452..0a18d4f2 100644
--- a/lib/widgets/app_drawer.dart
+++ b/lib/widgets/app_drawer.dart
@@ -1,5 +1,3 @@
-import 'dart:io' show Platform;
-
 import 'package:flutter/material.dart';
 
 import 'package:easy_localization/easy_localization.dart';
@@ -9,6 +7,7 @@ import 'package:launch_review/launch_review.dart';
 import 'package:provider/provider.dart';
 import 'package:share_plus/share_plus.dart';
 import 'package:time/time.dart';
+import 'package:universal_io/io.dart' show Platform;
 import 'package:url_launcher/url_launcher.dart';
 
 import 'package:gitjournal/analytics/analytics.dart';
diff --git a/lib/widgets/images/markdown_image.dart b/lib/widgets/images/markdown_image.dart
index 01d8d222..3d16f77f 100644
--- a/lib/widgets/images/markdown_image.dart
+++ b/lib/widgets/images/markdown_image.dart
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import 'dart:io';
 import 'dart:ui';
 
 import 'package:flutter/cupertino.dart';
@@ -25,6 +24,7 @@ import 'package:flutter/widgets.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:provider/provider.dart';
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/settings/markdown_renderer_config.dart';
 import 'package:gitjournal/utils/logger.dart';
diff --git a/lib/widgets/images/themable_image.dart b/lib/widgets/images/themable_image.dart
index 6b57e40c..473969f2 100644
--- a/lib/widgets/images/themable_image.dart
+++ b/lib/widgets/images/themable_image.dart
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import 'dart:io';
 import 'dart:ui';
 
 import 'package:flutter/material.dart';
 
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:universal_io/io.dart';
 
 class ThemableImage extends StatelessWidget {
   final double? width;
diff --git a/lib/widgets/katex_widget.dart b/lib/widgets/katex_widget.dart
index 474cb8d3..b0af3cef 100644
--- a/lib/widgets/katex_widget.dart
+++ b/lib/widgets/katex_widget.dart
@@ -2,13 +2,13 @@
 
 import 'dart:async';
 import 'dart:convert';
-import 'dart:io';
 
 import 'package:flutter/material.dart';
 
 import 'package:crypto/crypto.dart';
 import 'package:mutex/mutex.dart';
 import 'package:path/path.dart' as p;
+import 'package:universal_io/io.dart';
 
 class KatexWidget extends StatefulWidget {
   final String input;
diff --git a/lib/widgets/rename_dialog.dart b/lib/widgets/rename_dialog.dart
index 5ab01c90..e255a9f7 100644
--- a/lib/widgets/rename_dialog.dart
+++ b/lib/widgets/rename_dialog.dart
@@ -1,10 +1,9 @@
-import 'dart:io';
-
 import 'package:flutter/material.dart';
 
 import 'package:easy_localization/easy_localization.dart';
 import 'package:path/path.dart' as p;
 import 'package:path/path.dart';
+import 'package:universal_io/io.dart';
 
 class RenameDialog extends StatefulWidget {
   final String oldPath;
diff --git a/pubspec.lock b/pubspec.lock
index 67f77eeb..19691554 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1370,6 +1370,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.0"
+  universal_io:
+    dependency: "direct main"
+    description:
+      name: universal_io
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.4"
   url_launcher:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 3b1be297..b772ad8b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -80,6 +80,7 @@ dependencies:
   fs_shim: ^2.0.1+2
   grpc: ^3.0.0
   protobuf: ^2.0.0
+  universal_io: ^2.0.4
 
 dev_dependencies:
   #flutter_driver:
diff --git a/scripts/setup_env.dart b/scripts/setup_env.dart
index 2fbe2af3..80cc012c 100755
--- a/scripts/setup_env.dart
+++ b/scripts/setup_env.dart
@@ -1,7 +1,7 @@
 #!/usr/bin/env dart
 
 import 'dart:convert';
-import 'dart:io';
+import 'package:universal_io/io.dart';
 
 Future<void> main() async {
   final config = {
diff --git a/test/apis/github_test.dart b/test/apis/github_test.dart
index 3a1a7a8f..ba074bdd 100644
--- a/test/apis/github_test.dart
+++ b/test/apis/github_test.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
-import 'dart:io';
 
 import 'package:path/path.dart';
 import 'package:test/test.dart';
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/apis/githost_factory.dart';
 import 'package:gitjournal/apis/github.dart';
diff --git a/test/apis/gitlab_test.dart b/test/apis/gitlab_test.dart
index dc593818..29034a40 100644
--- a/test/apis/gitlab_test.dart
+++ b/test/apis/gitlab_test.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
-import 'dart:io';
 
 import 'package:path/path.dart';
 import 'package:test/test.dart';
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/apis/githost_factory.dart';
 import 'package:gitjournal/apis/gitlab.dart';
diff --git a/test/checklist_test.dart b/test/checklist_test.dart
index b55bddf9..d3799ce6 100644
--- a/test/checklist_test.dart
+++ b/test/checklist_test.dart
@@ -1,8 +1,7 @@
-import 'dart:io';
-
 import 'package:path/path.dart' as p;
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:test/test.dart';
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/core/checklist.dart';
 import 'package:gitjournal/core/note.dart';
diff --git a/test/flattened_notes_folder_large_test.dart b/test/flattened_notes_folder_large_test.dart
index f930adc6..66ad940b 100644
--- a/test/flattened_notes_folder_large_test.dart
+++ b/test/flattened_notes_folder_large_test.dart
@@ -1,9 +1,9 @@
-import 'dart:io';
 import 'dart:math';
 
 import 'package:path/path.dart' as p;
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:test/test.dart';
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/core/flattened_notes_folder.dart';
 import 'package:gitjournal/core/note.dart';
diff --git a/test/flattened_notes_folder_test.dart b/test/flattened_notes_folder_test.dart
index 95a58385..2d5d106b 100644
--- a/test/flattened_notes_folder_test.dart
+++ b/test/flattened_notes_folder_test.dart
@@ -1,9 +1,9 @@
-import 'dart:io';
 import 'dart:math';
 
 import 'package:path/path.dart' as p;
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:test/test.dart';
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/core/flattened_notes_folder.dart';
 import 'package:gitjournal/core/note.dart';
diff --git a/test/link_resolver_test.dart b/test/link_resolver_test.dart
index 2899a749..84633779 100644
--- a/test/link_resolver_test.dart
+++ b/test/link_resolver_test.dart
@@ -1,8 +1,7 @@
-import 'dart:io';
-
 import 'package:path/path.dart' as p;
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:test/test.dart';
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/core/link.dart';
 import 'package:gitjournal/core/notes_folder_config.dart';
diff --git a/test/md_yaml_doc_loader_test.dart b/test/md_yaml_doc_loader_test.dart
index 3a81f589..9dcb89b0 100644
--- a/test/md_yaml_doc_loader_test.dart
+++ b/test/md_yaml_doc_loader_test.dart
@@ -1,8 +1,7 @@
-import 'dart:io';
-
 import 'package:dart_git/utils/result.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/core/md_yaml_doc_loader.dart';
 
diff --git a/test/note_storage_test.dart b/test/note_storage_test.dart
index 6a603eac..3976f656 100644
--- a/test/note_storage_test.dart
+++ b/test/note_storage_test.dart
@@ -1,9 +1,9 @@
 import 'dart:collection';
-import 'dart:io';
 
 import 'package:path/path.dart' as p;
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:test/test.dart';
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/core/md_yaml_doc.dart';
 import 'package:gitjournal/core/note.dart';
diff --git a/test/note_test.dart b/test/note_test.dart
index 1c5237f6..bb81604c 100644
--- a/test/note_test.dart
+++ b/test/note_test.dart
@@ -1,8 +1,7 @@
-import 'dart:io';
-
 import 'package:path/path.dart' as p;
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:test/test.dart';
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_config.dart';
diff --git a/test/notes_cache_test.dart b/test/notes_cache_test.dart
index c4c169c8..ec43d376 100644
--- a/test/notes_cache_test.dart
+++ b/test/notes_cache_test.dart
@@ -1,8 +1,7 @@
-import 'dart:io';
-
 import 'package:path/path.dart' as p;
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:test/test.dart';
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/core/notes_cache.dart';
 import 'package:gitjournal/core/notes_folder_config.dart';
diff --git a/test/sorted_notes_folder_test.dart b/test/sorted_notes_folder_test.dart
index 0ce7173b..27b3abfe 100644
--- a/test/sorted_notes_folder_test.dart
+++ b/test/sorted_notes_folder_test.dart
@@ -1,9 +1,9 @@
-import 'dart:io';
 import 'dart:math';
 
 import 'package:path/path.dart' as p;
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:test/test.dart';
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_config.dart';
diff --git a/test/utils/logger_test.dart b/test/utils/logger_test.dart
index 1e202b72..b6c432ed 100644
--- a/test/utils/logger_test.dart
+++ b/test/utils/logger_test.dart
@@ -1,11 +1,10 @@
-import 'dart:io';
-
 import 'package:flutter_test/flutter_test.dart' as ft;
 import 'package:path/path.dart';
 import 'package:path_provider_platform_interface/path_provider_platform_interface.dart';
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 import 'package:test/fake.dart';
 import 'package:test/test.dart';
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/utils/logger.dart';
 
diff --git a/test_driver/main.dart b/test_driver/main.dart
index b3f76d70..22f4aacb 100644
--- a/test_driver/main.dart
+++ b/test_driver/main.dart
@@ -1,10 +1,9 @@
-import 'dart:io';
-
 import 'package:dart_git/git.dart';
 import 'package:path/path.dart' as p;
 import 'package:path_provider/path_provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:time/time.dart';
+import 'package:universal_io/io.dart';
 
 import 'package:gitjournal/app.dart';
 import 'package:gitjournal/settings/app_settings.dart';