Skip to content

Commit 328a324

Browse files
committed
docs: adopt Swift 6 mode and fix all warnings from sample apps
1 parent 48d117e commit 328a324

27 files changed

+64
-67
lines changed

Examples/Examples.xcodeproj/project.pbxproj

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@
379379
attributes = {
380380
BuildIndependentTargetsInParallel = 1;
381381
LastSwiftUpdateCheck = 1510;
382-
LastUpgradeCheck = 1510;
382+
LastUpgradeCheck = 2600;
383383
TargetAttributes = {
384384
793895C52954ABFF0044F2B8 = {
385385
CreatedOnToolsVersion = 14.1;
@@ -550,6 +550,7 @@
550550
CURRENT_PROJECT_VERSION = 1;
551551
DEAD_CODE_STRIPPING = YES;
552552
DEBUG_INFORMATION_FORMAT = dwarf;
553+
DEVELOPMENT_TEAM = ELTTE7K8TT;
553554
ENABLE_STRICT_OBJC_MSGSEND = YES;
554555
ENABLE_TESTABILITY = YES;
555556
ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -579,11 +580,12 @@
579580
MTL_FAST_MATH = YES;
580581
ONLY_ACTIVE_ARCH = YES;
581582
SDKROOT = iphoneos;
583+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
582584
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
583585
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
584586
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
585587
SWIFT_STRICT_CONCURRENCY = complete;
586-
SWIFT_VERSION = 5.0;
588+
SWIFT_VERSION = 6.0;
587589
};
588590
name = Debug;
589591
};
@@ -624,6 +626,7 @@
624626
CURRENT_PROJECT_VERSION = 1;
625627
DEAD_CODE_STRIPPING = YES;
626628
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
629+
DEVELOPMENT_TEAM = ELTTE7K8TT;
627630
ENABLE_NS_ASSERTIONS = NO;
628631
ENABLE_STRICT_OBJC_MSGSEND = YES;
629632
ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -646,11 +649,12 @@
646649
MTL_ENABLE_DEBUG_INFO = NO;
647650
MTL_FAST_MATH = YES;
648651
SDKROOT = iphoneos;
652+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
649653
SWIFT_COMPILATION_MODE = wholemodule;
650654
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
651655
SWIFT_OPTIMIZATION_LEVEL = "-O";
652656
SWIFT_STRICT_CONCURRENCY = complete;
653-
SWIFT_VERSION = 5.0;
657+
SWIFT_VERSION = 6.0;
654658
};
655659
name = Release;
656660
};
@@ -662,9 +666,11 @@
662666
CODE_SIGN_ENTITLEMENTS = Examples/Examples.entitlements;
663667
CODE_SIGN_STYLE = Automatic;
664668
DEVELOPMENT_ASSET_PATHS = "\"Examples/Preview Content\"";
665-
DEVELOPMENT_TEAM = ELTTE7K8TT;
669+
ENABLE_APP_SANDBOX = YES;
666670
ENABLE_HARDENED_RUNTIME = YES;
671+
ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
667672
ENABLE_PREVIEWS = YES;
673+
ENABLE_USER_SELECTED_FILES = readonly;
668674
GENERATE_INFOPLIST_FILE = YES;
669675
INFOPLIST_FILE = Examples/Info.plist;
670676
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
@@ -688,9 +694,11 @@
688694
CODE_SIGN_ENTITLEMENTS = Examples/Examples.entitlements;
689695
CODE_SIGN_STYLE = Automatic;
690696
DEVELOPMENT_ASSET_PATHS = "\"Examples/Preview Content\"";
691-
DEVELOPMENT_TEAM = ELTTE7K8TT;
697+
ENABLE_APP_SANDBOX = YES;
692698
ENABLE_HARDENED_RUNTIME = YES;
699+
ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
693700
ENABLE_PREVIEWS = YES;
701+
ENABLE_USER_SELECTED_FILES = readonly;
694702
GENERATE_INFOPLIST_FILE = YES;
695703
INFOPLIST_FILE = Examples/Info.plist;
696704
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
@@ -715,9 +723,11 @@
715723
CODE_SIGN_STYLE = Automatic;
716724
CURRENT_PROJECT_VERSION = 1;
717725
DEVELOPMENT_ASSET_PATHS = "\"SlackClone/Preview Content\"";
718-
DEVELOPMENT_TEAM = ELTTE7K8TT;
726+
ENABLE_APP_SANDBOX = YES;
719727
ENABLE_HARDENED_RUNTIME = YES;
728+
ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
720729
ENABLE_PREVIEWS = YES;
730+
ENABLE_USER_SELECTED_FILES = readonly;
721731
GENERATE_INFOPLIST_FILE = YES;
722732
INFOPLIST_FILE = SlackClone/Info.plist;
723733
"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
@@ -755,9 +765,11 @@
755765
CODE_SIGN_STYLE = Automatic;
756766
CURRENT_PROJECT_VERSION = 1;
757767
DEVELOPMENT_ASSET_PATHS = "\"SlackClone/Preview Content\"";
758-
DEVELOPMENT_TEAM = ELTTE7K8TT;
768+
ENABLE_APP_SANDBOX = YES;
759769
ENABLE_HARDENED_RUNTIME = YES;
770+
ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
760771
ENABLE_PREVIEWS = YES;
772+
ENABLE_USER_SELECTED_FILES = readonly;
761773
GENERATE_INFOPLIST_FILE = YES;
762774
INFOPLIST_FILE = SlackClone/Info.plist;
763775
"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
@@ -795,9 +807,11 @@
795807
CODE_SIGN_STYLE = Automatic;
796808
CURRENT_PROJECT_VERSION = 1;
797809
DEVELOPMENT_ASSET_PATHS = "\"UserManagement/Preview Content\"";
798-
DEVELOPMENT_TEAM = ELTTE7K8TT;
810+
ENABLE_APP_SANDBOX = YES;
799811
ENABLE_HARDENED_RUNTIME = YES;
812+
ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
800813
ENABLE_PREVIEWS = YES;
814+
ENABLE_USER_SELECTED_FILES = readonly;
801815
GENERATE_INFOPLIST_FILE = YES;
802816
INFOPLIST_FILE = UserManagement/Info.plist;
803817
"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
@@ -835,9 +849,11 @@
835849
CODE_SIGN_STYLE = Automatic;
836850
CURRENT_PROJECT_VERSION = 1;
837851
DEVELOPMENT_ASSET_PATHS = "\"UserManagement/Preview Content\"";
838-
DEVELOPMENT_TEAM = ELTTE7K8TT;
852+
ENABLE_APP_SANDBOX = YES;
839853
ENABLE_HARDENED_RUNTIME = YES;
854+
ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
840855
ENABLE_PREVIEWS = YES;
856+
ENABLE_USER_SELECTED_FILES = readonly;
841857
GENERATE_INFOPLIST_FILE = YES;
842858
INFOPLIST_FILE = UserManagement/Info.plist;
843859
"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;

Examples/Examples.xcodeproj/xcshareddata/xcschemes/Examples.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1510"
3+
LastUpgradeVersion = "2600"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

Examples/Examples.xcodeproj/xcshareddata/xcschemes/SlackClone.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1520"
3+
LastUpgradeVersion = "2600"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

Examples/Examples.xcodeproj/xcshareddata/xcschemes/UserManagement.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1510"
3+
LastUpgradeVersion = "2600"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

Examples/Examples/Auth/AuthWithMagicLink.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ struct AuthWithMagicLink: View {
111111
actionState = .inFlight
112112

113113
actionState = await .result(
114-
Result {
114+
Result { @Sendable in
115115
try await supabase.auth.signInWithOTP(
116116
email: email,
117117
redirectTo: Constants.redirectToURL
@@ -125,7 +125,7 @@ struct AuthWithMagicLink: View {
125125

126126
actionState = .inFlight
127127
actionState = await .result(
128-
Result {
128+
Result { @Sendable in
129129
try await supabase.auth.session(from: url)
130130
}
131131
)

Examples/Examples/Auth/GoogleSignInSDKFlow.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Created by Guilherme Souza on 05/03/24.
66
//
77

8-
@preconcurrency import GoogleSignIn
8+
import GoogleSignIn
99
import GoogleSignInSwift
1010
import Supabase
1111
import SwiftUI

Examples/Examples/Auth/SignInWithApple.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ struct SignInWithApple: View {
6666

6767
private func signInWithApple(using idToken: String, fullName: String?) async {
6868
actionState = .inFlight
69-
let result = await Result {
69+
let result = await Result { @Sendable in
7070
_ = try await supabase.auth.signInWithIdToken(
7171
credentials: .init(
7272
provider: .apple,

Examples/Examples/Auth/SignInWithOAuth.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ struct SignInWithOAuth: View {
1919
VStack {
2020
Picker("Provider", selection: $provider) {
2121
ForEach(providers) { provider in
22-
Text("\(provider)").tag(provider)
22+
Text(provider.rawValue).tag(provider)
2323
}
2424
}
2525

Examples/Examples/Examples.entitlements

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@
66
<array>
77
<string>Default</string>
88
</array>
9-
<key>com.apple.security.app-sandbox</key>
10-
<true/>
11-
<key>com.apple.security.files.user-selected.read-only</key>
12-
<true/>
13-
<key>com.apple.security.network.client</key>
14-
<true/>
159
<key>keychain-access-groups</key>
1610
<array/>
1711
</dict>

Examples/Examples/MFAFlow.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ struct MFAEnrollView: View {
206206
isLoading = true
207207
defer { isLoading = false }
208208

209-
enrollResponse = try await supabase.auth.mfa.enroll(params: MFAEnrollParams())
209+
enrollResponse = try await supabase.auth.mfa.enroll(params: .totp())
210210
} catch {
211211
self.error = error
212212
}

0 commit comments

Comments
 (0)