Clean Xcode 16 warning

pixiv · Sep 10, 2024 · 7168c65 · 7168c65
1 parent 3725d99
commit 7168c65
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 66 deletions.
diff --git a/Examples/SwiftUISample/SwiftUISample.xcodeproj/project.pbxproj b/Examples/SwiftUISample/SwiftUISample.xcodeproj/project.pbxproj
@@ -103,7 +103,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1300;
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1600;
 				TargetAttributes = {
 					24651B2A27043658005AD842 = {
 						CreatedOnToolsVersion = 13.0;
@@ -419,6 +419,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
 			name = DebugMaxDeploymentTarget;

diff --git a/Examples/SwiftUISample/SwiftUISample.xcodeproj/xcshareddata/xcschemes/SwiftUISample.xcscheme b/Examples/SwiftUISample/SwiftUISample.xcodeproj/xcshareddata/xcschemes/SwiftUISample.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Examples/UIKitSample/UIKitSample.xcodeproj/xcshareddata/xcschemes/UIKitSample.xcscheme b/Examples/UIKitSample/UIKitSample.xcodeproj/xcshareddata/xcschemes/UIKitSample.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Sources/CharcoalSwiftUI/Components/CharcoalTextField.swift b/Sources/CharcoalSwiftUI/Components/CharcoalTextField.swift
@@ -90,35 +90,42 @@ public extension View {
 }
 
 @available(iOS 15, *)
-#Preview {
+struct CharcoalTextFieldPreview: View {
     @State var text1 = ""
     @State var text2 = ""
-
-    return VStack(spacing: 16) {
-        TextField("Simple text field", text: $text1)
-            .charcoalTextField()
-        TextField("Placeholder", text: $text2)
-            .charcoalTextField(
-                label: .constant("Label"),
-                countLabel: .init(
-                    get: { "\(text2.count)/10" },
-                    set: { _ in }
-                ),
-                assistiveText: .init(
-                    get: { text2.count > 10 ? "Error" : "OK" },
-                    set: { _ in }
-                ),
-                hasError: .init(
-                    get: { text2.count > 10 },
-                    set: { _ in }
+
+    var body: some View {
+        VStack(spacing: 16) {
+            TextField("Simple text field", text: $text1)
+                .charcoalTextField()
+            TextField("Placeholder", text: $text2)
+                .charcoalTextField(
+                    label: .constant("Label"),
+                    countLabel: .init(
+                        get: { "\(text2.count)/10" },
+                        set: { _ in }
+                    ),
+                    assistiveText: .init(
+                        get: { text2.count > 10 ? "Error" : "OK" },
+                        set: { _ in }
+                    ),
+                    hasError: .init(
+                        get: { text2.count > 10 },
+                        set: { _ in }
+                    )
                 )
-            )
-        TextField("", text: .constant("Text"))
-            .disabled(true)
-            .charcoalTextField(
-                label: .constant("Label"),
-                countLabel: .constant("0/10"),
-                assistiveText: .constant("Assistive text")
-            )
-    }.padding()
+            TextField("", text: .constant("Text"))
+                .disabled(true)
+                .charcoalTextField(
+                    label: .constant("Label"),
+                    countLabel: .constant("0/10"),
+                    assistiveText: .constant("Assistive text")
+                )
+        }.padding()
+    }
+}
+
+@available(iOS 15, *)
+#Preview {
+    CharcoalTextFieldPreview()
 }
diff --git a/Sources/CharcoalSwiftUI/Modal/CharcoalModalView.swift b/Sources/CharcoalSwiftUI/Modal/CharcoalModalView.swift
@@ -215,46 +215,53 @@ public extension View {
 }
 
 @available(iOS 17, *)
-#Preview {
+struct CharcoalModalViewPreview: View {
     @State var isPresented = true
     @State var text1: String = ""
+
+    var body: some View {
+        ZStack {
+            Button(action: {
+                isPresented = true
+            }, label: {
+                Text("Show")
+                    .padding()
+            })
+            .charcoalModal(
+                title: "Title",
+                style: .center,
+                isPresented: $isPresented,
+                actions: {
+                    Button(action: {
+                        isPresented = false
+                    }, label: {
+                        Text("OK").frame(maxWidth: .infinity)
+                    }).charcoalPrimaryButton(size: .medium)
 
-    return ZStack {
-        Button(action: {
-            isPresented = true
-        }, label: {
-            Text("Show")
-                .padding()
-        })
-        .charcoalModal(
-            title: "Title",
-            style: .center,
-            isPresented: $isPresented,
-            actions: {
-                Button(action: {
-                    isPresented = false
-                }, label: {
-                    Text("OK").frame(maxWidth: .infinity)
-                }).charcoalPrimaryButton(size: .medium)
-
-                Button(action: {
-                    isPresented = false
-                }, label: {
-                    Text("Dismiss").frame(maxWidth: .infinity)
-                }).charcoalDefaultButton(size: .medium)
-            }
-        ) {
-            NavigationView {
-                VStack(spacing: 10) {
-                    Text("Hello This is a center dialog from Charcoal")
-                        .charcoalTypography16Regular()
-                        .frame(maxWidth: .infinity)
+                    Button(action: {
+                        isPresented = false
+                    }, label: {
+                        Text("Dismiss").frame(maxWidth: .infinity)
+                    }).charcoalDefaultButton(size: .medium)
+                }
+            ) {
+                NavigationView {
+                    VStack(spacing: 10) {
+                        Text("Hello This is a center dialog from Charcoal")
+                            .charcoalTypography16Regular()
+                            .frame(maxWidth: .infinity)
 
-                    TextField("Simple text field", text: $text1).charcoalTextField()
-                }.padding(EdgeInsets(top: 0, leading: 20, bottom: 0, trailing: 20))
-                    .navigationTitle("SwiftUI")
-                    .navigationBarTitleDisplayMode(.inline)
+                        TextField("Simple text field", text: $text1).charcoalTextField()
+                    }.padding(EdgeInsets(top: 0, leading: 20, bottom: 0, trailing: 20))
+                        .navigationTitle("SwiftUI")
+                        .navigationBarTitleDisplayMode(.inline)
+                }
             }
         }
     }
 }
+
+@available(iOS 17, *)
+#Preview {
+    CharcoalModalViewPreview()
+}