fix docc

KC-2001MS · Oct 9, 2024 · 1f2d4e4 · 1f2d4e4
1 parent a190b7b
commit 1f2d4e4
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 50 deletions.
diff --git a/Note.md b/Note.md
diff --git a/OnboardingUI.xcworkspace/xcshareddata/swiftpm/Package.resolved b/OnboardingUI.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,14 +5,14 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-docc-plugin",
       "state" : {
-        "revision" : "26ac5758409154cc448d7ab82389c520fa8a8247",
-        "version" : "1.3.0"
+        "revision" : "85e4bb4e1cd62cec64a4b8e769dcefdf0c5b9d64",
+        "version" : "1.4.3"
       }
     },
     {
       "identity" : "swift-docc-symbolkit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-docc-symbolkit",
+      "location" : "https://github.com/swiftlang/swift-docc-symbolkit",
       "state" : {
         "revision" : "b45d1f2ed151d057b54504d653e0da5552844e34",
         "version" : "1.0.0"
@@ -21,7 +21,7 @@
     {
       "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-syntax.git",
+      "location" : "https://github.com/swiftlang/swift-syntax.git",
       "state" : {
         "revision" : "82a453c2dfa335c7e778695762438dfe72b328d2",
         "version" : "600.0.0-prerelease-2024-07-24"
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-testing.git",
       "state" : {
-        "revision" : "69d59cfc76e5daf498ca61f5af409f594768eef9",
-        "version" : "0.10.0"
+        "revision" : "c55848b2aa4b29a4df542b235dfdd792a6fbe341",
+        "version" : "0.12.0"
       }
     }
   ],

diff --git a/Package.resolved b/Package.resolved
@@ -5,14 +5,14 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-docc-plugin",
       "state" : {
-        "revision" : "26ac5758409154cc448d7ab82389c520fa8a8247",
-        "version" : "1.3.0"
+        "revision" : "85e4bb4e1cd62cec64a4b8e769dcefdf0c5b9d64",
+        "version" : "1.4.3"
       }
     },
     {
       "identity" : "swift-docc-symbolkit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-docc-symbolkit",
+      "location" : "https://github.com/swiftlang/swift-docc-symbolkit",
       "state" : {
         "revision" : "b45d1f2ed151d057b54504d653e0da5552844e34",
         "version" : "1.0.0"
@@ -21,19 +21,19 @@
     {
       "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-syntax.git",
+      "location" : "https://github.com/swiftlang/swift-syntax.git",
       "state" : {
-        "revision" : "4c6cc0a3b9e8f14b3ae2307c5ccae4de6167ac2c",
-        "version" : "600.0.0-prerelease-2024-06-12"
+        "revision" : "0687f71944021d616d34d922343dcef086855920",
+        "version" : "600.0.1"
       }
     },
     {
       "identity" : "swift-testing",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-testing.git",
       "state" : {
-        "revision" : "69d59cfc76e5daf498ca61f5af409f594768eef9",
-        "version" : "0.10.0"
+        "revision" : "399f76dcd91e4c688ca2301fa24a8cc6d9927211",
+        "version" : "0.99.0"
       }
     }
   ],

diff --git a/Package.swift b/Package.swift
@@ -13,13 +13,16 @@ let package = Package(
             targets: ["OnboardingUI"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.3.0"),
-        .package(url: "https://github.com/apple/swift-testing.git", from: "0.10.0"),
+        .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.4.0"),
+        .package(url: "https://github.com/apple/swift-testing.git", from: "0.12.0"),
     ],
     targets: [
         .target(
             name: "OnboardingUI",
-            dependencies: []
+            resources: [
+//                .process("Media.xcassets"),
+                .process("Localizable.xcstrings")
+            ]
         ),
         .testTarget(
             name: "OnboardingUITests",

diff --git a/Sample/Sample.xcodeproj/project.pbxproj b/Sample/Sample.xcodeproj/project.pbxproj
@@ -346,7 +346,7 @@
 				SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx xros xrsimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,7";
 				TVOS_DEPLOYMENT_TARGET = 15.0;
 				XROS_DEPLOYMENT_TARGET = 1.0;
@@ -390,7 +390,7 @@
 				SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx xros xrsimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,7";
 				TVOS_DEPLOYMENT_TARGET = 15.0;
 				XROS_DEPLOYMENT_TARGET = 1.0;

diff --git a/Sources/OnboardingUI/UI/Modifier/OnboardingSheet.swift b/Sources/OnboardingUI/UI/Modifier/OnboardingSheet.swift
@@ -53,9 +53,9 @@ public extension View {
 }
 
 #Preview {
-    @State var isPresented: Bool = true
+    @Previewable @State var isPresented: Bool = true
 
-    return Group {
+    Group {
         Button(String("Open Onboarding")) {
             isPresented = true
         }

diff --git a/Sources/OnboardingUI/UI/View/OnboardingCardView.swift b/Sources/OnboardingUI/UI/View/OnboardingCardView.swift
@@ -79,9 +79,9 @@ public struct OnboardingCardView<V1: View, V2: View>: View {
 }
 
 #Preview {
-    @State var isPresented = true
+    @Previewable @State var isPresented = true
 
-    return ScrollView {
+    ScrollView {
         OnboardingCardView(isPresented: $isPresented, onboarding: PreviewWhatIsNewOnboarding())
             .padding()
     }

diff --git a/Sources/OnboardingUI/UI/View/Parts/OnboardingButton.swift b/Sources/OnboardingUI/UI/View/Parts/OnboardingButton.swift
@@ -49,7 +49,7 @@ public struct ContinueButton: View {
     /// View
     public var body: some View {
         Button(action: action) {
-            Text("Continue")
+            Text("Continue", bundle: Bundle.module)
         }
 #if !os(tvOS)
         .buttonStyle(ColorButtonStyle(foregroundColor: foregroundColor, backgroundColor: backgroundColor))