Skip to content

Commit 3beebb8

Browse files
authored
Merge pull request #129 from line/upgrade/concurrency
Upgrade LINE SDK to 5.13.0
2 parents a7aa055 + ba5d876 commit 3beebb8

File tree

10 files changed

+54
-48
lines changed

10 files changed

+54
-48
lines changed

android/gradlew

100644100755
File mode changed.

example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
buildConfiguration = "Debug"
4545
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4646
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
4748
shouldUseLaunchSchemeArgsEnv = "YES">
4849
<MacroExpansion>
4950
<BuildableReference
@@ -72,11 +73,13 @@
7273
buildConfiguration = "Debug"
7374
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7475
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
76+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
7577
launchStyle = "0"
7678
useCustomWorkingDirectory = "NO"
7779
ignoresPersistentStateOnLaunch = "NO"
7880
debugDocumentVersioning = "YES"
7981
debugServiceExtension = "internal"
82+
enableGPUValidationMode = "1"
8083
allowLocationSimulation = "YES">
8184
<BuildableProductRunnable
8285
runnableDebuggingMode = "0">

example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/lib/src/app.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ class App extends StatelessWidget {
1111
return MaterialApp(
1212
theme: ThemeData(
1313
primaryColor: Colors.green,
14-
indicatorColor: Colors.white,
14+
tabBarTheme: const TabBarThemeData(
15+
indicatorColor: Colors.white,
16+
),
1517
),
1618
home: DefaultTabController(
1719
length: 2,

example/pubspec.lock

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,42 @@ packages:
55
dependency: transitive
66
description:
77
name: async
8-
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
8+
sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
99
url: "https://pub.dev"
1010
source: hosted
11-
version: "2.11.0"
11+
version: "2.13.0"
1212
boolean_selector:
1313
dependency: transitive
1414
description:
1515
name: boolean_selector
16-
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
16+
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
1717
url: "https://pub.dev"
1818
source: hosted
19-
version: "2.1.1"
19+
version: "2.1.2"
2020
characters:
2121
dependency: transitive
2222
description:
2323
name: characters
24-
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
24+
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
2525
url: "https://pub.dev"
2626
source: hosted
27-
version: "1.3.0"
27+
version: "1.4.0"
2828
clock:
2929
dependency: transitive
3030
description:
3131
name: clock
32-
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
32+
sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
3333
url: "https://pub.dev"
3434
source: hosted
35-
version: "1.1.1"
35+
version: "1.1.2"
3636
collection:
3737
dependency: transitive
3838
description:
3939
name: collection
40-
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
40+
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
4141
url: "https://pub.dev"
4242
source: hosted
43-
version: "1.19.0"
43+
version: "1.19.1"
4444
cupertino_icons:
4545
dependency: "direct main"
4646
description:
@@ -53,10 +53,10 @@ packages:
5353
dependency: transitive
5454
description:
5555
name: fake_async
56-
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
56+
sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
5757
url: "https://pub.dev"
5858
source: hosted
59-
version: "1.3.1"
59+
version: "1.3.3"
6060
flutter:
6161
dependency: "direct main"
6262
description: flutter
@@ -78,18 +78,18 @@ packages:
7878
dependency: transitive
7979
description:
8080
name: leak_tracker
81-
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
81+
sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
8282
url: "https://pub.dev"
8383
source: hosted
84-
version: "10.0.7"
84+
version: "10.0.9"
8585
leak_tracker_flutter_testing:
8686
dependency: transitive
8787
description:
8888
name: leak_tracker_flutter_testing
89-
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
89+
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
9090
url: "https://pub.dev"
9191
source: hosted
92-
version: "3.0.8"
92+
version: "3.0.9"
9393
leak_tracker_testing:
9494
dependency: transitive
9595
description:
@@ -102,10 +102,10 @@ packages:
102102
dependency: transitive
103103
description:
104104
name: matcher
105-
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
105+
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
106106
url: "https://pub.dev"
107107
source: hosted
108-
version: "0.12.16+1"
108+
version: "0.12.17"
109109
material_color_utilities:
110110
dependency: transitive
111111
description:
@@ -118,18 +118,18 @@ packages:
118118
dependency: transitive
119119
description:
120120
name: meta
121-
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
121+
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
122122
url: "https://pub.dev"
123123
source: hosted
124-
version: "1.15.0"
124+
version: "1.16.0"
125125
path:
126126
dependency: transitive
127127
description:
128128
name: path
129-
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
129+
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
130130
url: "https://pub.dev"
131131
source: hosted
132-
version: "1.9.0"
132+
version: "1.9.1"
133133
sky_engine:
134134
dependency: transitive
135135
description: flutter
@@ -139,50 +139,50 @@ packages:
139139
dependency: transitive
140140
description:
141141
name: source_span
142-
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
142+
sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
143143
url: "https://pub.dev"
144144
source: hosted
145-
version: "1.10.0"
145+
version: "1.10.1"
146146
stack_trace:
147147
dependency: transitive
148148
description:
149149
name: stack_trace
150-
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
150+
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
151151
url: "https://pub.dev"
152152
source: hosted
153-
version: "1.12.0"
153+
version: "1.12.1"
154154
stream_channel:
155155
dependency: transitive
156156
description:
157157
name: stream_channel
158-
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
158+
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
159159
url: "https://pub.dev"
160160
source: hosted
161-
version: "2.1.2"
161+
version: "2.1.4"
162162
string_scanner:
163163
dependency: transitive
164164
description:
165165
name: string_scanner
166-
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
166+
sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
167167
url: "https://pub.dev"
168168
source: hosted
169-
version: "1.3.0"
169+
version: "1.4.1"
170170
term_glyph:
171171
dependency: transitive
172172
description:
173173
name: term_glyph
174-
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
174+
sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
175175
url: "https://pub.dev"
176176
source: hosted
177-
version: "1.2.1"
177+
version: "1.2.2"
178178
test_api:
179179
dependency: transitive
180180
description:
181181
name: test_api
182-
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
182+
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
183183
url: "https://pub.dev"
184184
source: hosted
185-
version: "0.7.3"
185+
version: "0.7.4"
186186
vector_math:
187187
dependency: transitive
188188
description:
@@ -195,10 +195,10 @@ packages:
195195
dependency: transitive
196196
description:
197197
name: vm_service
198-
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
198+
sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
199199
url: "https://pub.dev"
200200
source: hosted
201-
version: "14.3.0"
201+
version: "15.0.0"
202202
sdks:
203-
dart: ">=3.4.0 <4.0.0"
203+
dart: ">=3.7.0-0 <4.0.0"
204204
flutter: ">=3.18.0-18.0.pre.54"

ios/flutter_line_sdk.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Swift.
1212
s.source = { :http => 'https://github.com/line/flutter_line_sdk' }
1313
s.source_files = 'flutter_line_sdk/Sources/flutter_line_sdk/**/*.swift'
1414
s.dependency 'Flutter'
15-
s.dependency 'LineSDKSwift', '~> 5.3'
15+
s.dependency 'LineSDKSwift', '~> 5.13'
1616

1717
s.swift_version = "4.2"
1818
s.swift_versions = ['4.2', '5.0']

ios/flutter_line_sdk/Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ios/flutter_line_sdk/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ let package = Package(
1212
.library(name: "flutter-line-sdk", targets: ["flutter_line_sdk"])
1313
],
1414
dependencies: [
15-
.package(url: "https://github.com/line/line-sdk-ios-swift.git", from: "5.3.0")
15+
.package(url: "https://github.com/line/line-sdk-ios-swift.git", from: "5.13.0")
1616
],
1717
targets: [
1818
.target(

ios/flutter_line_sdk/Sources/flutter_line_sdk/FlutterLineSdkPlugin.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ public class FlutterLineSdkPlugin: NSObject, FlutterPlugin {
2727
open url: URL,
2828
options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool
2929
{
30-
return LoginManager.shared.application(application, open: url, options: options)
30+
return LoginManager.shared.nonisolatedApplication(application, open: url, options: options)
3131
}
3232

3333
public func application(
3434
_ application: UIApplication,
3535
continue userActivity: NSUserActivity,
3636
restorationHandler: @escaping ([Any]) -> Void) -> Bool
3737
{
38-
return LoginManager.shared.application(application, open: userActivity.webpageURL)
38+
return LoginManager.shared.nonisolatedApplication(application, open: userActivity.webpageURL)
3939
}
4040
}
4141

@@ -122,6 +122,7 @@ extension LineChannelMethod {
122122
result(nil)
123123
}
124124

125+
@MainActor
125126
func login(arguments: [String: Any]?, result: @escaping FlutterResult) {
126127

127128
guard let args = arguments else {

0 commit comments

Comments
 (0)