From b255ddcd616b4cad4f102f8b072272cdb3a65d81 Mon Sep 17 00:00:00 2001
From: Krille <christian-pauly@posteo.de>
Date: Sat, 15 Jul 2023 17:42:03 +0900
Subject: [PATCH] chore: Remove windows gitlab CI workaround

---
 pubspec.lock                                   | 13 ++++++-------
 pubspec.yaml                                   |  6 ------
 windows/flutter/generated_plugin_registrant.cc |  3 +++
 windows/flutter/generated_plugins.cmake        |  1 +
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index 197caf56..2dbffd20 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -705,14 +705,13 @@ packages:
     source: hosted
     version: "1.1.1"
   flutter_secure_storage_windows:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
-      path: "."
-      ref: main
-      resolved-ref: "3751da0df5eede20d64816ceb79ca78ace7389b3"
-      url: "https://gitlab.com/TheOneWithTheBraid/flutter_secure_storage_windows.git"
-    source: git
-    version: "1.1.2"
+      name: flutter_secure_storage_windows
+      sha256: fc2910ec9b28d60598216c29ea763b3a96c401f0ce1d13cdf69ccb0e5c93c3ee
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
   flutter_svg:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index c283e4a8..8c65f858 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -147,12 +147,6 @@ msix_config:
   install_certificate: false
 
 dependency_overrides:
-  # fake secure storage plugin for Windows
-  # See: https://gitlab.com/gitlab-com/gl-infra/reliability/-/issues/15161
-  flutter_secure_storage_windows:
-    git:
-      url: https://gitlab.com/TheOneWithTheBraid/flutter_secure_storage_windows.git
-      ref: main
   geolocator_android:
     hosted:
       name: geolocator_android
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index f9d16029..69b12dde 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -12,6 +12,7 @@
 #include <dynamic_color/dynamic_color_plugin_c_api.h>
 #include <emoji_picker_flutter/emoji_picker_flutter_plugin_c_api.h>
 #include <file_selector_windows/file_selector_windows.h>
+#include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
 #include <flutter_webrtc/flutter_web_r_t_c_plugin.h>
 #include <permission_handler_windows/permission_handler_windows_plugin.h>
 #include <record_windows/record_windows_plugin_c_api.h>
@@ -32,6 +33,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("EmojiPickerFlutterPluginCApi"));
   FileSelectorWindowsRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FileSelectorWindows"));
+  FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
   FlutterWebRTCPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FlutterWebRTCPlugin"));
   PermissionHandlerWindowsPluginRegisterWithRegistrar(
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index 3e691299..39f5851d 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -9,6 +9,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
   dynamic_color
   emoji_picker_flutter
   file_selector_windows
+  flutter_secure_storage_windows
   flutter_webrtc
   permission_handler_windows
   record_windows