Skip to content

Commit 0b095ae

Browse files
authored
Fix macOS build (#196)
* Regenerate macos project * Update [email protected] * `flutter packages upgrade`
1 parent 16ce5e0 commit 0b095ae

File tree

19 files changed

+721
-490
lines changed

19 files changed

+721
-490
lines changed

.metadata

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file should be version controlled.
55

66
version:
7-
revision: f1875d570e39de09040c8f79aa13cc56baab8db1
7+
revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
88
channel: stable
99

1010
project_type: app
@@ -15,6 +15,9 @@ migration:
1515
- platform: root
1616
create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
1717
base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1
18+
- platform: macos
19+
create_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
20+
base_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
1821

1922
# User provided section
2023

@@ -23,5 +26,5 @@ migration:
2326
#
2427
# Files that are not part of the templates will be ignored by default.
2528
unmanaged_files:
26-
- "lib/main.dart"
27-
- "ios/Runner.xcodeproj/project.pbxproj"
29+
- 'lib/main.dart'
30+
- 'ios/Runner.xcodeproj/project.pbxproj'

macos/Flutter/GeneratedPluginRegistrant.swift

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,24 @@ import Foundation
77

88
import audio_session
99
import facebook_auth_desktop
10+
import file_selector_macos
1011
import firebase_core
1112
import firebase_crashlytics
1213
import firebase_messaging
1314
import flutter_secure_storage_macos
1415
import just_audio
1516
import package_info_plus
16-
import path_provider_macos
17+
import path_provider_foundation
1718
import share_plus
18-
import shared_preferences_macos
19+
import shared_preferences_foundation
1920
import sqflite
2021
import url_launcher_macos
21-
import wakelock_macos
22+
import wakelock_plus
2223

2324
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
2425
AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin"))
2526
FacebookAuthDesktopPlugin.register(with: registry.registrar(forPlugin: "FacebookAuthDesktopPlugin"))
27+
FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
2628
FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
2729
FLTFirebaseCrashlyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCrashlyticsPlugin"))
2830
FLTFirebaseMessagingPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseMessagingPlugin"))
@@ -34,5 +36,5 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
3436
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
3537
SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
3638
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
37-
WakelockMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockMacosPlugin"))
39+
WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin"))
3840
}

macos/Podfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ target 'Runner' do
3131
use_modular_headers!
3232

3333
flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
34+
target 'RunnerTests' do
35+
inherit! :search_paths
36+
end
3437
end
3538

3639
post_install do |installer|

macos/Podfile.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ PODS:
105105
- FMDB (>= 2.7.5)
106106
- url_launcher_macos (0.0.1):
107107
- FlutterMacOS
108-
- wakelock_macos (0.0.1):
108+
- wakelock_plus (0.0.1):
109109
- FlutterMacOS
110110

111111
DEPENDENCIES:
@@ -123,7 +123,7 @@ DEPENDENCIES:
123123
- shared_preferences_macos (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_macos/macos`)
124124
- sqflite (from `Flutter/ephemeral/.symlinks/plugins/sqflite/macos`)
125125
- url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
126-
- wakelock_macos (from `Flutter/ephemeral/.symlinks/plugins/wakelock_macos/macos`)
126+
- wakelock_plus (from `Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos`)
127127

128128
SPEC REPOS:
129129
trunk:
@@ -169,8 +169,8 @@ EXTERNAL SOURCES:
169169
:path: Flutter/ephemeral/.symlinks/plugins/sqflite/macos
170170
url_launcher_macos:
171171
:path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
172-
wakelock_macos:
173-
:path: Flutter/ephemeral/.symlinks/plugins/wakelock_macos/macos
172+
wakelock_plus:
173+
:path: Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos
174174

175175
SPEC CHECKSUMS:
176176
audio_session: dea1f41890dbf1718f04a56f1d6150fd50039b72
@@ -185,8 +185,8 @@ SPEC CHECKSUMS:
185185
FirebaseCrashlytics: 3210572ddb77801e5a0bd9d7bc890769f2066a0c
186186
FirebaseInstallations: 0a115432c4e223c5ab20b0dbbe4cbefa793a0e8e
187187
FirebaseMessaging: a4d7910e4af663c9cbfc1071c5bef34651690949
188-
flutter_secure_storage_macos: 75c8cadfdba05ca007c0fa4ea0c16e5cf85e521b
189-
FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811
188+
flutter_secure_storage_macos: d56e2d218c1130b262bef8b4a7d64f88d7f9c9ea
189+
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
190190
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
191191
GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f
192192
GoogleUtilities: bad72cb363809015b1f7f19beb1f1cd23c589f95
@@ -199,8 +199,8 @@ SPEC CHECKSUMS:
199199
shared_preferences_macos: a64dc611287ed6cbe28fd1297898db1336975727
200200
sqflite: a5789cceda41d54d23f31d6de539d65bb14100ea
201201
url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3
202-
wakelock_macos: bc3f2a9bd8d2e6c89fee1e1822e7ddac3bd004a9
202+
wakelock_plus: 4783562c9a43d209c458cb9b30692134af456269
203203

204-
PODFILE CHECKSUM: a884f6dd3f7494f3892ee6c81feea3a3abbf9153
204+
PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
205205

206-
COCOAPODS: 1.11.3
206+
COCOAPODS: 1.12.1

0 commit comments

Comments
 (0)