Skip to content

Commit af4043e

Browse files
authored
Bump Dependencies, Adjust Target SDK on Android, Update Forks (#309)
1 parent a840a54 commit af4043e

File tree

142 files changed

+4800
-3484
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+4800
-3484
lines changed

.github/workflows/lint_test_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: macos-13
11+
runs-on: macos-15
1212

1313
steps:
1414
- uses: actions/checkout@v3

android/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ key.properties
1414
**/*.jks
1515

1616
Gemfile.lock
17+
build/

android/app/build.gradle

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ if (flutterVersionName == null) {
2626
}
2727

2828
android {
29-
compileSdkVersion flutter.compileSdkVersion
30-
ndkVersion flutter.ndkVersion
31-
3229
compileOptions {
3330
sourceCompatibility JavaVersion.VERSION_1_8
3431
targetCompatibility JavaVersion.VERSION_1_8
@@ -45,7 +42,8 @@ android {
4542
defaultConfig {
4643
applicationId "de.tum.in.tumcampus"
4744
minSdkVersion 29
48-
targetSdkVersion flutter.targetSdkVersion
45+
compileSdkVersion 35
46+
targetSdkVersion 35
4947
ndkVersion "27.0.12077973"
5048
versionCode flutterVersionCode.toInteger()
5149
versionName flutterVersionName
@@ -90,7 +88,7 @@ flutter {
9088

9189
dependencies {
9290
implementation 'com.android.support:multidex'
93-
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3'
91+
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0'
9492
}
9593

9694
apply plugin: 'com.google.firebase.crashlytics'

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ 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-8.11.1-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip

android/settings.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version '8.9.0' apply false
22-
id "org.jetbrains.kotlin.android" version "1.9.20" apply false
23-
id "org.jetbrains.kotlin.plugin.serialization" version "2.0.21" apply false
24-
id "com.google.gms.google-services" version "4.4.2" apply false
25-
id "com.google.firebase.crashlytics" version "3.0.3" apply false
21+
id "com.android.application" version '8.11.0' apply false
22+
id "org.jetbrains.kotlin.android" version "2.2.0" apply false
23+
id "org.jetbrains.kotlin.plugin.serialization" version "2.2.0" apply false
24+
id "com.google.gms.google-services" version "4.4.3" apply false
25+
id "com.google.firebase.crashlytics" version "3.0.4" apply false
2626
}
2727

2828
include ":app"

ios/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ Runner/GeneratedPluginRegistrant.*
3434
!default.perspectivev3
3535

3636
Gemfile.lock
37+
build/

ios/Podfile.lock

Lines changed: 77 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,76 @@
11
PODS:
22
- device_info_plus (0.0.1):
33
- Flutter
4-
- Firebase/CoreOnly (11.8.0):
5-
- FirebaseCore (~> 11.8.0)
6-
- Firebase/Crashlytics (11.8.0):
4+
- Firebase/CoreOnly (11.15.0):
5+
- FirebaseCore (~> 11.15.0)
6+
- Firebase/Crashlytics (11.15.0):
77
- Firebase/CoreOnly
8-
- FirebaseCrashlytics (~> 11.8.0)
9-
- Firebase/RemoteConfig (11.8.0):
8+
- FirebaseCrashlytics (~> 11.15.0)
9+
- Firebase/RemoteConfig (11.15.0):
1010
- Firebase/CoreOnly
11-
- FirebaseRemoteConfig (~> 11.8.0)
12-
- firebase_core (3.12.1):
13-
- Firebase/CoreOnly (= 11.8.0)
11+
- FirebaseRemoteConfig (~> 11.15.0)
12+
- firebase_core (3.15.1):
13+
- Firebase/CoreOnly (= 11.15.0)
1414
- Flutter
15-
- firebase_crashlytics (4.3.4):
16-
- Firebase/Crashlytics (= 11.8.0)
15+
- firebase_crashlytics (4.3.9):
16+
- Firebase/Crashlytics (= 11.15.0)
1717
- firebase_core
1818
- Flutter
19-
- firebase_remote_config (5.4.2):
20-
- Firebase/RemoteConfig (= 11.8.0)
19+
- firebase_remote_config (5.4.7):
20+
- Firebase/RemoteConfig (= 11.15.0)
2121
- firebase_core
2222
- Flutter
23-
- FirebaseABTesting (11.8.0):
24-
- FirebaseCore (~> 11.8.0)
25-
- FirebaseCore (11.8.1):
26-
- FirebaseCoreInternal (~> 11.8.0)
27-
- GoogleUtilities/Environment (~> 8.0)
28-
- GoogleUtilities/Logger (~> 8.0)
29-
- FirebaseCoreExtension (11.8.0):
30-
- FirebaseCore (~> 11.8.0)
31-
- FirebaseCoreInternal (11.8.0):
32-
- "GoogleUtilities/NSData+zlib (~> 8.0)"
33-
- FirebaseCrashlytics (11.8.0):
34-
- FirebaseCore (~> 11.8.0)
23+
- FirebaseABTesting (11.15.0):
24+
- FirebaseCore (~> 11.15.0)
25+
- FirebaseCore (11.15.0):
26+
- FirebaseCoreInternal (~> 11.15.0)
27+
- GoogleUtilities/Environment (~> 8.1)
28+
- GoogleUtilities/Logger (~> 8.1)
29+
- FirebaseCoreExtension (11.15.0):
30+
- FirebaseCore (~> 11.15.0)
31+
- FirebaseCoreInternal (11.15.0):
32+
- "GoogleUtilities/NSData+zlib (~> 8.1)"
33+
- FirebaseCrashlytics (11.15.0):
34+
- FirebaseCore (~> 11.15.0)
3535
- FirebaseInstallations (~> 11.0)
3636
- FirebaseRemoteConfigInterop (~> 11.0)
3737
- FirebaseSessions (~> 11.0)
3838
- GoogleDataTransport (~> 10.0)
39-
- GoogleUtilities/Environment (~> 8.0)
39+
- GoogleUtilities/Environment (~> 8.1)
4040
- nanopb (~> 3.30910.0)
4141
- PromisesObjC (~> 2.4)
42-
- FirebaseInstallations (11.8.0):
43-
- FirebaseCore (~> 11.8.0)
44-
- GoogleUtilities/Environment (~> 8.0)
45-
- GoogleUtilities/UserDefaults (~> 8.0)
42+
- FirebaseInstallations (11.15.0):
43+
- FirebaseCore (~> 11.15.0)
44+
- GoogleUtilities/Environment (~> 8.1)
45+
- GoogleUtilities/UserDefaults (~> 8.1)
4646
- PromisesObjC (~> 2.4)
47-
- FirebaseRemoteConfig (11.8.0):
47+
- FirebaseRemoteConfig (11.15.0):
4848
- FirebaseABTesting (~> 11.0)
49-
- FirebaseCore (~> 11.8.0)
49+
- FirebaseCore (~> 11.15.0)
5050
- FirebaseInstallations (~> 11.0)
5151
- FirebaseRemoteConfigInterop (~> 11.0)
5252
- FirebaseSharedSwift (~> 11.0)
53-
- GoogleUtilities/Environment (~> 8.0)
54-
- "GoogleUtilities/NSData+zlib (~> 8.0)"
55-
- FirebaseRemoteConfigInterop (11.9.0)
56-
- FirebaseSessions (11.8.0):
57-
- FirebaseCore (~> 11.8.0)
58-
- FirebaseCoreExtension (~> 11.8.0)
53+
- GoogleUtilities/Environment (~> 8.1)
54+
- "GoogleUtilities/NSData+zlib (~> 8.1)"
55+
- FirebaseRemoteConfigInterop (11.15.0)
56+
- FirebaseSessions (11.15.0):
57+
- FirebaseCore (~> 11.15.0)
58+
- FirebaseCoreExtension (~> 11.15.0)
5959
- FirebaseInstallations (~> 11.0)
6060
- GoogleDataTransport (~> 10.0)
61-
- GoogleUtilities/Environment (~> 8.0)
62-
- GoogleUtilities/UserDefaults (~> 8.0)
61+
- GoogleUtilities/Environment (~> 8.1)
62+
- GoogleUtilities/UserDefaults (~> 8.1)
6363
- nanopb (~> 3.30910.0)
6464
- PromisesSwift (~> 2.1)
65-
- FirebaseSharedSwift (11.9.0)
65+
- FirebaseSharedSwift (11.15.0)
6666
- Flutter (1.0.0)
6767
- flutter_native_splash (2.4.3):
6868
- Flutter
6969
- flutter_secure_storage (6.0.0):
7070
- Flutter
7171
- geolocator_apple (1.2.0):
7272
- Flutter
73+
- FlutterMacOS
7374
- Google-Maps-iOS-Utils (5.0.0):
7475
- GoogleMaps (~> 8.0)
7576
- google_maps_flutter_ios (0.0.1):
@@ -84,15 +85,15 @@ PODS:
8485
- GoogleMaps/Base (8.4.0)
8586
- GoogleMaps/Maps (8.4.0):
8687
- GoogleMaps/Base
87-
- GoogleUtilities/Environment (8.0.2):
88+
- GoogleUtilities/Environment (8.1.0):
8889
- GoogleUtilities/Privacy
89-
- GoogleUtilities/Logger (8.0.2):
90+
- GoogleUtilities/Logger (8.1.0):
9091
- GoogleUtilities/Environment
9192
- GoogleUtilities/Privacy
92-
- "GoogleUtilities/NSData+zlib (8.0.2)":
93+
- "GoogleUtilities/NSData+zlib (8.1.0)":
9394
- GoogleUtilities/Privacy
94-
- GoogleUtilities/Privacy (8.0.2)
95-
- GoogleUtilities/UserDefaults (8.0.2):
95+
- GoogleUtilities/Privacy (8.1.0)
96+
- GoogleUtilities/UserDefaults (8.1.0):
9697
- GoogleUtilities/Logger
9798
- GoogleUtilities/Privacy
9899
- home_widget (0.0.1):
@@ -122,23 +123,26 @@ PODS:
122123
- sqflite_darwin (0.0.4):
123124
- Flutter
124125
- FlutterMacOS
125-
- sqlite3 (3.49.1):
126-
- sqlite3/common (= 3.49.1)
127-
- sqlite3/common (3.49.1)
128-
- sqlite3/dbstatvtab (3.49.1):
126+
- sqlite3 (3.50.2):
127+
- sqlite3/common (= 3.50.2)
128+
- sqlite3/common (3.50.2)
129+
- sqlite3/dbstatvtab (3.50.2):
130+
- sqlite3/common
131+
- sqlite3/fts5 (3.50.2):
129132
- sqlite3/common
130-
- sqlite3/fts5 (3.49.1):
133+
- sqlite3/math (3.50.2):
131134
- sqlite3/common
132-
- sqlite3/perf-threadsafe (3.49.1):
135+
- sqlite3/perf-threadsafe (3.50.2):
133136
- sqlite3/common
134-
- sqlite3/rtree (3.49.1):
137+
- sqlite3/rtree (3.50.2):
135138
- sqlite3/common
136139
- sqlite3_flutter_libs (0.0.1):
137140
- Flutter
138141
- FlutterMacOS
139-
- sqlite3 (~> 3.49.1)
142+
- sqlite3 (~> 3.50.1)
140143
- sqlite3/dbstatvtab
141144
- sqlite3/fts5
145+
- sqlite3/math
142146
- sqlite3/perf-threadsafe
143147
- sqlite3/rtree
144148
- url_launcher_ios (0.0.1):
@@ -155,7 +159,7 @@ DEPENDENCIES:
155159
- Flutter (from `Flutter`)
156160
- flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
157161
- flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
158-
- geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`)
162+
- geolocator_apple (from `.symlinks/plugins/geolocator_apple/darwin`)
159163
- google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`)
160164
- home_widget (from `.symlinks/plugins/home_widget/ios`)
161165
- map_launcher (from `.symlinks/plugins/map_launcher/ios`)
@@ -207,7 +211,7 @@ EXTERNAL SOURCES:
207211
flutter_secure_storage:
208212
:path: ".symlinks/plugins/flutter_secure_storage/ios"
209213
geolocator_apple:
210-
:path: ".symlinks/plugins/geolocator_apple/ios"
214+
:path: ".symlinks/plugins/geolocator_apple/darwin"
211215
google_maps_flutter_ios:
212216
:path: ".symlinks/plugins/google_maps_flutter_ios/ios"
213217
home_widget:
@@ -235,29 +239,29 @@ EXTERNAL SOURCES:
235239

236240
SPEC CHECKSUMS:
237241
device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
238-
Firebase: d80354ed7f6df5f9aca55e9eb47cc4b634735eaf
239-
firebase_core: 8d552814f6c01ccde5d88939fced4ec26f2f5510
240-
firebase_crashlytics: 05519be6b623981a77fe54fb52e6061956cb6047
241-
firebase_remote_config: ca499f96ddbcc63db863b941bf9f5e6e9a81ceba
242-
FirebaseABTesting: 7d6eee42b9137541eac2610e5fea3568d956707a
243-
FirebaseCore: 99fe0c4b44a39f37d99e6404e02009d2db5d718d
244-
FirebaseCoreExtension: 3d3f2017a00d06e09ab4ebe065391b0bb642565e
245-
FirebaseCoreInternal: df24ce5af28864660ecbd13596fc8dd3a8c34629
246-
FirebaseCrashlytics: a1102c035f18d5dd94a5969ee439c526d0c9e313
247-
FirebaseInstallations: 6c963bd2a86aca0481eef4f48f5a4df783ae5917
248-
FirebaseRemoteConfig: f63724461fd97f0d62f20021314b59388f3e8ef8
249-
FirebaseRemoteConfigInterop: 710954a00e956c5fe5144a8e46164f0361389203
250-
FirebaseSessions: c4d40a97f88f9eaff2834d61b4fea0a522d62123
251-
FirebaseSharedSwift: 574e6a5602afe4397a55c8d4f767382d620285de
242+
Firebase: d99ac19b909cd2c548339c2241ecd0d1599ab02e
243+
firebase_core: ece862f94b2bc72ee0edbeec7ab5c7cb09fe1ab5
244+
firebase_crashlytics: f89f5137e667ba1733ca5d7ab1b7af3390572520
245+
firebase_remote_config: 88ede24650cdf0916188dc2fe4138e3a03e62712
246+
FirebaseABTesting: 5e9d432834aebf27ab72100d37af44dfbe8d82f7
247+
FirebaseCore: efb3893e5b94f32b86e331e3bd6dadf18b66568e
248+
FirebaseCoreExtension: edbd30474b5ccf04e5f001470bdf6ea616af2435
249+
FirebaseCoreInternal: 9afa45b1159304c963da48addb78275ef701c6b4
250+
FirebaseCrashlytics: e09d0bc19aa54a51e45b8039c836ef73f32c039a
251+
FirebaseInstallations: 317270fec08a5d418fdbc8429282238cab3ac843
252+
FirebaseRemoteConfig: b496646b82855e174a7f1e354c65e0e913085168
253+
FirebaseRemoteConfigInterop: 1c6135e8a094cc6368949f5faeeca7ee8948b8aa
254+
FirebaseSessions: b9a92c1c51bbb81e78fc3142cda6d925d700f8e7
255+
FirebaseSharedSwift: e17c654ef1f1a616b0b33054e663ad1035c8fd40
252256
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
253257
flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
254258
flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
255-
geolocator_apple: 1560c3c875af2a412242c7a923e15d0d401966ff
259+
geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
256260
Google-Maps-iOS-Utils: 66d6de12be1ce6d3742a54661e7a79cb317a9321
257261
google_maps_flutter_ios: 0291eb2aa252298a769b04d075e4a9d747ff7264
258262
GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
259263
GoogleMaps: 8939898920281c649150e0af74aa291c60f2e77d
260-
GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
264+
GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
261265
home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f
262266
map_launcher: fe43bda6720bb73c12fcc1bdd86123ff49a4d4d6
263267
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
@@ -269,8 +273,8 @@ SPEC CHECKSUMS:
269273
quick_actions_ios: 4b07fb49d8d8f3518d7565fbb7a91014067a7d82
270274
shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
271275
sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
272-
sqlite3: fc1400008a9b3525f5914ed715a5d1af0b8f4983
273-
sqlite3_flutter_libs: f8fc13346870e73fe35ebf6dbb997fbcd156b241
276+
sqlite3: 3e82a2daae39ba3b41ae6ee84a130494585460fc
277+
sqlite3_flutter_libs: e7fc8c9ea2200ff3271f08f127842131746b70e2
274278
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
275279
video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
276280

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<MacroExpansion>
3132
<BuildableReference
@@ -43,6 +44,7 @@
4344
buildConfiguration = "Debug"
4445
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4546
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
4648
launchStyle = "0"
4749
useCustomWorkingDirectory = "NO"
4850
ignoresPersistentStateOnLaunch = "NO"

lib/base/errorHandling/error_handling_view.dart

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,10 @@ mixin ErrorHandlingView {
4343
child: _errorMessageText(
4444
errorMessage,
4545
context,
46-
style: Theme.of(
47-
context,
48-
).textTheme.headlineMedium?.copyWith(
49-
color: titleColor ?? context.primaryColor,
50-
),
46+
style: Theme.of(context).textTheme.headlineMedium
47+
?.copyWith(
48+
color: titleColor ?? context.primaryColor,
49+
),
5150
maxLines: 1,
5251
overflow: TextOverflow.ellipsis,
5352
),

0 commit comments

Comments
 (0)