🚨 Fixes for Swift 6 language mode

Signed-off-by: Peter Friese <peter@peterfriese.de>
firebase · Nov 13, 2024 · 981852d · 981852d
1 parent 870562f
commit 981852d
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix.xcodeproj/project.pbxproj b/Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix.xcodeproj/project.pbxproj
@@ -285,7 +285,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.samples.FriendlyFlix;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -314,7 +314,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.samples.FriendlyFlix;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/App/FriendlyFlixApp.swift b/Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/App/FriendlyFlixApp.swift
@@ -14,7 +14,7 @@
 
 import Firebase
 import FirebaseAuth
-import FirebaseDataConnect
+@preconcurrency import FirebaseDataConnect
 import FriendlyFlixSDK
 import SwiftUI
 

diff --git a/...dlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Authentication/AuthenticationService.swift b/...dlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Authentication/AuthenticationService.swift
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseAuth
+@preconcurrency import FirebaseAuth
 import Foundation
 import Observation
 
@@ -22,7 +22,7 @@ enum AuthenticationState {
   case authenticated
 }
 
-@Observable
+@Observable @MainActor
 class AuthenticationService {
   var presentingAuthenticationDialog = false
   var presentingAccountDialog = false

diff --git a/Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Details/MovieCardView.swift b/Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Details/MovieCardView.swift
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseDataConnect
+@preconcurrency import FirebaseDataConnect
 import FriendlyFlixSDK
 import NukeUI
 import SwiftUI

diff --git a/Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Home/HomeScreen.swift b/Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Home/HomeScreen.swift
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseDataConnect
+@preconcurrency import FirebaseDataConnect
 import FriendlyFlixSDK
 import SwiftUI
 

diff --git a/Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Home/MovieTeaserView.swift b/Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Home/MovieTeaserView.swift
@@ -67,7 +67,7 @@ struct MovieTeaserView: View {
 }
 
 #Preview {
-  var movie = Movie.mock
+  let movie = Movie.mock
   MovieTeaserView(
     title: movie.title,
     subtitle: movie.description,

diff --git a/Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Library/LibraryScreen.swift b/Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Library/LibraryScreen.swift
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseDataConnect
+@preconcurrency import FirebaseDataConnect
 import FriendlyFlixSDK
 import SwiftUI
 

diff --git a/Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Model/Movie.swift b/Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Model/Movie.swift
@@ -85,7 +85,7 @@ struct Movie: Identifiable, Hashable {
 }
 
 extension Movie: Mockable {
-  static var mockList: [Movie] = [
+  static let mockList: [Movie] = [
     .init(
       title: "The Hitchhiker's Guide to the Galaxy",
       description:
@@ -137,7 +137,7 @@ extension Movie: Mockable {
     ),
   ]
 
-  static var featured = [Movie](mockList.filter { $0.title.contains("The") })
-  static var topMovies = [Movie](mockList.prefix(3))
-  static var watchList = [Movie](mockList.suffix(5))
+  static let featured = [Movie](mockList.filter { $0.title.contains("The") })
+  static let topMovies = [Movie](mockList.prefix(3))
+  static let watchList = [Movie](mockList.suffix(5))
 }