From 7e54646773cb09e7f3a3c98557131cc2cdca3d67 Mon Sep 17 00:00:00 2001 From: Daniel Dahan Date: Mon, 23 Sep 2019 09:49:23 -0400 Subject: [PATCH] preparing for 3.1.8 release --- CHANGELOG.md | 6 ++++++ Material.podspec | 2 +- Material.xcodeproj/project.pbxproj | 2 ++ Sources/Info.plist | 2 +- Sources/iOS/Navigation/NavigationBar.swift | 10 ++++------ 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0418ddde..228041de5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 3.1.8 + +- [pr-1269](https://github.com/CosmicMind/Material/pull/1269): Fixed Xcode 11 crash, where layoutMargins are not available before iOS 13. +- [pr-1270](https://github.com/CosmicMind/Material/pull/1270): Fixed missing argument in Swift Package Manager. + + ## 3.1.7 * Fixed Grid issues, where the layout calculations were being deferred and causing inconsistencies in layouts. diff --git a/Material.podspec b/Material.podspec index f42c35c1d..dc9f4eb7a 100755 --- a/Material.podspec +++ b/Material.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Material' - s.version = '3.1.7' + s.version = '3.1.8' s.swift_version = '5.0' s.license = 'BSD-3-Clause' s.summary = 'A UI/UX framework for creating beautiful applications.' diff --git a/Material.xcodeproj/project.pbxproj b/Material.xcodeproj/project.pbxproj index 77fc37c91..62a95ee4d 100644 --- a/Material.xcodeproj/project.pbxproj +++ b/Material.xcodeproj/project.pbxproj @@ -1240,6 +1240,7 @@ INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @rpath/Frameworks"; + MARKETING_VERSION = 3.1.8; PRODUCT_BUNDLE_IDENTIFIER = com.cosmicmind.Material; PRODUCT_NAME = Material; PROVISIONING_PROFILE = ""; @@ -1265,6 +1266,7 @@ INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @rpath/Frameworks"; + MARKETING_VERSION = 3.1.8; PRODUCT_BUNDLE_IDENTIFIER = com.cosmicmind.Material; PRODUCT_NAME = Material; PROVISIONING_PROFILE = ""; diff --git a/Sources/Info.plist b/Sources/Info.plist index d99aaea9a..bb968c7a0 100644 --- a/Sources/Info.plist +++ b/Sources/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.1.7 + $(MARKETING_VERSION) CFBundleSignature ???? CFBundleVersion diff --git a/Sources/iOS/Navigation/NavigationBar.swift b/Sources/iOS/Navigation/NavigationBar.swift index 04be72257..810aabd72 100644 --- a/Sources/iOS/Navigation/NavigationBar.swift +++ b/Sources/iOS/Navigation/NavigationBar.swift @@ -125,15 +125,13 @@ open class NavigationBar: UINavigationBar, Themeable { layoutShadowPath() //iOS 11 added left/right layout margin in subviews of UINavigationBar - //since we do not want to unsafely access private view directly - //iterate subviews to set `layoutMargin` to zero + //since we do not want to unsafely access private views directly, we + //iterate through the subviews to set `layoutMargins` to zero for v in subviews { if #available(iOS 13.0, *) { let margins = v.layoutMargins - var frame = v.frame - frame.origin.x = -margins.left - frame.size.width += (margins.left + margins.right) - v.frame = frame + v.frame.origin.x = -margins.left + v.frame.size.width += margins.left + margins.right } else { v.layoutMargins = .zero }