Skip to content

Commit 4e1486b

Browse files
simonbengtssonsimonbengtsson
committed
Upgrade flutter and libs
1 parent 427600d commit 4e1486b

File tree

8 files changed

+105
-124
lines changed

8 files changed

+105
-124
lines changed

‎android/app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ android {
3434
ndkVersion flutter.ndkVersion
3535

3636
compileOptions {
37-
sourceCompatibility JavaVersion.VERSION_1_8
38-
targetCompatibility JavaVersion.VERSION_1_8
37+
sourceCompatibility JavaVersion.VERSION_17
38+
targetCompatibility JavaVersion.VERSION_17
3939
}
4040

4141
kotlinOptions {
42-
jvmTarget = '1.8'
42+
jvmTarget = '17'
4343
}
4444

4545
sourceSets {

‎android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
6+

‎android/settings.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pluginManagement {
1919

2020
plugins {
2121
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
22-
id "com.android.application" version "7.3.0" apply false
22+
id "com.android.application" version '8.2.1' apply false
2323
id "org.jetbrains.kotlin.android" version "1.9.22" apply false
2424
}
2525

‎ios/Podfile.lock‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ PODS:
5454
- FlutterMacOS
5555
- quick_look (0.0.1):
5656
- Flutter
57-
- receive_sharing_intent (1.8.0):
57+
- receive_sharing_intent (1.8.1):
5858
- Flutter
59-
- SDWebImage (5.19.7):
60-
- SDWebImage/Core (= 5.19.7)
61-
- SDWebImage/Core (5.19.7)
59+
- SDWebImage (5.20.0):
60+
- SDWebImage/Core (= 5.20.0)
61+
- SDWebImage/Core (5.20.0)
6262
- Sentry/HybridSDK (8.35.1)
6363
- sentry_flutter (8.8.0):
6464
- Flutter
@@ -72,7 +72,7 @@ PODS:
7272
- SwiftyGif (5.4.5)
7373
- url_launcher_ios (0.0.1):
7474
- Flutter
75-
- wakelock (0.0.1):
75+
- wakelock_plus (0.0.1):
7676
- Flutter
7777
- WebRTC-SDK (125.6422.04)
7878

@@ -93,7 +93,7 @@ DEPENDENCIES:
9393
- share_plus (from `.symlinks/plugins/share_plus/ios`)
9494
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
9595
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
96-
- wakelock (from `.symlinks/plugins/wakelock/ios`)
96+
- wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
9797

9898
SPEC REPOS:
9999
trunk:
@@ -137,34 +137,34 @@ EXTERNAL SOURCES:
137137
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
138138
url_launcher_ios:
139139
:path: ".symlinks/plugins/url_launcher_ios/ios"
140-
wakelock:
141-
:path: ".symlinks/plugins/wakelock/ios"
140+
wakelock_plus:
141+
:path: ".symlinks/plugins/wakelock_plus/ios"
142142

143143
SPEC CHECKSUMS:
144-
device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
144+
device_info_plus: 71ffc6ab7634ade6267c7a93088ed7e4f74e5896
145145
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
146146
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
147-
file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655
148-
file_selector_ios: f0670c1064a8c8450e38145d8043160105d0b97c
147+
file_picker: 9b3292d7c8bc68c8a7bf8eb78f730e49c8efc517
148+
file_selector_ios: f92e583d43608aebc2e4a18daac30b8902845502
149149
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
150-
flutter_webrtc: 75b868e4f9e817c7a9a42ca4b6169063de4eec9f
151-
in_app_review: 318597b3a06c22bb46dc454d56828c85f444f99d
152-
integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
153-
package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
154-
pasteboard: 982969ebaa7c78af3e6cc7761e8f5e77565d9ce0
155-
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
156-
quick_look: 59394001d6b484c13fd5f73b555398d523726c8c
157-
receive_sharing_intent: df9c334dc9feadcbd3266e5cb49c8443405e1c9f
158-
SDWebImage: 8a6b7b160b4d710e2a22b6900e25301075c34cb3
150+
flutter_webrtc: 89f078a5050779eaa4a6a4f472954737bb91f39f
151+
in_app_review: 8efcf4a4d3ba72d5d776d29e5a268f1abf64d184
152+
integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
153+
package_info_plus: 580e9a5f1b6ca5594e7c9ed5f92d1dfb2a66b5e1
154+
pasteboard: 49088aeb6119d51f976a421db60d8e1ab079b63c
155+
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
156+
quick_look: 189b72730b7c8407736ad8e4e89a6dd79dd552f8
157+
receive_sharing_intent: 222384f00ffe7e952bbfabaa9e3967cb87e5fe00
158+
SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
159159
Sentry: 1fe34e9c2cbba1e347623610d26db121dcb569f1
160-
sentry_flutter: a39c2a2d67d5e5b9cb0b94a4985c76dd5b3fc737
161-
share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
162-
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
160+
sentry_flutter: e24b397f9a61fa5bbefd8279c3b2242ca86faa90
161+
share_plus: 011d6fb4f9d2576b83179a3a5c5e323202cdabcf
162+
shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
163163
SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
164-
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
165-
wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
164+
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
165+
wakelock_plus: 04623e3f525556020ebd4034310f20fe7fda8b49
166166
WebRTC-SDK: c3d69a87e7185fad3568f6f3cff7c9ac5890acf3
167167

168168
PODFILE CHECKSUM: 8ef235bdccd8ca5a972ce5c0d02d76a19067f053
169169

170-
COCOAPODS: 1.15.2
170+
COCOAPODS: 1.16.2

‎lib/transfer/connector.dart‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'package:http/http.dart' as http;
77
import 'package:in_app_review/in_app_review.dart';
88
import 'package:shared_preferences/shared_preferences.dart';
99
import 'package:simple_peer/simple_peer.dart';
10-
import 'package:wakelock/wakelock.dart';
10+
import 'package:wakelock_plus/wakelock_plus.dart';
1111

1212
import '../helpers.dart';
1313
import '../model/device.dart';
@@ -75,7 +75,7 @@ class Connector {
7575
});
7676
try {
7777
if (!Platform.isLinux && !Platform.isWindows) {
78-
await Wakelock.enable();
78+
await WakelockPlus.enable();
7979
}
8080
logger('SENDER: Start transfer $transferId');
8181
await googlePing();
@@ -118,7 +118,7 @@ class Connector {
118118
rethrow;
119119
} finally {
120120
if (!Platform.isLinux && !Platform.isWindows) {
121-
await Wakelock.disable();
121+
await WakelockPlus.disable();
122122
}
123123
List<String> connectionTypes = [];
124124
if (sender != null) {
@@ -251,7 +251,7 @@ class Connector {
251251
config: config, dataChannelConfig: dcConfig, verbose: true);
252252
signal = peer.signal;
253253
if (!Platform.isLinux && !Platform.isWindows) {
254-
await Wakelock.enable();
254+
await WakelockPlus.enable();
255255
}
256256
var messageSender =
257257
MessageSender(localDevice, remoteId, transferId, signaling);
@@ -292,7 +292,7 @@ class Connector {
292292
//await receiver.peer.connection.close();
293293
}
294294
if (!Platform.isLinux && !Platform.isWindows) {
295-
await Wakelock.disable();
295+
await WakelockPlus.disable();
296296
}
297297
activeTransferId = null;
298298
signaling.receivedMessages = <String, dynamic>{};

‎macos/Podfile.lock‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ PODS:
3434
- FlutterMacOS
3535
- url_launcher_macos (0.0.1):
3636
- FlutterMacOS
37-
- wakelock_macos (0.0.1):
37+
- wakelock_plus (0.0.1):
3838
- FlutterMacOS
3939
- WebRTC-SDK (125.6422.04)
4040
- window_manager (0.2.0):
@@ -56,7 +56,7 @@ DEPENDENCIES:
5656
- shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
5757
- tray_manager (from `Flutter/ephemeral/.symlinks/plugins/tray_manager/macos`)
5858
- url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
59-
- wakelock_macos (from `Flutter/ephemeral/.symlinks/plugins/wakelock_macos/macos`)
59+
- wakelock_plus (from `Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos`)
6060
- window_manager (from `Flutter/ephemeral/.symlinks/plugins/window_manager/macos`)
6161

6262
SPEC REPOS:
@@ -95,32 +95,32 @@ EXTERNAL SOURCES:
9595
:path: Flutter/ephemeral/.symlinks/plugins/tray_manager/macos
9696
url_launcher_macos:
9797
:path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
98-
wakelock_macos:
99-
:path: Flutter/ephemeral/.symlinks/plugins/wakelock_macos/macos
98+
wakelock_plus:
99+
:path: Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos
100100
window_manager:
101101
:path: Flutter/ephemeral/.symlinks/plugins/window_manager/macos
102102

103103
SPEC CHECKSUMS:
104-
desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898
105-
device_info_plus: ce1b7762849d3ec103d0e0517299f2db7ad60720
106-
file_selector_macos: 54fdab7caa3ac3fc43c9fac4d7d8d231277f8cf2
107-
flutter_webrtc: 2b4e4a2de70a1485836e40fd71a7a94c77d49bd9
104+
desktop_drop: e0b672a7d84c0a6cbc378595e82cdb15f2970a43
105+
device_info_plus: a56e6e74dbbd2bb92f2da12c64ddd4f67a749041
106+
file_selector_macos: 585232b688707857504f9cb5f985a7c97fe4dd30
107+
flutter_webrtc: f68f019e758ba8ea97d3a2aa5d85b3b25bce4015
108108
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
109-
in_app_review: a850789fad746e89bce03d4aeee8078b45a53fd0
110-
package_info_plus: fa739dd842b393193c5ca93c26798dff6e3d0e0c
111-
pasteboard: 9b69dba6fedbb04866be632205d532fe2f6b1d99
112-
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
113-
screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38
109+
in_app_review: ffac7b4a0a71cdaecb1383807e7a8244b09e6d93
110+
package_info_plus: a8a591e70e87ce97ce5d21b2594f69cea9e0312f
111+
pasteboard: 278d8100149f940fb795d6b3a74f0720c890ecb7
112+
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
113+
screen_retriever: 4f97c103641aab8ce183fa5af3b87029df167936
114114
Sentry: 1fe34e9c2cbba1e347623610d26db121dcb569f1
115-
sentry_flutter: a39c2a2d67d5e5b9cb0b94a4985c76dd5b3fc737
116-
share_plus: 36537c04ce0c3e3f5bd297ce4318b6d5ee5fd6cf
117-
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
118-
tray_manager: 9064e219c56d75c476e46b9a21182087930baf90
119-
url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
120-
wakelock_macos: bc3f2a9bd8d2e6c89fee1e1822e7ddac3bd004a9
115+
sentry_flutter: e24b397f9a61fa5bbefd8279c3b2242ca86faa90
116+
share_plus: 11c7b7fa7020465584eca3ff6392c5bc1e399d6e
117+
shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
118+
tray_manager: a104b5c81b578d83f3c3d0f40a997c8b10810166
119+
url_launcher_macos: de10e46d8d8b9e3a7b8a133e8de92b104379f05e
120+
wakelock_plus: 21ddc249ac4b8d018838dbdabd65c5976c308497
121121
WebRTC-SDK: c3d69a87e7185fad3568f6f3cff7c9ac5890acf3
122-
window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8
122+
window_manager: 1d01fa7ac65a6e6f83b965471b1a7fdd3f06166c
123123

124124
PODFILE CHECKSUM: 963639d5148db2f75442340858b9034c09ed58df
125125

126-
COCOAPODS: 1.15.2
126+
COCOAPODS: 1.16.2

0 commit comments

Comments
 (0)