Skip to content

Commit 8d39ebc

Browse files
Pavel401Pavel401
authored
Merge pull request #454 from ronaksingh27/ronak55
task warrior macos build successfull
2 parents 52360f8 + 868b5d4 commit 8d39ebc

14 files changed

+429
-376
lines changed

‎lib/app/models/storage/savefile.dart

+15-16
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
import 'dart:io';
22
import 'dart:typed_data';
3-
4-
import 'package:file_picker_writable/file_picker_writable.dart';
53
import 'package:file_selector/file_selector.dart';
4+
import 'package:file_picker_writable/file_picker_writable.dart';
65

76
Future<void> saveServerCert(String contents) async {
87
if (Platform.isLinux || Platform.isMacOS || Platform.isWindows) {
9-
// ignore: deprecated_member_use
10-
var path = await getSavePath(
8+
var saveLocation = await getSaveLocation(
119
suggestedName: 'server.cert.pem',
1210
);
13-
var data = Uint8List.fromList(contents.codeUnits);
14-
var file = XFile.fromData(
15-
data,
16-
);
17-
await file.saveTo(path!);
11+
12+
if (saveLocation != null) {
13+
var data = Uint8List.fromList(contents.codeUnits);
14+
var file = XFile.fromData(data);
15+
await file.saveTo(saveLocation.path);
16+
}
1817
} else {
1918
await FilePickerWritable().openFileForCreate(
2019
fileName: 'server.cert.pem',
@@ -28,15 +27,15 @@ Future<void> exportTasks({
2827
required String suggestedName,
2928
}) async {
3029
if (Platform.isLinux || Platform.isMacOS || Platform.isWindows) {
31-
// ignore: deprecated_member_use
32-
var path = await getSavePath(
30+
var saveLocation = await getSaveLocation(
3331
suggestedName: suggestedName,
3432
);
35-
var data = Uint8List.fromList(contents.codeUnits);
36-
var file = XFile.fromData(
37-
data,
38-
);
39-
await file.saveTo(path!);
33+
34+
if (saveLocation != null) {
35+
var data = Uint8List.fromList(contents.codeUnits);
36+
var file = XFile.fromData(data);
37+
await file.saveTo(saveLocation.path);
38+
}
4039
} else {
4140
await FilePickerWritable().openFileForCreate(
4241
fileName: suggestedName,

‎lib/app/modules/reports/views/burn_down_daily.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class BurnDownDaily extends StatelessWidget {
6565
),
6666
tooltipBehavior:
6767
reportsController.dailyBurndownTooltipBehaviour,
68-
series: <ChartSeries>[
68+
series: <CartesianSeries>[
6969
/// This is the completed tasks
7070
StackedColumnSeries<ChartData, String>(
7171
groupName: 'Group A',

‎lib/app/modules/reports/views/burn_down_daily_taskc.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ class BurnDownDailyTaskc extends StatelessWidget {
129129
),
130130
),
131131
tooltipBehavior: _dailyBurndownTooltipBehaviour,
132-
series: <ChartSeries>[
132+
series: <CartesianSeries>[
133133
StackedColumnSeries<ChartData, String>(
134134
groupName: 'Group A',
135135
enableTooltip: true,

‎lib/app/modules/reports/views/burn_down_monthly.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class BurnDownMonthly extends StatelessWidget {
5454
),
5555
tooltipBehavior:
5656
reportsController.monthlyBurndownTooltipBehaviour,
57-
series: <ChartSeries>[
57+
series: <CartesianSeries>[
5858
StackedColumnSeries<ChartData, String>(
5959
groupName: 'Group A',
6060
enableTooltip: true,

‎lib/app/modules/reports/views/burn_down_monthly_taskc.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class BurnDownMonthlyTaskc extends StatelessWidget {
135135
),
136136
),
137137
tooltipBehavior: _monthlyBurndownTooltipBehaviour,
138-
series: <ChartSeries>[
138+
series: <CartesianSeries>[
139139
StackedColumnSeries<ChartData, String>(
140140
groupName: 'Group A',
141141
enableTooltip: true,

‎lib/app/modules/reports/views/burn_down_weekly.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class BurnDownWeekly extends StatelessWidget {
5353
)),
5454
),
5555
tooltipBehavior: reportsController.weeklyBurndownTooltipBehaviour,
56-
series: <ChartSeries>[
56+
series: <CartesianSeries>[
5757
///this is the completed tasks
5858
StackedColumnSeries<ChartData, String>(
5959
groupName: 'Group A',

‎lib/app/modules/reports/views/burn_down_weekly_taskc.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ class BurnDownWeeklyTask extends StatelessWidget {
143143
),
144144
),
145145
tooltipBehavior: _weeklyBurndownTooltipBehaviour,
146-
series: <ChartSeries>[
146+
series: <CartesianSeries>[
147147
///this is the completed tasks
148148
StackedColumnSeries<ChartData, String>(
149149
groupName: 'Group A',

‎lib/app/services/notification_services.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class NotificationService {
107107
uiLocalNotificationDateInterpretation:
108108
UILocalNotificationDateInterpretation.absoluteTime,
109109
// ignore: deprecated_member_use
110-
androidAllowWhileIdle: true)
110+
androidScheduleMode: AndroidScheduleMode.exactAllowWhileIdle)
111111
.then((value) {
112112
if (kDebugMode) {
113113
print('Notification scheduled successfully');

‎macos/Flutter/GeneratedPluginRegistrant.swift

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import FlutterMacOS
66
import Foundation
77

88
import connectivity_plus
9+
import file_picker
910
import file_picker_writable
1011
import file_selector_macos
1112
import flutter_local_notifications
@@ -14,11 +15,12 @@ import package_info_plus
1415
import path_provider_foundation
1516
import permission_handler_apple
1617
import shared_preferences_foundation
17-
import sqflite
18+
import sqflite_darwin
1819
import url_launcher_macos
1920

2021
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
21-
ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
22+
ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
23+
FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
2224
FilePickerWritablePlugin.register(with: registry.registrar(forPlugin: "FilePickerWritablePlugin"))
2325
FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
2426
FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))

‎macos/Podfile.lock

+22-23
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
PODS:
22
- connectivity_plus (0.0.1):
33
- FlutterMacOS
4-
- ReachabilitySwift
4+
- file_picker (0.0.1):
5+
- FlutterMacOS
56
- file_picker_writable (0.0.1):
67
- FlutterMacOS
78
- file_selector_macos (0.0.1):
@@ -18,18 +19,18 @@ PODS:
1819
- FlutterMacOS
1920
- permission_handler_apple (0.0.1):
2021
- FlutterMacOS
21-
- ReachabilitySwift (5.2.3)
2222
- shared_preferences_foundation (0.0.1):
2323
- Flutter
2424
- FlutterMacOS
25-
- sqflite (0.0.3):
25+
- sqflite_darwin (0.0.4):
2626
- Flutter
2727
- FlutterMacOS
2828
- url_launcher_macos (0.0.1):
2929
- FlutterMacOS
3030

3131
DEPENDENCIES:
3232
- connectivity_plus (from `Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos`)
33+
- file_picker (from `Flutter/ephemeral/.symlinks/plugins/file_picker/macos`)
3334
- file_picker_writable (from `Flutter/ephemeral/.symlinks/plugins/file_picker_writable/macos`)
3435
- file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`)
3536
- flutter_local_notifications (from `Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos`)
@@ -39,16 +40,14 @@ DEPENDENCIES:
3940
- path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
4041
- permission_handler_apple (from `Flutter/ephemeral/.symlinks/plugins/permission_handler_apple/macos`)
4142
- shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
42-
- sqflite (from `Flutter/ephemeral/.symlinks/plugins/sqflite/darwin`)
43+
- sqflite_darwin (from `Flutter/ephemeral/.symlinks/plugins/sqflite_darwin/darwin`)
4344
- url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
4445

45-
SPEC REPOS:
46-
trunk:
47-
- ReachabilitySwift
48-
4946
EXTERNAL SOURCES:
5047
connectivity_plus:
5148
:path: Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos
49+
file_picker:
50+
:path: Flutter/ephemeral/.symlinks/plugins/file_picker/macos
5251
file_picker_writable:
5352
:path: Flutter/ephemeral/.symlinks/plugins/file_picker_writable/macos
5453
file_selector_macos:
@@ -67,26 +66,26 @@ EXTERNAL SOURCES:
6766
:path: Flutter/ephemeral/.symlinks/plugins/permission_handler_apple/macos
6867
shared_preferences_foundation:
6968
:path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin
70-
sqflite:
71-
:path: Flutter/ephemeral/.symlinks/plugins/sqflite/darwin
69+
sqflite_darwin:
70+
:path: Flutter/ephemeral/.symlinks/plugins/sqflite_darwin/darwin
7271
url_launcher_macos:
7372
:path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
7473

7574
SPEC CHECKSUMS:
76-
connectivity_plus: 18d3c32514c886e046de60e9c13895109866c747
77-
file_picker_writable: 91694d55c22f8430d4be119f0afb49755e65cd0c
78-
file_selector_macos: 468fb6b81fac7c0e88d71317f3eec34c3b008ff9
79-
flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4
80-
flutter_native_timezone: 3a4724189c47dea215bb3e168e555e18308d312c
75+
connectivity_plus: 4adf20a405e25b42b9c9f87feff8f4b6fde18a4e
76+
file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a
77+
file_picker_writable: 016b61062ce0bfdd9f4e6cc43109a9d12c5023e7
78+
file_selector_macos: 6280b52b459ae6c590af5d78fc35c7267a3c4b31
79+
flutter_local_notifications: 13862b132e32eb858dea558a86d45d08daeacfe7
80+
flutter_native_timezone: f3b0f832063127bd0ea2cecbf85c23a74307711b
8181
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
82-
package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce
83-
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
84-
permission_handler_apple: fa7012038b5aa4ed34436aa5aa4e943f94b32417
85-
ReachabilitySwift: 7f151ff156cea1481a8411701195ac6a984f4979
86-
shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
87-
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
88-
url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95
82+
package_info_plus: f0052d280d17aa382b932f399edf32507174e870
83+
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
84+
permission_handler_apple: 56915a86d20cce22ca66684ca8a2226fbe2467fc
85+
shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
86+
sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
87+
url_launcher_macos: 0fba8ddabfc33ce0a9afe7c5fef5aab3d8d2d673
8988

9089
PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
9190

92-
COCOAPODS: 1.14.3
91+
COCOAPODS: 1.16.2

‎macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
ignoresPersistentStateOnLaunch = "NO"
6060
debugDocumentVersioning = "YES"
6161
debugServiceExtension = "internal"
62+
enableGPUValidationMode = "1"
6263
allowLocationSimulation = "YES">
6364
<BuildableProductRunnable
6465
runnableDebuggingMode = "0">

‎macos/Runner/AppDelegate.swift

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
import Cocoa
22
import FlutterMacOS
33

4-
@NSApplicationMain
4+
@main
55
class AppDelegate: FlutterAppDelegate {
66
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
77
return true
88
}
9+
10+
override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
11+
return true
12+
}
913
}

0 commit comments

Comments
 (0)