From 0b35d0d24797e8355193bc08c08c03640be046d1 Mon Sep 17 00:00:00 2001 From: Alex Young Date: Thu, 26 Mar 2020 20:43:49 -0700 Subject: [PATCH] deployment target (#87) --- GridDemo.xcodeproj/project.pbxproj | 8 ++++++-- README.md | 4 ++-- Sources/Grid/Grid.swift | 10 +++++----- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/GridDemo.xcodeproj/project.pbxproj b/GridDemo.xcodeproj/project.pbxproj index 1a1312f..b733880 100644 --- a/GridDemo.xcodeproj/project.pbxproj +++ b/GridDemo.xcodeproj/project.pbxproj @@ -812,6 +812,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.1; + MACOSX_DEPLOYMENT_TARGET = 10.15; ONLY_ACTIVE_ARCH = YES; }; name = Debug; @@ -844,6 +846,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.1; + MACOSX_DEPLOYMENT_TARGET = 10.15; }; name = Release; }; @@ -903,7 +907,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "GridDemo iOS/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 13.2; + IPHONEOS_DEPLOYMENT_TARGET = 13.1; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -971,7 +975,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "GridDemo iOS/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 13.2; + IPHONEOS_DEPLOYMENT_TARGET = 13.1; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/README.md b/README.md index d3442ba..d63580b 100644 --- a/README.md +++ b/README.md @@ -120,8 +120,8 @@ struct CardsView: View { ``` ## SDKs -- iOS 13+ -- Mac Catalyst 13.0+ +- iOS 13.1+ +- Mac Catalyst 13.1+ - macOS 10.15+ - watchOS 6+ - Xcode 11.0+ diff --git a/Sources/Grid/Grid.swift b/Sources/Grid/Grid.swift index 5229111..261f7c5 100644 --- a/Sources/Grid/Grid.swift +++ b/Sources/Grid/Grid.swift @@ -24,14 +24,14 @@ public struct Grid: View where Content: View { .transformPreference(GridPreferencesKey.self) { self.style.transform(preferences: &$0, in: geometry.size) } - .onPreferenceChange(GridPreferencesKey.self) { preferences in - self.preferences = preferences - } - + } + .onPreferenceChange(GridPreferencesKey.self) { preferences in + self.preferences = preferences } .frame( width: self.style.axis == .horizontal ? self.preferences.size.width : nil, - height: self.style.axis == .vertical ? self.preferences.size.height : nil + height: self.style.axis == .vertical ? self.preferences.size.height : nil, + alignment: .topLeading ) } }