Skip to content

Commit bea47b6

Browse files
jakobkoerberjakobkoerber
authored
Prepare TCA for iOS 18 (#273)
1 parent 654b264 commit bea47b6

File tree

11 files changed

+437
-388
lines changed

11 files changed

+437
-388
lines changed

‎.github/workflows/deploy_beta.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
deploy:
10-
runs-on: macos-13
10+
runs-on: macos-14
1111

1212
strategy:
1313
matrix:

‎android/settings.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version '8.5.1' apply false
21+
id "com.android.application" version '8.6.0' apply false
2222
id "org.jetbrains.kotlin.android" version "1.9.20" apply false
23-
id "org.jetbrains.kotlin.plugin.serialization" version "2.0.0" apply false
23+
id "org.jetbrains.kotlin.plugin.serialization" version "2.0.20" apply false
2424
id "com.google.gms.google-services" version "4.4.2" apply false
2525
id "com.google.firebase.crashlytics" version "3.0.2" apply false
2626
}

‎ios/CalendarWidget/CalendarEventView.swift

+10-9
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,29 @@
88
import SwiftUI
99

1010
struct CalendarEventView: View {
11-
11+
1212
let event: CalendarEntry
1313
let color: Color
1414
let isFirst: Bool
15-
15+
1616
private var timeFormatter: DateFormatter {
1717
let formatter = DateFormatter()
1818
formatter.dateFormat = "HH:mm"
1919
return formatter
2020
}
21-
21+
2222
private var dayNumberFormatter: DateFormatter {
2323
let formatter = DateFormatter()
2424
formatter.dateFormat = "dd"
2525
return formatter
2626
}
27-
27+
2828
private var monthNameFormatter: DateFormatter {
2929
let formatter = DateFormatter()
3030
formatter.dateFormat = "MMM"
3131
return formatter
3232
}
33-
33+
3434
var body: some View {
3535
HStack {
3636
VStack(alignment: .leading) {
@@ -42,15 +42,15 @@ struct CalendarEventView: View {
4242
}
4343
.frame(width: 30)
4444
.opacity(isFirst ? 1 : 0)
45-
45+
4646
VStack(alignment: .leading, spacing: 3) {
4747
Text(event.title)
4848
.font(.caption)
4949
.bold()
5050
.lineLimit(1)
51-
51+
5252
let timeText = "\(timeFormatter.string(from: event.startDate)) - \(timeFormatter.string(from: event.endDate))"
53-
53+
5454
if (event.location != nil) {
5555
Text("\(timeText) | \(event.location!)")
5656
.font(.caption2)
@@ -62,10 +62,11 @@ struct CalendarEventView: View {
6262
}
6363
}
6464
.padding(6)
65+
.widgetAccentable(false)
6566
.foregroundStyle(.white)
6667
.frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
6768
.background(ContainerRelativeShape()
68-
.fill(color))
69+
.fill(color).widgetAccentable(true))
6970
}
7071
.padding(EdgeInsets(top: 0, leading: 12, bottom: 0, trailing: 12))
7172
}

‎ios/CalendarWidget/CalendarWidgetContent.swift

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ struct CalendarWidgetContent: View {
2525

2626
private var dateFormatter: DateFormatter {
2727
let formatter = DateFormatter()
28-
formatter.setLocalizedDateFormatFromTemplate("MMMM d, yyyy")
28+
formatter.setLocalizedDateFormatFromTemplate(widgetFamily == .systemSmall ? "MMMM d" : "MMMM d, yyyy")
2929
return formatter
3030
}
3131

@@ -40,8 +40,9 @@ struct CalendarWidgetContent: View {
4040
}
4141
.padding(EdgeInsets(top: 8, leading: 12, bottom: 8, trailing: 12))
4242
.frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
43-
.background(.accent)
43+
.widgetAccentable(false)
4444
.foregroundStyle(.white)
45+
.background(Color.accent.widgetAccentable(true))
4546
.padding(EdgeInsets(top: 0, leading: 0, bottom: 2, trailing: 0))
4647

4748
if (events.isEmpty) {

‎ios/Podfile

+3
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ end
3737
post_install do |installer|
3838
installer.pods_project.targets.each do |target|
3939
flutter_additional_ios_build_settings(target)
40+
target.build_configurations.each do |config|
41+
config.build_settings['CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES'] = 'YES'
42+
end
4043
target.build_configurations.each do |config|
4144
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
4245
'$(inherited)',

‎ios/Podfile.lock

+99-96
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,109 @@
11
PODS:
22
- device_info_plus (0.0.1):
33
- Flutter
4-
- Firebase/CoreOnly (10.28.0):
5-
- FirebaseCore (= 10.28.0)
6-
- Firebase/Crashlytics (10.28.0):
4+
- Firebase/CoreOnly (11.0.0):
5+
- FirebaseCore (= 11.0.0)
6+
- Firebase/Crashlytics (11.0.0):
77
- Firebase/CoreOnly
8-
- FirebaseCrashlytics (~> 10.28.0)
9-
- Firebase/RemoteConfig (10.28.0):
8+
- FirebaseCrashlytics (~> 11.0.0)
9+
- Firebase/RemoteConfig (11.0.0):
1010
- Firebase/CoreOnly
11-
- FirebaseRemoteConfig (~> 10.28.0)
12-
- firebase_core (3.2.0):
13-
- Firebase/CoreOnly (= 10.28.0)
11+
- FirebaseRemoteConfig (~> 11.0.0)
12+
- firebase_core (3.4.1):
13+
- Firebase/CoreOnly (= 11.0.0)
1414
- Flutter
15-
- firebase_crashlytics (4.0.3):
16-
- Firebase/Crashlytics (= 10.28.0)
15+
- firebase_crashlytics (4.1.1):
16+
- Firebase/Crashlytics (= 11.0.0)
1717
- firebase_core
1818
- Flutter
19-
- firebase_remote_config (5.0.3):
20-
- Firebase/RemoteConfig (= 10.28.0)
19+
- firebase_remote_config (5.1.1):
20+
- Firebase/RemoteConfig (= 11.0.0)
2121
- firebase_core
2222
- Flutter
23-
- FirebaseABTesting (10.29.0):
24-
- FirebaseCore (~> 10.0)
25-
- FirebaseCore (10.28.0):
26-
- FirebaseCoreInternal (~> 10.0)
27-
- GoogleUtilities/Environment (~> 7.12)
28-
- GoogleUtilities/Logger (~> 7.12)
29-
- FirebaseCoreExtension (10.29.0):
30-
- FirebaseCore (~> 10.0)
31-
- FirebaseCoreInternal (10.29.0):
32-
- "GoogleUtilities/NSData+zlib (~> 7.8)"
33-
- FirebaseCrashlytics (10.28.1):
34-
- FirebaseCore (~> 10.5)
35-
- FirebaseInstallations (~> 10.0)
36-
- FirebaseRemoteConfigInterop (~> 10.23)
37-
- FirebaseSessions (~> 10.5)
38-
- GoogleDataTransport (~> 9.2)
39-
- GoogleUtilities/Environment (~> 7.8)
40-
- nanopb (< 2.30911.0, >= 2.30908.0)
41-
- PromisesObjC (~> 2.1)
42-
- FirebaseInstallations (10.29.0):
43-
- FirebaseCore (~> 10.0)
44-
- GoogleUtilities/Environment (~> 7.8)
45-
- GoogleUtilities/UserDefaults (~> 7.8)
46-
- PromisesObjC (~> 2.1)
47-
- FirebaseRemoteConfig (10.28.0):
48-
- FirebaseABTesting (~> 10.0)
49-
- FirebaseCore (~> 10.0)
50-
- FirebaseInstallations (~> 10.0)
51-
- FirebaseRemoteConfigInterop (~> 10.23)
52-
- FirebaseSharedSwift (~> 10.0)
53-
- GoogleUtilities/Environment (~> 7.8)
54-
- "GoogleUtilities/NSData+zlib (~> 7.8)"
55-
- FirebaseRemoteConfigInterop (10.29.0)
56-
- FirebaseSessions (10.29.0):
57-
- FirebaseCore (~> 10.5)
58-
- FirebaseCoreExtension (~> 10.0)
59-
- FirebaseInstallations (~> 10.0)
60-
- GoogleDataTransport (~> 9.2)
61-
- GoogleUtilities/Environment (~> 7.13)
62-
- GoogleUtilities/UserDefaults (~> 7.13)
63-
- nanopb (< 2.30911.0, >= 2.30908.0)
23+
- FirebaseABTesting (11.2.0):
24+
- FirebaseCore (~> 11.0)
25+
- FirebaseCore (11.0.0):
26+
- FirebaseCoreInternal (~> 11.0)
27+
- GoogleUtilities/Environment (~> 8.0)
28+
- GoogleUtilities/Logger (~> 8.0)
29+
- FirebaseCoreExtension (11.2.0):
30+
- FirebaseCore (~> 11.0)
31+
- FirebaseCoreInternal (11.2.0):
32+
- "GoogleUtilities/NSData+zlib (~> 8.0)"
33+
- FirebaseCrashlytics (11.0.0):
34+
- FirebaseCore (~> 11.0)
35+
- FirebaseInstallations (~> 11.0)
36+
- FirebaseRemoteConfigInterop (~> 11.0)
37+
- FirebaseSessions (~> 11.0)
38+
- GoogleDataTransport (~> 10.0)
39+
- GoogleUtilities/Environment (~> 8.0)
40+
- nanopb (~> 3.30910.0)
41+
- PromisesObjC (~> 2.4)
42+
- FirebaseInstallations (11.2.0):
43+
- FirebaseCore (~> 11.0)
44+
- GoogleUtilities/Environment (~> 8.0)
45+
- GoogleUtilities/UserDefaults (~> 8.0)
46+
- PromisesObjC (~> 2.4)
47+
- FirebaseRemoteConfig (11.0.0):
48+
- FirebaseABTesting (~> 11.0)
49+
- FirebaseCore (~> 11.0)
50+
- FirebaseInstallations (~> 11.0)
51+
- FirebaseRemoteConfigInterop (~> 11.0)
52+
- FirebaseSharedSwift (~> 11.0)
53+
- GoogleUtilities/Environment (~> 8.0)
54+
- "GoogleUtilities/NSData+zlib (~> 8.0)"
55+
- FirebaseRemoteConfigInterop (11.2.0)
56+
- FirebaseSessions (11.2.0):
57+
- FirebaseCore (~> 11.0)
58+
- FirebaseCoreExtension (~> 11.0)
59+
- FirebaseInstallations (~> 11.0)
60+
- GoogleDataTransport (~> 10.0)
61+
- GoogleUtilities/Environment (~> 8.0)
62+
- GoogleUtilities/UserDefaults (~> 8.0)
63+
- nanopb (~> 3.30910.0)
6464
- PromisesSwift (~> 2.1)
65-
- FirebaseSharedSwift (10.29.0)
65+
- FirebaseSharedSwift (11.2.0)
6666
- Flutter (1.0.0)
6767
- flutter_native_splash (0.0.1):
6868
- Flutter
6969
- flutter_secure_storage (6.0.0):
7070
- Flutter
7171
- geolocator_apple (1.2.0):
7272
- Flutter
73+
- Google-Maps-iOS-Utils (5.0.0):
74+
- GoogleMaps (~> 8.0)
7375
- google_maps_flutter_ios (0.0.1):
7476
- Flutter
77+
- Google-Maps-iOS-Utils (< 7.0, >= 5.0)
7578
- GoogleMaps (< 10.0, >= 8.4)
76-
- GoogleDataTransport (9.4.1):
77-
- GoogleUtilities/Environment (~> 7.7)
78-
- nanopb (< 2.30911.0, >= 2.30908.0)
79-
- PromisesObjC (< 3.0, >= 1.2)
79+
- GoogleDataTransport (10.1.0):
80+
- nanopb (~> 3.30910.0)
81+
- PromisesObjC (~> 2.4)
8082
- GoogleMaps (8.4.0):
8183
- GoogleMaps/Maps (= 8.4.0)
8284
- GoogleMaps/Base (8.4.0)
8385
- GoogleMaps/Maps (8.4.0):
8486
- GoogleMaps/Base
85-
- GoogleUtilities/Environment (7.13.3):
87+
- GoogleUtilities/Environment (8.0.2):
8688
- GoogleUtilities/Privacy
87-
- PromisesObjC (< 3.0, >= 1.2)
88-
- GoogleUtilities/Logger (7.13.3):
89+
- GoogleUtilities/Logger (8.0.2):
8990
- GoogleUtilities/Environment
9091
- GoogleUtilities/Privacy
91-
- "GoogleUtilities/NSData+zlib (7.13.3)":
92+
- "GoogleUtilities/NSData+zlib (8.0.2)":
9293
- GoogleUtilities/Privacy
93-
- GoogleUtilities/Privacy (7.13.3)
94-
- GoogleUtilities/UserDefaults (7.13.3):
94+
- GoogleUtilities/Privacy (8.0.2)
95+
- GoogleUtilities/UserDefaults (8.0.2):
9596
- GoogleUtilities/Logger
9697
- GoogleUtilities/Privacy
9798
- home_widget (0.0.1):
9899
- Flutter
99100
- map_launcher (0.0.1):
100101
- Flutter
101-
- nanopb (2.30910.0):
102-
- nanopb/decode (= 2.30910.0)
103-
- nanopb/encode (= 2.30910.0)
104-
- nanopb/decode (2.30910.0)
105-
- nanopb/encode (2.30910.0)
102+
- nanopb (3.30910.0):
103+
- nanopb/decode (= 3.30910.0)
104+
- nanopb/encode (= 3.30910.0)
105+
- nanopb/decode (3.30910.0)
106+
- nanopb/encode (3.30910.0)
106107
- package_info_plus (0.4.5):
107108
- Flutter
108109
- path_provider_foundation (0.0.1):
@@ -121,16 +122,16 @@ PODS:
121122
- sqflite (0.0.3):
122123
- Flutter
123124
- FlutterMacOS
124-
- "sqlite3 (3.46.0+1)":
125-
- "sqlite3/common (= 3.46.0+1)"
126-
- "sqlite3/common (3.46.0+1)"
127-
- "sqlite3/dbstatvtab (3.46.0+1)":
125+
- "sqlite3 (3.46.1+1)":
126+
- "sqlite3/common (= 3.46.1+1)"
127+
- "sqlite3/common (3.46.1+1)"
128+
- "sqlite3/dbstatvtab (3.46.1+1)":
128129
- sqlite3/common
129-
- "sqlite3/fts5 (3.46.0+1)":
130+
- "sqlite3/fts5 (3.46.1+1)":
130131
- sqlite3/common
131-
- "sqlite3/perf-threadsafe (3.46.0+1)":
132+
- "sqlite3/perf-threadsafe (3.46.1+1)":
132133
- sqlite3/common
133-
- "sqlite3/rtree (3.46.0+1)":
134+
- "sqlite3/rtree (3.46.1+1)":
134135
- sqlite3/common
135136
- sqlite3_flutter_libs (0.0.1):
136137
- Flutter
@@ -180,6 +181,7 @@ SPEC REPOS:
180181
- FirebaseRemoteConfigInterop
181182
- FirebaseSessions
182183
- FirebaseSharedSwift
184+
- Google-Maps-iOS-Utils
183185
- GoogleDataTransport
184186
- GoogleMaps
185187
- GoogleUtilities
@@ -232,31 +234,32 @@ EXTERNAL SOURCES:
232234

233235
SPEC CHECKSUMS:
234236
device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
235-
Firebase: 5121c624121af81cbc81df3bda414b3c28c4f3c3
236-
firebase_core: a9d0180d5285527884d07a41eb4a9ec9ed12cdb6
237-
firebase_crashlytics: 12b2b1ecfc50f6c551c68e491ae156b2b7d41273
238-
firebase_remote_config: 5f92bfc62c3ef2c657bf3d703ffa4be29082280f
239-
FirebaseABTesting: d87f56707159bae64e269757a6e963d490f2eebe
240-
FirebaseCore: 857dc1c6dd1255675047404d8466f7dfaac5d779
241-
FirebaseCoreExtension: 705ca5b14bf71d2564a0ddc677df1fc86ffa600f
242-
FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934
243-
FirebaseCrashlytics: f51e12b93f8e1134bbed602ed22df33804d55ccf
244-
FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd
245-
FirebaseRemoteConfig: f0879a8dccf4e8905716ed849569130efaeab3e2
246-
FirebaseRemoteConfigInterop: 6efda51fb5e2f15b16585197e26eaa09574e8a4d
247-
FirebaseSessions: dbd14adac65ce996228652c1fc3a3f576bdf3ecc
248-
FirebaseSharedSwift: 20530f495084b8d840f78a100d8c5ee613375f6e
237+
Firebase: 9f574c08c2396885b5e7e100ed4293d956218af9
238+
firebase_core: ba84e940cf5cbbc601095f86556560937419195c
239+
firebase_crashlytics: 4111f8198b78c99471c955af488cecd8224967e6
240+
firebase_remote_config: fd0d891a89fde724371e60300cf054a085664cba
241+
FirebaseABTesting: 2104d957ce33888a3d6f3bde298cdee376dde8f1
242+
FirebaseCore: 3cf438f431f18c12cdf2aaf64434648b63f7e383
243+
FirebaseCoreExtension: cda74ddfb001224bd8fd1d6e74698b4ed07803de
244+
FirebaseCoreInternal: 0c569513412da9f3b31bd0b340013bbee8f295c5
245+
FirebaseCrashlytics: 745d8f0221fe49c62865391d1bf56f5a12eeec0b
246+
FirebaseInstallations: 771177d89d6c451dc6e50085ec82e2fc77ed0a4a
247+
FirebaseRemoteConfig: fe8b7e6d6770fefbde27b0cac3f3deffba6e7326
248+
FirebaseRemoteConfigInterop: 477b26fdeb8fb5fbaf22fa9db5343b42289dc7db
249+
FirebaseSessions: adcec8b72d0066a385e3affcd1bcb1ebb3908ce6
250+
FirebaseSharedSwift: 7a0d78d155ede78407f0fdc89fbc914014c7c540
249251
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
250252
flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778
251253
flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
252254
geolocator_apple: 6cbaf322953988e009e5ecb481f07efece75c450
253-
google_maps_flutter_ios: 5bc2be60ad012e79b182ce0fb0ef5030a50fb03e
254-
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
255+
Google-Maps-iOS-Utils: 66d6de12be1ce6d3742a54661e7a79cb317a9321
256+
google_maps_flutter_ios: e31555a04d1986ab130f2b9f24b6cdc861acc6d3
257+
GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
255258
GoogleMaps: 8939898920281c649150e0af74aa291c60f2e77d
256-
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
259+
GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
257260
home_widget: 0434835a4c9a75704264feff6be17ea40e0f0d57
258261
map_launcher: 5fde49ac9a52672bf99da746599f507b4490d7b5
259-
nanopb: 438bc412db1928dac798aa6fd75726007be04262
262+
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
260263
package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
261264
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
262265
permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
@@ -265,11 +268,11 @@ SPEC CHECKSUMS:
265268
quick_actions_ios: 56f3cbaa71e94f212838d1f9fe354bd0734779bf
266269
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
267270
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
268-
sqlite3: 292c3e1bfe89f64e51ea7fc7dab9182a017c8630
271+
sqlite3: 0bb0e6389d824e40296f531b858a2a0b71c0d2fb
269272
sqlite3_flutter_libs: c00457ebd31e59fa6bb830380ddba24d44fbcd3b
270273
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
271274
video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
272275

273-
PODFILE CHECKSUM: 2dec3f67b1fa3eb41982ef2f40e0d15f34b91a30
276+
PODFILE CHECKSUM: f5f6fa56ec332013222699049ea868939deda084
274277

275278
COCOAPODS: 1.15.2

0 commit comments

Comments
 (0)