Merge branch 'main' into feature/custom-views

shapehq · Mar 1, 2025 · 62d2a6e · 62d2a6e
2 parents 7c0a894 + 4c32b27
commit 62d2a6e
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 25 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,13 +13,12 @@ jobs:
   build:
     name: Build
     runs-on: macos-15
-    continue-on-error: true
     strategy:
       matrix:
         include:
-          - xcode: 16.2
+          - xcode: 16.1
             destination: iPhone 16 Pro
-            os: 18.2
+            os: 18.1
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer  
     steps:

diff --git a/.github/workflows/build_documentation.yml b/.github/workflows/build_documentation.yml
@@ -14,11 +14,10 @@ jobs:
   build:
     name: Build Documentation
     runs-on: macos-15
-    continue-on-error: true
     strategy:
       matrix:
         include:
-          - xcode: 16.2
+          - xcode: 16.1
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
     steps:

diff --git a/.github/workflows/build_example_project.yml b/.github/workflows/build_example_project.yml
@@ -15,13 +15,12 @@ jobs:
   build_swiftui:
     name: Build SwiftUI Example Project
     runs-on: macos-15
-    continue-on-error: true
     strategy:
       matrix:
         include:
-          - xcode: 16.2
+          - xcode: 16.1
             destination: iPhone 16 Pro
-            os: 18.2
+            os: 18.1
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
     steps:
@@ -43,9 +42,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - xcode: 16.2
+          - xcode: 16.1
             destination: iPhone 16 Pro
-            os: 18.2
+            os: 18.1
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
     steps:

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -15,8 +15,8 @@ env:
   SWIFTUI_EXAMPLE_XCODE_SCHEME: SwiftUIExample
   UIKIT_EXAMPLE_XCODE_SCHEME: UIKitExample
   EXAMPLE_XCODE_PROJECT_PATH: Examples/Example.xcodeproj
-  BUILD_DESTINATION: platform=iOS Simulator,name=iPhone 16,OS=18.2
-  DEVELOPER_DIR: /Applications/Xcode_16.2.app/Contents/Developer
+  BUILD_DESTINATION: platform=iOS Simulator,name=iPhone 16,OS=18.1
+  DEVELOPER_DIR: /Applications/Xcode_16.1.app/Contents/Developer
 jobs:
   analyze:
     name: Analyze (${{ matrix.language }})

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,13 +10,12 @@ jobs:
   run-tests:
     name: Run Tests
     runs-on: macos-15
-    continue-on-error: true
     strategy:
       matrix:
         include:
-          - xcode: 16.2
+          - xcode: 16.1
             destination: iPhone 16 Pro
-            os: 18.2
+            os: 18.1
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
     steps:

diff --git a/Examples/Example.xcodeproj/project.pbxproj b/Examples/Example.xcodeproj/project.pbxproj
@@ -308,7 +308,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 18.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -366,7 +366,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 18.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
@@ -394,7 +394,6 @@
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -424,7 +423,6 @@
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -452,7 +450,6 @@
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -480,7 +477,6 @@
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@
     - [Step 3: Present the In-App Debug Menu](#step-3-present-the-in-app-debug-menu)
     - [Step 4: Observing Values](#step-4-observing-values)
 - [🧪 Example Projects](#-example-projects)
-- [📖 Reference](#-reference)
+- [📖 Documentation](#-documentation)
   - [Toggles](#toggles)
   - [Pickers](#pickers)
   - [Buttons](#buttons)
@@ -228,9 +228,13 @@ class ContentViewController: UIViewController {
 
 The example projects in the [Examples](/Examples) folder shows how Spices can be used to add an in-app debug menu to iOS apps with SwiftUI and UIKit lifecycles.
 
-## 📖 Reference
+## 📖 Documentation
 
-The following documents the specifics of the framework.
+<a href="https://swiftpackageindex.com/shapehq/spices/documentation"><img src="https://swiftpackageindex.com/images/logo.svg" width="40" align="left" /></a>
+<h3>The documentation is <a href="https://swiftpackageindex.com/shapehq/spices/documentation">available on Swift Package Index</a>.</h3>
+<br/>
+
+The following sections document select APIs and use cases.
 
 ### Toggles
 

diff --git a/Sources/Spices/Spice.swift b/Sources/Spices/Spice.swift
@@ -238,7 +238,7 @@ import SwiftUI
     /// ```
     ///
     /// - Parameters:
-    ///   - wrappedValue: The spice store to creaete hierarchial navigation to.
+    ///   - wrappedValue: The spice store to create hierarchial navigation to.
     ///   - name: The display name of the spice store. Defaults to a formatted version of the property name.
     public init(wrappedValue: Value, name: String? = nil) where Value: SpiceStore {
         self.name = Name(name)