Up minimal macOS and watchOS versions

oversizedev · May 10, 2022 · 47b7c03 · 47b7c03
1 parent a1cd49f
commit 47b7c03
Show file tree

Hide file tree

Showing 23 changed files with 1,030 additions and 1,017 deletions.
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/OversizeUI.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/OversizeUI.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1320"
+   LastUpgradeVersion = "1330"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
@@ -28,9 +28,6 @@
 		114C9CCF26ECC75300520E04 /* OversizeUI in Frameworks */ = {isa = PBXBuildFile; productRef = 114C9CCE26ECC75300520E04 /* OversizeUI */; };
 		11BE8AF426E9509A0068BBE9 /* ComponentsList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11BE8AF326E9509A0068BBE9 /* ComponentsList.swift */; };
 		11BE8AF526E9509A0068BBE9 /* ComponentsList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11BE8AF326E9509A0068BBE9 /* ComponentsList.swift */; };
-		11BE8AF726E950D50068BBE9 /* ButtonsDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11BE8AF626E950D50068BBE9 /* ButtonsDemo.swift */; };
-		11BE8AF826E950D50068BBE9 /* ButtonsDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11BE8AF626E950D50068BBE9 /* ButtonsDemo.swift */; };
-		11BE8AF926E950D50068BBE9 /* ButtonsDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11BE8AF626E950D50068BBE9 /* ButtonsDemo.swift */; };
 		11BE8AFB26E9512A0068BBE9 /* ColorSelector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11BE8AFA26E9512A0068BBE9 /* ColorSelector.swift */; };
 		11BE8AFC26E9512A0068BBE9 /* ColorSelector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11BE8AFA26E9512A0068BBE9 /* ColorSelector.swift */; };
 		11BE8AFD26E9512A0068BBE9 /* ColorSelector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11BE8AFA26E9512A0068BBE9 /* ColorSelector.swift */; };
@@ -54,7 +51,6 @@
 		11BE8B1526E9564B0068BBE9 /* SelectDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11BE8B1226E9564B0068BBE9 /* SelectDemo.swift */; };
 		11BE8B1926E956A40068BBE9 /* ComponentsList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11BE8AF326E9509A0068BBE9 /* ComponentsList.swift */; };
 		11BE8B1A26E956A60068BBE9 /* ColorSelector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11BE8AFA26E9512A0068BBE9 /* ColorSelector.swift */; };
-		11BE8B1B26E956A60068BBE9 /* ButtonsDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11BE8AF626E950D50068BBE9 /* ButtonsDemo.swift */; };
 		11BE8B1C26E956A60068BBE9 /* AvatarDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11BE8AFE26E954350068BBE9 /* AvatarDemo.swift */; };
 		11BE8B1E26E956A60068BBE9 /* IconsDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11BE8B0626E955560068BBE9 /* IconsDemo.swift */; };
 		11BE8B1F26E956A60068BBE9 /* RowDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11BE8B0A26E9558C0068BBE9 /* RowDemo.swift */; };
@@ -558,7 +554,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1250;
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1330;
 				TargetAttributes = {
 					1101694926E41DE10035CB67 = {
 						CreatedOnToolsVersion = 12.5.1;
@@ -701,7 +697,6 @@
 				11BE8B3726E962840068BBE9 /* ExampleApp.swift in Sources */,
 				11BE8B1A26E956A60068BBE9 /* ColorSelector.swift in Sources */,
 				11BE8B2226E956A60068BBE9 /* SelectDemo.swift in Sources */,
-				11BE8B1B26E956A60068BBE9 /* ButtonsDemo.swift in Sources */,
 				11BE8B3126E957510068BBE9 /* TextFieldDemo.swift in Sources */,
 				11BE8B1C26E956A60068BBE9 /* AvatarDemo.swift in Sources */,
 				1101696526E41DE40035CB67 /* NotificationView.swift in Sources */,
@@ -732,7 +727,6 @@
 				11BE8B3426E95F1C0068BBE9 /* ExampleApp.swift in Sources */,
 				11BE8B1926E956A40068BBE9 /* ComponentsList.swift in Sources */,
 				2D7E2DBD28030EFA00B9884C /* ButtonsDemo.swift in Sources */,
-				11BE8AF926E950D50068BBE9 /* ButtonsDemo.swift in Sources */,
 				11BE8B0926E955560068BBE9 /* IconsDemo.swift in Sources */,
 				11BE8AFD26E9512A0068BBE9 /* ColorSelector.swift in Sources */,
 				11BE8B0526E954D50068BBE9 /* GridSelectDemo.swift in Sources */,
@@ -763,7 +757,6 @@
 				11BE8B2F26E957510068BBE9 /* TextFieldDemo.swift in Sources */,
 				11BE8B0B26E9558C0068BBE9 /* RowDemo.swift in Sources */,
 				11BE8AFB26E9512A0068BBE9 /* ColorSelector.swift in Sources */,
-				11BE8AF726E950D50068BBE9 /* ButtonsDemo.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -784,7 +777,6 @@
 				11BE8B3026E957510068BBE9 /* TextFieldDemo.swift in Sources */,
 				11BE8B0C26E9558C0068BBE9 /* RowDemo.swift in Sources */,
 				11BE8AFC26E9512A0068BBE9 /* ColorSelector.swift in Sources */,
-				11BE8AF826E950D50068BBE9 /* ButtonsDemo.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -863,7 +855,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
-				WATCHOS_DEPLOYMENT_TARGET = 7.4;
+				WATCHOS_DEPLOYMENT_TARGET = 8.0;
 			};
 			name = Debug;
 		};
@@ -889,7 +881,7 @@
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				VALIDATE_PRODUCT = YES;
-				WATCHOS_DEPLOYMENT_TARGET = 7.4;
+				WATCHOS_DEPLOYMENT_TARGET = 8.0;
 			};
 			name = Release;
 		};
@@ -912,7 +904,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
-				WATCHOS_DEPLOYMENT_TARGET = 7.4;
+				WATCHOS_DEPLOYMENT_TARGET = 8.0;
 			};
 			name = Debug;
 		};
@@ -936,7 +928,7 @@
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				VALIDATE_PRODUCT = YES;
-				WATCHOS_DEPLOYMENT_TARGET = 7.4;
+				WATCHOS_DEPLOYMENT_TARGET = 8.0;
 			};
 			name = Release;
 		};
@@ -1029,7 +1021,6 @@
 		110169AB26E423290035CB67 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
 				ENABLE_PREVIEWS = YES;
@@ -1043,14 +1034,13 @@
 				SDKROOT = appletvos;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 14.5;
+				TVOS_DEPLOYMENT_TARGET = 15.0;
 			};
 			name = Debug;
 		};
 		110169AC26E423290035CB67 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
 				ENABLE_PREVIEWS = YES;
@@ -1064,7 +1054,7 @@
 				SDKROOT = appletvos;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 14.5;
+				TVOS_DEPLOYMENT_TARGET = 15.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -1242,7 +1232,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 11.0;
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				PRODUCT_BUNDLE_IDENTIFIER = romanov.cc.Example;
 				PRODUCT_NAME = Example;
 				SDKROOT = macosx;
@@ -1267,7 +1257,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 11.0;
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				PRODUCT_BUNDLE_IDENTIFIER = romanov.cc.Example;
 				PRODUCT_NAME = Example;
 				SDKROOT = macosx;

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

diff --git a/Example/Shared/ComponentsList.swift b/Example/Shared/ComponentsList.swift
@@ -26,15 +26,16 @@ struct ComponentsList: View {
         Page(name: "Avatar", page: AnyView(AvatarDemo())),
         Page(name: "GridSelect", page: AnyView(GridSelectDemo())),
         Page(name: "TextField", page: AnyView(TextFieldDemo())),
-        Page(name: "Icons", page: AnyView(IconsDemo())),
+        //Page(name: "Icons", page: AnyView(IconsDemo())),
         Page(name: "Row", page: AnyView(RowDemo())),
         Page(name: "SegmentedControl", page: AnyView(SegmentedControlDemo())),
         Page(name: "Select", page: AnyView(SelectDemo())),
         Page(name: "Surface", page: AnyView(SurfaceDemo())),
-        Page(name: "Page", page: AnyView(PageDemo())),
+        //Page(name: "Page", page: AnyView(PageDemo())),
     ]
 
     var body: some View {
+        #if os(iOS)
         PageView("Example") {
             ForEach(pages) { page in
                 HStack {
@@ -53,6 +54,9 @@ struct ComponentsList: View {
         .sheet(isPresented: $isShowSetting) {
             AppearanceSettingView()
         }
+        #else
+        Text("Support will be in the future")
+        #endif
     }
 }
 

diff --git a/Example/Shared/DemoPages/AvatarDemo.swift b/Example/Shared/DemoPages/AvatarDemo.swift
@@ -23,7 +23,7 @@ struct AvatarDemo: View {
                 AvatarView(firstName: "Jhon", lastName: "Smith", size: .large, stroke: true)
             }
         }
-        .navigationBarTitle("Avatar", displayMode: .inline)
+        .navigationTitle("Avatar")
     }
 }
 

diff --git a/Example/Shared/DemoPages/ButtonsDemo.swift b/Example/Shared/DemoPages/ButtonsDemo.swift
@@ -36,7 +36,7 @@ struct ButtonsDemo: View {
 
             }.padding()
         }
-        .navigationBarTitle("Buttons", displayMode: .inline)
+        .navigationTitle("Buttons")
     }
 }
 

diff --git a/Example/Shared/DemoPages/GridSelectDemo.swift b/Example/Shared/DemoPages/GridSelectDemo.swift
@@ -38,7 +38,7 @@ struct GridSelectDemo: View {
             }
             .padding()
         }
-        .navigationBarTitle("Grid select", displayMode: .inline)
+        .navigationTitle("Grid select")
     }
 }
 

diff --git a/Example/Shared/DemoPages/IconsDemo.swift b/Example/Shared/DemoPages/IconsDemo.swift
@@ -6,6 +6,7 @@
 import OversizeUI
 import SwiftUI
 
+#if os(iOS)
 struct IconsDemo: View {
     let grid = [GridItem(),
                 GridItem(),
@@ -16,21 +17,14 @@ struct IconsDemo: View {
     var body: some View {
         PageView("Icons") {
             LazyVGrid(columns: grid) {
-                ForEach(Icons.allCases, id: \.self) { icon in
+                ForEach(IconsNames.allCases, id: \.self) { icon in
                     Icon(icon)
                         .padding(.vertical)
                 }
             }
             .padding()
         }
         .modalable()
-        // .closeable()
-//
-//
-//        ScrollView {
-//
-//        }
-//        .navigationBarTitle("Icons", displayMode: .inline)
     }
 }
 
@@ -39,3 +33,4 @@ struct IconsDemo_Previews: PreviewProvider {
         IconsDemo()
     }
 }
+#endif
diff --git a/Example/Shared/DemoPages/PageDemo.swift b/Example/Shared/DemoPages/PageDemo.swift
@@ -6,6 +6,7 @@
 import OversizeUI
 import SwiftUI
 
+#if os(iOS)
 struct PageDemo: View {
     @Environment(\.screenSize) var screenSize
     @State var isShowModal = false
@@ -54,3 +55,4 @@ struct PageDemo_Previews: PreviewProvider {
         PageDemo()
     }
 }
+#endif
diff --git a/Example/Shared/DemoPages/SegmentedControlDemo.swift b/Example/Shared/DemoPages/SegmentedControlDemo.swift
@@ -87,7 +87,7 @@ struct SegmentedControlDemo: View {
                     .controlRadius(.xLarge)
                 }
             }.padding()
-        }.navigationBarTitle("Segmented control", displayMode: .inline)
+        }.navigationTitle("Segmented control")
     }
 }
 

diff --git a/Example/Shared/DemoPages/SurfaceDemo.swift b/Example/Shared/DemoPages/SurfaceDemo.swift
@@ -43,7 +43,8 @@ struct SurfaceDemo: View {
                 .elevation(.z1)
             }
             .padding()
-        }.navigationBarTitle("Surface", displayMode: .inline)
+        }
+        .navigationTitle("Surface")
     }
 }
 

diff --git a/Example/Shared/DemoPages/TextFieldDemo.swift b/Example/Shared/DemoPages/TextFieldDemo.swift
@@ -32,7 +32,9 @@ struct TextFieldDemo: View {
                     .helper(.constant("Error"), style: .constant(.errorText))
 
             }.padding()
-        }.navigationBarTitle("Text fields", displayMode: .inline)
+        }
+
+        .navigationTitle("Text fields")
     }
 }
 

diff --git a/Package.swift b/Package.swift
@@ -9,9 +9,9 @@ let package = Package(
     defaultLocalization: "en",
     platforms: [
         .iOS(.v14),
-        .macOS(.v11),
+        .macOS(.v12),
         .tvOS(.v14),
-        .watchOS(.v7),
+        .watchOS(.v8),
     ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.

diff --git a/Sources/OversizeUI/Controls/ContentView/ContentView.swift b/Sources/OversizeUI/Controls/ContentView/ContentView.swift
@@ -27,7 +27,6 @@ public struct ContentView: View {
     private let primaryButton: ContenButtonType?
     private let secondaryButton: ContenButtonType?
 
-
     public init(image: Image?,
                 title: String,
                 subtitle: String?,
@@ -50,11 +49,10 @@ public struct ContentView: View {
             }
 
             TextBox(title: title, subtitle: subtitle)
-            
+
             primaryButtonView()
-            
+
             secondaryButtonView()
-
         }
     }
 
@@ -131,12 +129,12 @@ extension ContentView {
             }
             .style(.gray)
             .disabled(true)
-            
+
         case .none:
             EmptyView()
         }
     }
-    
+
     @ViewBuilder
     private func secondaryButtonView() -> some View {
         switch secondaryButton {
@@ -196,10 +194,9 @@ extension ContentView {
             }
             .style(.gray)
             .disabled(true)
-            
+
         case .none:
             EmptyView()
         }
     }
 }
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ struct AvatarDemo: View { @@
                     AvatarView(firstName: "Jhon", lastName: "Smith", size: .large, stroke: true)
                 }
             }
-            .navigationBarTitle("Avatar", displayMode: .inline)
+            .navigationTitle("Avatar")
         }
     }
@@ Expand Down @@