Temp fix for Xcode 14 beta 6 build

Kyle-Ye · Kyle-Ye · commit ce909fe5cfc9 · 2023-08-09T19:41:11.000+08:00
diff --git a/Forumate.xcodeproj/project.pbxproj b/Forumate.xcodeproj/project.pbxproj
@@ -1237,7 +1237,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.5.0;
+				MARKETING_VERSION = 0.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = top.kyleye.Forumate.watchkitapp;
 				PRODUCT_NAME = Forumate;
 				SDKROOT = watchos;
@@ -1267,7 +1267,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.5.0;
+				MARKETING_VERSION = 0.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = top.kyleye.Forumate.watchkitapp;
 				PRODUCT_NAME = Forumate;
 				SDKROOT = watchos;
@@ -1297,7 +1297,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.5.0;
+				MARKETING_VERSION = 0.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = top.kyleye.Forumate;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
@@ -1325,7 +1325,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.5.0;
+				MARKETING_VERSION = 0.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = top.kyleye.Forumate;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
@@ -1495,7 +1495,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 0.5.0;
+				MARKETING_VERSION = 0.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = top.kyleye.Forumate;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
@@ -1542,7 +1542,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 0.5.0;
+				MARKETING_VERSION = 0.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = top.kyleye.Forumate;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
diff --git a/Forumate/ForumateApp.swift b/Forumate/ForumateApp.swift
@@ -30,7 +30,7 @@ struct ForumateApp: App {
         #if os(iOS) || os(macOS)
         WindowGroup("Topic Detail", id: "topic", for: TopicDetailWindowModel.self) { $detailModel in
             if let detailModel,
-               let community = container.mainContext.object(with: detailModel.communityID) as? Community {
+               let community = container.mainContext.model(for: detailModel.communityID) as? Community {
                 TopicDetail(topic: detailModel.topic)
                     .environmentObject(appState)
                     .environmentObject(CommunityDetailState(community: community))
diff --git a/Forumate/View/Tab/Topics/Community/CommunityDetail/Topic/TopicDetail.swift b/Forumate/View/Tab/Topics/Community/CommunityDetail/Topic/TopicDetail.swift
@@ -46,7 +46,7 @@ struct TopicDetail: View {
                 }
             }
         #if os(iOS) || os(macOS)
-            .toolbar {
+            .toolbar(content: {
                 if supportsMultipleWindows {
                     #if os(iOS)
                     let placement: ToolbarItemPlacement = .navigationBarLeading
@@ -55,13 +55,13 @@ struct TopicDetail: View {
                     #endif
                     ToolbarItem(placement: placement) {
                         Button {
-                            openWindow(value: TopicDetailWindowModel(topic: topic, communityID: state.community.objectID))
+                            openWindow(value: TopicDetailWindowModel(topic: topic, communityID: state.community.persistentModelID))
                         } label: {
                             Label("Open In New Window", systemImage: "macwindow.badge.plus")
                         }
                     }
                 }
-            }
+            })
         #endif
     }
     
diff --git a/Forumate/View/Tab/Topics/Community/CommunityDetail/Topic/TopicLabel.swift b/Forumate/View/Tab/Topics/Community/CommunityDetail/Topic/TopicLabel.swift
@@ -40,7 +40,7 @@ struct TopicLabel: View {
             if supportsMultipleWindows {
                 Button {
                     let model = state.community as (any PersistentModel) // FIXME: Workaround for Xcode 15 beta 5
-                    openWindow(value: TopicDetailWindowModel(topic: topic, communityID: model.objectID))
+                    openWindow(value: TopicDetailWindowModel(topic: topic, communityID: model.persistentModelID))
                 } label: {
                     Label("Open In New Window", systemImage: "macwindow.badge.plus")
                 }
diff --git a/Forumate/View/Tab/Topics/Community/Model/Community.swift b/Forumate/View/Tab/Topics/Community/Model/Community.swift
@@ -11,12 +11,18 @@ import SwiftData
 
 @Model
 final class Community {
-    private(set) var id = UUID()
+    private(set) var id: UUID!
     private(set) var host: URL!
-    private(set) var title = ""
+    private(set) var title: String!
     private(set) var icon: URL?
     
+    init() {
+        self.id = UUID()
+        self.title = ""
+    }
+    
     init(host: URL, title: String = "", icon: URL? = nil) {
+        self.id = UUID()
         self.host = host
         self.title = title
         self.icon = icon
diff --git a/README.md b/README.md
@@ -10,6 +10,8 @@ A native client to access Discourse server for Apple Platforms.
 
 ![Forumate](Forumate/Other/Assets.xcassets/AppIcon.appiconset/AppIcon-macOS-512.png)
 
+### Platform Compatibility
+
 - [x] iOS 17+
 - [x] iPadOS 17+
 - [x] watchOS 10+
@@ -24,12 +26,15 @@ A native client to access Discourse server for Apple Platforms.
 >
 > visionOS is buidable, but is not optimized for. Hope I can get a real device to test for it.
 
-## Download
+### Version Compatibility
 
 - v0.1~v0.3 supports iOS 16+, watchOS 9+ and macOS 13+
-- v0.4.0 supports iOS 17 beta 1, watchOS 10 beta 1 and macOS 14 beta 1
-- v0.4.1 supports iOS 17 beta 2-3, watchOS 10 beta 2-3 and macOS 14 beta 2-3
-- v0.5.0 supports iOS 17 beta 4, watchOS 10 beta 4 and macOS 14 beta 4
+- v0.4.0-beta only supports iOS & iPadOS 17 beta 1, watchOS 10 beta 1 and macOS 14 beta 1
+- v0.4.1-beta only supports iOS & iPadOS 17 beta 2-3, watchOS 10 beta 2-3 and macOS 14 beta 2-3
+- v0.5.0-beta only supports iOS & iPadOS 17 17 beta 4, watchOS 10 beta 4 and macOS 14 beta 4
+- v0.5.1-beta only supports iOS & iPadOS 17 17 beta 5, watchOS 10 beta 5 and macOS 14 beta 5
+
+## Download
 
 ### Mac App Store Release
 
diff --git a/TestFlight/WhatToTest.en-US.txt b/TestFlight/WhatToTest.en-US.txt
@@ -1,4 +1,4 @@
-What's new in v0.5.0-beta
+What's new in v0.5.1-beta
 1. Migrate Community model to SwiftData(iCloud based database) and support iCloud sync now.
 You can now setup your favorite your communities and then they will automatically sync to your other Apple device.
 2. Update AppIcon and you can change the old icon back in the Setting sections.

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ struct TopicDetail: View {`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`#if os(iOS) \|\| os(macOS)`
`49`		`- .toolbar {`
	`49`	`+ .toolbar(content: {`
`50`	`50`	`if supportsMultipleWindows {`
`51`	`51`	`#if os(iOS)`
`52`	`52`	`let placement: ToolbarItemPlacement = .navigationBarLeading`
`@@ -55,13 +55,13 @@ struct TopicDetail: View {`
`55`	`55`	`#endif`
`56`	`56`	`ToolbarItem(placement: placement) {`
`57`	`57`	`Button {`
`58`		`- openWindow(value: TopicDetailWindowModel(topic: topic, communityID: state.community.objectID))`
	`58`	`+ openWindow(value: TopicDetailWindowModel(topic: topic, communityID: state.community.persistentModelID))`
`59`	`59`	`} label: {`
`60`	`60`	`Label("Open In New Window", systemImage: "macwindow.badge.plus")`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`	`}`
`64`		`- }`
	`64`	`+ })`
`65`	`65`	`#endif`
`66`	`66`	`}`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ struct TopicLabel: View {`
`40`	`40`	`if supportsMultipleWindows {`
`41`	`41`	`Button {`
`42`	`42`	`let model = state.community as (any PersistentModel) // FIXME: Workaround for Xcode 15 beta 5`
`43`		`- openWindow(value: TopicDetailWindowModel(topic: topic, communityID: model.objectID))`
	`43`	`+ openWindow(value: TopicDetailWindowModel(topic: topic, communityID: model.persistentModelID))`
`44`	`44`	`} label: {`
`45`	`45`	`Label("Open In New Window", systemImage: "macwindow.badge.plus")`
`46`	`46`	`}`