Skip to content

Commit 60ad6ef

Browse files
authored
[auth] Potential fix for desktop build (#4462)
## Description ## Tests
2 parents 791ec10 + fc626c1 commit 60ad6ef

File tree

9 files changed

+177
-191
lines changed

9 files changed

+177
-191
lines changed

.github/workflows/auth-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ jobs:
151151
- name: Install dependencies for desktop build
152152
run: |
153153
sudo apt-get update -y
154-
sudo apt-get install -y libsecret-1-dev libsodium-dev libfuse2 ninja-build libgtk-3-dev dpkg-dev pkg-config rpm patchelf libsqlite3-dev locate libayatana-appindicator3-dev libffi-dev libtiff5 xz-utils libarchive-tools
154+
sudo apt-get install -y libsecret-1-dev libsodium-dev libfuse2 ninja-build libgtk-3-dev dpkg-dev pkg-config rpm patchelf libsqlite3-dev locate libayatana-appindicator3-dev libffi-dev libtiff5 xz-utils libarchive-tools libcurl4-openssl-dev
155155
sudo updatedb --localpaths='/usr/lib/x86_64-linux-gnu'
156156
157157
- name: Install appimagetool

auth/ios/Podfile.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ PODS:
8585
- SDWebImage (5.20.0):
8686
- SDWebImage/Core (= 5.20.0)
8787
- SDWebImage/Core (5.20.0)
88-
- Sentry/HybridSDK (8.41.0)
89-
- sentry_flutter (8.11.2):
88+
- Sentry/HybridSDK (8.36.0)
89+
- sentry_flutter (8.9.0):
9090
- Flutter
9191
- FlutterMacOS
92-
- Sentry/HybridSDK (= 8.41.0)
92+
- Sentry/HybridSDK (= 8.36.0)
9393
- share_plus (0.0.1):
9494
- Flutter
9595
- shared_preferences_foundation (0.0.1):
@@ -222,7 +222,7 @@ EXTERNAL SOURCES:
222222

223223
SPEC CHECKSUMS:
224224
app_links: e7a6750a915a9e161c58d91bc610e8cd1d4d0ad0
225-
connectivity_plus: 18382e7311ba19efcaee94442b23b32507b20695
225+
connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
226226
device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
227227
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
228228
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
@@ -246,8 +246,8 @@ SPEC CHECKSUMS:
246246
privacy_screen: 1a131c052ceb3c3659934b003b0d397c2381a24e
247247
qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
248248
SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
249-
Sentry: 54d0fe6c0df448497c8ed4cce66ccf7027e1823e
250-
sentry_flutter: f8796ae209d02920fa58f9cfd4eae00ec685bf37
249+
Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
250+
sentry_flutter: 0eb93e5279eb41e2392212afe1ccd2fecb4f8cbe
251251
share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
252252
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
253253
sodium_libs: 1faae17af662384acbd13e41867a0008cd2e2318

auth/linux/flutter/generated_plugin_registrant.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <flutter_local_authentication/flutter_local_authentication_plugin.h>
1111
#include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
1212
#include <gtk/gtk_plugin.h>
13-
#include <screen_retriever_linux/screen_retriever_linux_plugin.h>
13+
#include <screen_retriever/screen_retriever_plugin.h>
1414
#include <sentry_flutter/sentry_flutter_plugin.h>
1515
#include <sodium_libs/sodium_libs_plugin.h>
1616
#include <sqlite3_flutter_libs/sqlite3_flutter_libs_plugin.h>
@@ -31,9 +31,9 @@ void fl_register_plugins(FlPluginRegistry* registry) {
3131
g_autoptr(FlPluginRegistrar) gtk_registrar =
3232
fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin");
3333
gtk_plugin_register_with_registrar(gtk_registrar);
34-
g_autoptr(FlPluginRegistrar) screen_retriever_linux_registrar =
35-
fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverLinuxPlugin");
36-
screen_retriever_linux_plugin_register_with_registrar(screen_retriever_linux_registrar);
34+
g_autoptr(FlPluginRegistrar) screen_retriever_registrar =
35+
fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverPlugin");
36+
screen_retriever_plugin_register_with_registrar(screen_retriever_registrar);
3737
g_autoptr(FlPluginRegistrar) sentry_flutter_registrar =
3838
fl_plugin_registry_get_registrar_for_plugin(registry, "SentryFlutterPlugin");
3939
sentry_flutter_plugin_register_with_registrar(sentry_flutter_registrar);

auth/linux/flutter/generated_plugins.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
77
flutter_local_authentication
88
flutter_secure_storage_linux
99
gtk
10-
screen_retriever_linux
10+
screen_retriever
1111
sentry_flutter
1212
sodium_libs
1313
sqlite3_flutter_libs

auth/macos/Flutter/GeneratedPluginRegistrant.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import flutter_secure_storage_macos
1616
import local_auth_darwin
1717
import package_info_plus
1818
import path_provider_foundation
19-
import screen_retriever_macos
19+
import screen_retriever
2020
import sentry_flutter
2121
import share_plus
2222
import shared_preferences_foundation
@@ -39,7 +39,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
3939
FLALocalAuthPlugin.register(with: registry.registrar(forPlugin: "FLALocalAuthPlugin"))
4040
FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
4141
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
42-
ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin"))
42+
ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin"))
4343
SentryFlutterPlugin.register(with: registry.registrar(forPlugin: "SentryFlutterPlugin"))
4444
SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
4545
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))

auth/macos/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,4 +174,4 @@ SPEC CHECKSUMS:
174174

175175
PODFILE CHECKSUM: f401c31c8f7c5571f6f565c78915d54338812dab
176176

177-
COCOAPODS: 1.15.2
177+
COCOAPODS: 1.16.2

0 commit comments

Comments
 (0)