Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
strategy:
matrix:
destination:
- platform=iOS Simulator,name=iPhone 16,OS=18.1
- platform=watchOS Simulator,name=Apple Watch SE (40mm) (2nd generation),OS=11.1
- platform=tvOS Simulator,name=Apple TV 4K (3rd generation) (at 1080p),OS=18.1
- platform=iOS Simulator,name=iPhone 17 Pro,OS=26.2
- platform=watchOS Simulator,name=Apple Watch SE 3 (40mm),OS=26.2
- platform=tvOS Simulator,name=Apple TV 4K (3rd generation) (at 1080p),OS=26.2
- platform=macOS,arch=arm64
with:
package: OversizeUI
Expand All @@ -33,8 +33,8 @@ jobs:
strategy:
matrix:
destination:
- platform=iOS Simulator,name=iPhone 16 Pro,OS=18.1
- platform=iOS Simulator,name=iPad (10th generation),OS=18.1
- platform=iOS Simulator,name=iPhone 17 Pro,OS=26.2
- platform=iOS Simulator,name=iPad Air 11-inch (M3),OS=26.2
with:
path: Example/Example
scheme: Example (iOS)
Expand All @@ -58,8 +58,8 @@ jobs:
strategy:
matrix:
destination:
- platform=tvOS Simulator,name=Apple TV 4K (3rd generation) (at 1080p),OS=18.1
- platform=tvOS Simulator,name=Apple TV 4K (3rd generation),OS=18.1
- platform=tvOS Simulator,name=Apple TV 4K (3rd generation) (at 1080p),OS=26.2
- platform=tvOS Simulator,name=Apple TV 4K (3rd generation),OS=26.2
with:
path: Example/Example
scheme: Example (tvOS)
Expand All @@ -73,7 +73,7 @@ jobs:
strategy:
matrix:
destination:
- platform=watchOS Simulator,name=Apple Watch SE (40mm) (2nd generation),OS=11.1
- platform=watchOS Simulator,name=Apple Watch SE 3 (40mm),OS=26.2
with:
path: Example/Example
scheme: Example (watchOS)
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ DerivedData/
/.idea/
/Package.resolved
/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm
/AGENTS.md
/CLAUDE.md
52 changes: 23 additions & 29 deletions Example/Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@
attributes = {
BuildIndependentTargetsInParallel = YES;
LastSwiftUpdateCheck = 1250;
LastUpgradeCheck = 1610;
LastUpgradeCheck = 2620;
TargetAttributes = {
1101694926E41DE10035CB67 = {
CreatedOnToolsVersion = 12.5.1;
Expand Down Expand Up @@ -755,8 +755,7 @@
buildSettings = {
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = ER582ZK85C;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
IPHONEOS_DEPLOYMENT_TARGET = 18.6;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = romanov.cc.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -770,8 +769,7 @@
buildSettings = {
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = ER582ZK85C;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
IPHONEOS_DEPLOYMENT_TARGET = 18.6;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = romanov.cc.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -789,7 +787,6 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = ER582ZK85C;
INFOPLIST_FILE = "Example WatchKit App/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"@executable_path/Frameworks",
Expand All @@ -802,7 +799,7 @@
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 9.0;
WATCHOS_DEPLOYMENT_TARGET = 11.6;
};
name = Debug;
};
Expand All @@ -814,7 +811,6 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = ER582ZK85C;
INFOPLIST_FILE = "Example WatchKit App/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"@executable_path/Frameworks",
Expand All @@ -827,7 +823,7 @@
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = 4;
VALIDATE_PRODUCT = YES;
WATCHOS_DEPLOYMENT_TARGET = 9.0;
WATCHOS_DEPLOYMENT_TARGET = 11.6;
};
name = Release;
};
Expand All @@ -836,7 +832,6 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = ER582ZK85C;
INFOPLIST_FILE = ExampleTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -849,7 +844,7 @@
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = 4;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example (watchOS).app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Example (watchOS)";
WATCHOS_DEPLOYMENT_TARGET = 9.0;
WATCHOS_DEPLOYMENT_TARGET = 11.6;
};
name = Debug;
};
Expand All @@ -858,7 +853,6 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = ER582ZK85C;
INFOPLIST_FILE = ExampleTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -872,15 +866,14 @@
TARGETED_DEVICE_FAMILY = 4;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example (watchOS).app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Example (watchOS)";
VALIDATE_PRODUCT = YES;
WATCHOS_DEPLOYMENT_TARGET = 9.0;
WATCHOS_DEPLOYMENT_TARGET = 11.6;
};
name = Release;
};
1101698F26E41DE50035CB67 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = ER582ZK85C;
INFOPLIST_FILE = ExampleUITests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -893,15 +886,14 @@
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = 4;
TEST_TARGET_NAME = "Example WatchKit App";
WATCHOS_DEPLOYMENT_TARGET = 9.0;
WATCHOS_DEPLOYMENT_TARGET = 11.6;
};
name = Debug;
};
1101699026E41DE50035CB67 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = ER582ZK85C;
INFOPLIST_FILE = ExampleUITests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -915,7 +907,7 @@
TARGETED_DEVICE_FAMILY = 4;
TEST_TARGET_NAME = "Example WatchKit App";
VALIDATE_PRODUCT = YES;
WATCHOS_DEPLOYMENT_TARGET = 9.0;
WATCHOS_DEPLOYMENT_TARGET = 11.6;
};
name = Release;
};
Expand All @@ -924,7 +916,6 @@
buildSettings = {
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = ER582ZK85C;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = tvOS/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -936,7 +927,7 @@
SDKROOT = appletvos;
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 15.0;
TVOS_DEPLOYMENT_TARGET = 18.6;
};
name = Debug;
};
Expand All @@ -945,7 +936,6 @@
buildSettings = {
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = ER582ZK85C;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = tvOS/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -957,7 +947,7 @@
SDKROOT = appletvos;
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 15.0;
TVOS_DEPLOYMENT_TARGET = 18.6;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand Down Expand Up @@ -999,6 +989,7 @@
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = ER582ZK85C;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
Expand All @@ -1019,6 +1010,7 @@
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
Expand Down Expand Up @@ -1061,6 +1053,7 @@
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = ER582ZK85C;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
Expand All @@ -1074,6 +1067,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
};
Expand All @@ -1085,10 +1079,9 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = ER582ZK85C;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = iOS/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
IPHONEOS_DEPLOYMENT_TARGET = 18.6;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -1107,10 +1100,9 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = ER582ZK85C;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = iOS/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
IPHONEOS_DEPLOYMENT_TARGET = 18.6;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -1134,15 +1126,16 @@
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = ER582ZK85C;
ENABLE_APP_SANDBOX = YES;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
ENABLE_USER_SELECTED_FILES = readonly;
INFOPLIST_FILE = macOS/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 14.0;
MACOSX_DEPLOYMENT_TARGET = 15.6;
PRODUCT_BUNDLE_IDENTIFIER = romanov.cc.Example;
PRODUCT_NAME = Example;
SDKROOT = macosx;
Expand All @@ -1160,15 +1153,16 @@
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = ER582ZK85C;
ENABLE_APP_SANDBOX = YES;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
ENABLE_USER_SELECTED_FILES = readonly;
INFOPLIST_FILE = macOS/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 14.0;
MACOSX_DEPLOYMENT_TARGET = 15.6;
PRODUCT_BUNDLE_IDENTIFIER = romanov.cc.Example;
PRODUCT_NAME = Example;
SDKROOT = macosx;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1610"
LastUpgradeVersion = "2620"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1610"
LastUpgradeVersion = "2620"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Example/Shared/DemoPages/SegmentedControlDemo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ struct SegmentedControlDemo: View {
Text(item)
Text("Subtitle")
.subheadline()
.onSurfacePrimaryForeground()
.onSurfacePrimary()
}
}
.segmentedControlStyle(SelectionOnlySegmentedControlStyle())
Expand Down
20 changes: 14 additions & 6 deletions Example/Shared/DemoPages/SelectDemo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,22 @@ struct SelectDemo: View {

var body: some View {
PageView("Select") {
VStack {
Select("Select", items, selection: $selection) { item, isSelect in
Radio(item, isOn: isSelect)
} selectionView: { selected in
Text(selected)
if #available(iOS 17.0, watchOS 10.0, tvOS 17.0, *) {
VStack {
Select("Select", items, selection: $selection) { item, isSelect in
Radio(item, isOn: isSelect)
} selectionView: { selected in
Text(selected)
}
}
.padding()
} else {
VStack {
Text("Select is available in iOS 17.0, watchOS 10.0, tvOS 17.0 or newer")
.foregroundColor(.onSurfaceSecondary)
}
.padding()
}
.padding()
}
.leadingBar {
BarButton(.back)
Expand Down
2 changes: 1 addition & 1 deletion Example/Shared/DemoPages/SurfaceDemo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ struct SurfaceDemo: View {
Surface {
Text("Text")
.title3()
.onSurfacePrimaryForeground()
.onSurfacePrimary()
}
.surfaceStyle(.secondary)

Expand Down
7 changes: 1 addition & 6 deletions Example/macOS/macOS.entitlements
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.files.user-selected.read-only</key>
<true/>
</dict>
<dict/>
</plist>
Loading