Skip to content

Commit a8e2bab

Browse files
committed
[desktop_drop] macos compat with latest flutter master channel
1 parent 7208d8f commit a8e2bab

File tree

5 files changed

+28
-19
lines changed

5 files changed

+28
-19
lines changed

packages/desktop_drop/example/macos/Podfile.lock

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

2020
PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7
2121

22-
COCOAPODS: 1.11.3
22+
COCOAPODS: 1.12.1

packages/desktop_drop/example/macos/Runner.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
isa = PBXProject;
204204
attributes = {
205205
LastSwiftUpdateCheck = 0920;
206-
LastUpgradeCheck = 1300;
206+
LastUpgradeCheck = 1430;
207207
ORGANIZATIONNAME = "";
208208
TargetAttributes = {
209209
33CC10EC2044A3C60003C045 = {

packages/desktop_drop/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

packages/desktop_drop/example/pubspec.lock

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ packages:
3737
dependency: transitive
3838
description:
3939
name: collection
40-
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
40+
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
4141
url: "https://pub.dev"
4242
source: hosted
43-
version: "1.17.1"
43+
version: "1.18.0"
4444
cross_file:
4545
dependency: "direct main"
4646
description:
@@ -115,18 +115,18 @@ packages:
115115
dependency: transitive
116116
description:
117117
name: matcher
118-
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
118+
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
119119
url: "https://pub.dev"
120120
source: hosted
121-
version: "0.12.15"
121+
version: "0.12.16"
122122
material_color_utilities:
123123
dependency: transitive
124124
description:
125125
name: material_color_utilities
126-
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
126+
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
127127
url: "https://pub.dev"
128128
source: hosted
129-
version: "0.2.0"
129+
version: "0.5.0"
130130
meta:
131131
dependency: transitive
132132
description:
@@ -152,26 +152,26 @@ packages:
152152
dependency: transitive
153153
description:
154154
name: source_span
155-
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
155+
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
156156
url: "https://pub.dev"
157157
source: hosted
158-
version: "1.9.1"
158+
version: "1.10.0"
159159
stack_trace:
160160
dependency: transitive
161161
description:
162162
name: stack_trace
163-
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
163+
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
164164
url: "https://pub.dev"
165165
source: hosted
166-
version: "1.11.0"
166+
version: "1.11.1"
167167
stream_channel:
168168
dependency: transitive
169169
description:
170170
name: stream_channel
171-
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
171+
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
172172
url: "https://pub.dev"
173173
source: hosted
174-
version: "2.1.1"
174+
version: "2.1.2"
175175
string_scanner:
176176
dependency: transitive
177177
description:
@@ -192,10 +192,10 @@ packages:
192192
dependency: transitive
193193
description:
194194
name: test_api
195-
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
195+
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
196196
url: "https://pub.dev"
197197
source: hosted
198-
version: "0.5.1"
198+
version: "0.6.1"
199199
vector_math:
200200
dependency: transitive
201201
description:
@@ -204,6 +204,14 @@ packages:
204204
url: "https://pub.dev"
205205
source: hosted
206206
version: "2.1.4"
207+
web:
208+
dependency: transitive
209+
description:
210+
name: web
211+
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
212+
url: "https://pub.dev"
213+
source: hosted
214+
version: "0.1.4-beta"
207215
sdks:
208-
dart: ">=3.0.0-0 <4.0.0"
216+
dart: ">=3.1.0-185.0.dev <4.0.0"
209217
flutter: ">=1.20.0"

packages/desktop_drop/macos/Classes/DesktopDropPlugin.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ private func findFlutterViewController(_ viewController: NSViewController?) -> F
2020
public class DesktopDropPlugin: NSObject, FlutterPlugin {
2121
public static func register(with registrar: FlutterPluginRegistrar) {
2222
guard let app = NSApplication.shared.delegate as? FlutterAppDelegate else { return }
23-
guard let vc = findFlutterViewController(app.mainFlutterWindow.contentViewController) else { return }
23+
guard let flutterWindow = app.mainFlutterWindow else { return }
24+
guard let vc = findFlutterViewController(flutterWindow.contentViewController) else { return }
2425

2526
let channel = FlutterMethodChannel(name: "desktop_drop", binaryMessenger: registrar.messenger)
2627
let instance = DesktopDropPlugin()

0 commit comments

Comments
 (0)