Skip to content

Commit 8b2b3bf

Browse files
authored
Migrate to UISceneDelegate, Update Dependencies, Fix Breaking Changes (#335)
1 parent 118836f commit 8b2b3bf

24 files changed

Lines changed: 500 additions & 472 deletions

File tree

.github/workflows/deploy_beta.yml

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

88
jobs:
99
deploy:
10-
runs-on: macos-latest
10+
runs-on: macos-26
1111

1212
strategy:
1313
matrix:

.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-latest
11+
runs-on: macos-26
1212

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

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,7 @@ ios/fastlane/report.xml
5252
ios/fastlane/README.md
5353

5454
#Android Studio Miscellaneous
55-
bugreport-*.zip
55+
bugreport-*.zip
56+
57+
#iOS
58+
ios/.derived*

android/app/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ plugins {
1212

1313
android {
1414
namespace = "de.tum.in.tumcampus"
15-
compileSdk = 36
16-
ndkVersion = "28.1.13356709"
15+
compileSdk = 37
16+
ndkVersion = "28.2.13676358"
1717

1818
compileOptions {
1919
sourceCompatibility = JavaVersion.VERSION_21
@@ -74,5 +74,5 @@ flutter {
7474

7575
dependencies {
7676
implementation("androidx.multidex:multidex:2.0.1")
77-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
77+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0")
7878
}

android/settings.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ pluginManagement {
2020
plugins {
2121
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
2222
id("com.android.application") version "8.13.2" apply false
23-
id("org.jetbrains.kotlin.android") version "2.3.0" apply false
24-
id("org.jetbrains.kotlin.plugin.serialization") version "2.3.0" apply false
23+
id("org.jetbrains.kotlin.android") version "2.3.20" apply false
24+
id("org.jetbrains.kotlin.plugin.serialization") version "2.3.20" apply false
2525
id("com.google.gms.google-services") version "4.4.4" apply false
26-
id("com.google.firebase.crashlytics") version "3.0.6" apply false
26+
id("com.google.firebase.crashlytics") version "3.0.7" apply false
2727
}
2828

2929
include(":app")

ios/Flutter/AppFrameworkInfo.plist

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,5 @@
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
23-
<key>MinimumOSVersion</key>
24-
<string>13.0</string>
2523
</dict>
2624
</plist>

ios/Podfile.lock

Lines changed: 53 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -3,68 +3,68 @@ PODS:
33
- Flutter
44
- device_info_plus (0.0.1):
55
- Flutter
6-
- Firebase/CoreOnly (12.8.0):
7-
- FirebaseCore (~> 12.8.0)
8-
- Firebase/Crashlytics (12.8.0):
6+
- Firebase/CoreOnly (12.12.0):
7+
- FirebaseCore (~> 12.12.0)
8+
- Firebase/Crashlytics (12.12.0):
99
- Firebase/CoreOnly
10-
- FirebaseCrashlytics (~> 12.8.0)
11-
- Firebase/RemoteConfig (12.8.0):
10+
- FirebaseCrashlytics (~> 12.12.0)
11+
- Firebase/RemoteConfig (12.12.0):
1212
- Firebase/CoreOnly
13-
- FirebaseRemoteConfig (~> 12.8.0)
14-
- firebase_core (4.4.0):
15-
- Firebase/CoreOnly (= 12.8.0)
13+
- FirebaseRemoteConfig (~> 12.12.0)
14+
- firebase_core (4.7.0):
15+
- Firebase/CoreOnly (= 12.12.0)
1616
- Flutter
17-
- firebase_crashlytics (5.0.7):
18-
- Firebase/Crashlytics (= 12.8.0)
17+
- firebase_crashlytics (5.2.0):
18+
- Firebase/Crashlytics (= 12.12.0)
1919
- firebase_core
2020
- Flutter
21-
- firebase_remote_config (6.1.4):
22-
- Firebase/RemoteConfig (= 12.8.0)
21+
- firebase_remote_config (6.4.0):
22+
- Firebase/RemoteConfig (= 12.12.0)
2323
- firebase_core
2424
- Flutter
25-
- FirebaseABTesting (12.8.0):
26-
- FirebaseCore (~> 12.8.0)
27-
- FirebaseCore (12.8.0):
28-
- FirebaseCoreInternal (~> 12.8.0)
25+
- FirebaseABTesting (12.12.0):
26+
- FirebaseCore (~> 12.12.0)
27+
- FirebaseCore (12.12.0):
28+
- FirebaseCoreInternal (~> 12.12.0)
2929
- GoogleUtilities/Environment (~> 8.1)
3030
- GoogleUtilities/Logger (~> 8.1)
31-
- FirebaseCoreExtension (12.8.0):
32-
- FirebaseCore (~> 12.8.0)
33-
- FirebaseCoreInternal (12.8.0):
31+
- FirebaseCoreExtension (12.12.0):
32+
- FirebaseCore (~> 12.12.0)
33+
- FirebaseCoreInternal (12.12.0):
3434
- "GoogleUtilities/NSData+zlib (~> 8.1)"
35-
- FirebaseCrashlytics (12.8.0):
36-
- FirebaseCore (~> 12.8.0)
37-
- FirebaseInstallations (~> 12.8.0)
38-
- FirebaseRemoteConfigInterop (~> 12.8.0)
39-
- FirebaseSessions (~> 12.8.0)
35+
- FirebaseCrashlytics (12.12.0):
36+
- FirebaseCore (~> 12.12.0)
37+
- FirebaseInstallations (~> 12.12.0)
38+
- FirebaseRemoteConfigInterop (~> 12.12.0)
39+
- FirebaseSessions (~> 12.12.0)
4040
- GoogleDataTransport (~> 10.1)
4141
- GoogleUtilities/Environment (~> 8.1)
4242
- nanopb (~> 3.30910.0)
4343
- PromisesObjC (~> 2.4)
44-
- FirebaseInstallations (12.8.0):
45-
- FirebaseCore (~> 12.8.0)
44+
- FirebaseInstallations (12.12.0):
45+
- FirebaseCore (~> 12.12.0)
4646
- GoogleUtilities/Environment (~> 8.1)
4747
- GoogleUtilities/UserDefaults (~> 8.1)
4848
- PromisesObjC (~> 2.4)
49-
- FirebaseRemoteConfig (12.8.0):
50-
- FirebaseABTesting (~> 12.8.0)
51-
- FirebaseCore (~> 12.8.0)
52-
- FirebaseInstallations (~> 12.8.0)
53-
- FirebaseRemoteConfigInterop (~> 12.8.0)
54-
- FirebaseSharedSwift (~> 12.8.0)
49+
- FirebaseRemoteConfig (12.12.0):
50+
- FirebaseABTesting (~> 12.12.0)
51+
- FirebaseCore (~> 12.12.0)
52+
- FirebaseInstallations (~> 12.12.0)
53+
- FirebaseRemoteConfigInterop (~> 12.12.0)
54+
- FirebaseSharedSwift (~> 12.12.0)
5555
- GoogleUtilities/Environment (~> 8.1)
5656
- "GoogleUtilities/NSData+zlib (~> 8.1)"
57-
- FirebaseRemoteConfigInterop (12.8.0)
58-
- FirebaseSessions (12.8.0):
59-
- FirebaseCore (~> 12.8.0)
60-
- FirebaseCoreExtension (~> 12.8.0)
61-
- FirebaseInstallations (~> 12.8.0)
57+
- FirebaseRemoteConfigInterop (12.12.0)
58+
- FirebaseSessions (12.12.0):
59+
- FirebaseCore (~> 12.12.0)
60+
- FirebaseCoreExtension (~> 12.12.0)
61+
- FirebaseInstallations (~> 12.12.0)
6262
- GoogleDataTransport (~> 10.1)
6363
- GoogleUtilities/Environment (~> 8.1)
6464
- GoogleUtilities/UserDefaults (~> 8.1)
6565
- nanopb (~> 3.30910.0)
6666
- PromisesSwift (~> 2.1)
67-
- FirebaseSharedSwift (12.8.0)
67+
- FirebaseSharedSwift (12.12.0)
6868
- Flutter (1.0.0)
6969
- flutter_contacts (0.0.1):
7070
- Flutter
@@ -118,31 +118,6 @@ PODS:
118118
- sqflite_darwin (0.0.4):
119119
- Flutter
120120
- FlutterMacOS
121-
- sqlite3 (3.51.1):
122-
- sqlite3/common (= 3.51.1)
123-
- sqlite3/common (3.51.1)
124-
- sqlite3/dbstatvtab (3.51.1):
125-
- sqlite3/common
126-
- sqlite3/fts5 (3.51.1):
127-
- sqlite3/common
128-
- sqlite3/math (3.51.1):
129-
- sqlite3/common
130-
- sqlite3/perf-threadsafe (3.51.1):
131-
- sqlite3/common
132-
- sqlite3/rtree (3.51.1):
133-
- sqlite3/common
134-
- sqlite3/session (3.51.1):
135-
- sqlite3/common
136-
- sqlite3_flutter_libs (0.0.1):
137-
- Flutter
138-
- FlutterMacOS
139-
- sqlite3 (~> 3.51.1)
140-
- sqlite3/dbstatvtab
141-
- sqlite3/fts5
142-
- sqlite3/math
143-
- sqlite3/perf-threadsafe
144-
- sqlite3/rtree
145-
- sqlite3/session
146121
- url_launcher_ios (0.0.1):
147122
- Flutter
148123
- video_player_avfoundation (0.0.1):
@@ -168,7 +143,6 @@ DEPENDENCIES:
168143
- quick_actions_ios (from `.symlinks/plugins/quick_actions_ios/ios`)
169144
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
170145
- sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
171-
- sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/darwin`)
172146
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
173147
- video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
174148

@@ -191,7 +165,6 @@ SPEC REPOS:
191165
- nanopb
192166
- PromisesObjC
193167
- PromisesSwift
194-
- sqlite3
195168

196169
EXTERNAL SOURCES:
197170
device_calendar:
@@ -230,8 +203,6 @@ EXTERNAL SOURCES:
230203
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
231204
sqflite_darwin:
232205
:path: ".symlinks/plugins/sqflite_darwin/darwin"
233-
sqlite3_flutter_libs:
234-
:path: ".symlinks/plugins/sqlite3_flutter_libs/darwin"
235206
url_launcher_ios:
236207
:path: ".symlinks/plugins/url_launcher_ios/ios"
237208
video_player_avfoundation:
@@ -240,22 +211,22 @@ EXTERNAL SOURCES:
240211
SPEC CHECKSUMS:
241212
device_calendar: b55b2c5406cfba45c95a59f9059156daee1f74ed
242213
device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
243-
Firebase: 9a58fdbc9d8655ed7b79a19cf9690bb007d3d46d
244-
firebase_core: ee30637e6744af8e0c12a6a1e8a9718506ec2398
245-
firebase_crashlytics: 28b8f39df8104131376393e6af658b8b77dd120f
246-
firebase_remote_config: 3a5639062e130c4d4b7c4bae347cc3bac90f5a1e
247-
FirebaseABTesting: 31266c7845f9adde0f2e8a59267e9c82e4050898
248-
FirebaseCore: 0dbad74bda10b8fb9ca34ad8f375fb9dd3ebef7c
249-
FirebaseCoreExtension: 6605938d51f765d8b18bfcafd2085276a252bee2
250-
FirebaseCoreInternal: fe5fa466aeb314787093a7dce9f0beeaad5a2a21
251-
FirebaseCrashlytics: fb31c6907e5b52aa252668394d3f1ab326df1511
252-
FirebaseInstallations: 6a14ab3d694ebd9f839c48d330da5547e9ca9dc0
253-
FirebaseRemoteConfig: e9e3909162a05bc0e796326255fd43250783a2a9
254-
FirebaseRemoteConfigInterop: 869ddca16614f979e5c931ece11fbb0b8729ed41
255-
FirebaseSessions: d614ca154c63dbbc6c10d6c38259c2162c4e7c9b
256-
FirebaseSharedSwift: f57ed48f4542b2d7eb4738f4f23ba443f78b3780
214+
Firebase: aa154fee4e9b8eac17aa42344988865b3e857d33
215+
firebase_core: 9156a152117c843440b0b990c785aa0259bc5447
216+
firebase_crashlytics: e24acd48861c5edf6e0f6c134d6a0b28593c76d7
217+
firebase_remote_config: 924bae350163e03e7e5a3a40733addb9a8e1e42b
218+
FirebaseABTesting: c21a401a23c2eaa6f520d19febcd4911312b545f
219+
FirebaseCore: f28af0427998cd53f8d4826bce17260e33224053
220+
FirebaseCoreExtension: ff6fd42eb5287e71d3e160450de6509733d9ead7
221+
FirebaseCoreInternal: 7c12fc3011d889085e765e317d7b9fd1cef97af9
222+
FirebaseCrashlytics: 2a38be892de8417a06e929a13fec0971afcb4dfc
223+
FirebaseInstallations: 4e6e162aa4abaaeeeb01dd00179dfc5ad9c2194e
224+
FirebaseRemoteConfig: 6ab95b4ee5fd4a94d09a704d88f5341db5713250
225+
FirebaseRemoteConfigInterop: 23996ab7397494722df4fdd1fd398024389d5da8
226+
FirebaseSessions: 804bd321f2d2f2ddafe74ef7856062aa19f179c2
227+
FirebaseSharedSwift: bccaff90721d14bafc14be34f28b77fdd7c91dc9
257228
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
258-
flutter_contacts: 5383945387e7ca37cf963d4be57c21f2fc15ca9f
229+
flutter_contacts: 2ec1d6b62ca2869c3bbb3871bd74d4e3ef157135
259230
flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
260231
flutter_secure_storage_darwin: acdb3f316ed05a3e68f856e0353b133eec373a23
261232
geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
@@ -273,8 +244,6 @@ SPEC CHECKSUMS:
273244
quick_actions_ios: 500fcc11711d9f646739093395c4ae8eec25f779
274245
shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
275246
sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
276-
sqlite3: 8d708bc63e9f4ce48f0ad9d6269e478c5ced1d9b
277-
sqlite3_flutter_libs: d13b8b3003f18f596e542bcb9482d105577eff41
278247
url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
279248
video_player_avfoundation: dd410b52df6d2466a42d28550e33e4146928280a
280249

ios/Runner/AppDelegate.swift

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
import UIKit
2-
import Flutter
2+
import Flutter
33

44
@main
5-
@objc class AppDelegate: FlutterAppDelegate {
6-
override func application(
7-
_ application: UIApplication,
8-
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
9-
) -> Bool {
10-
GeneratedPluginRegistrant.register(with: self)
11-
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
12-
}
5+
@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
6+
override func application(
7+
_ application: UIApplication,
8+
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
9+
) -> Bool {
10+
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
11+
}
12+
13+
func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
14+
GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
15+
}
1316
}

0 commit comments

Comments
 (0)