preparing for 3.1.8 release

CosmicMind · Sep 23, 2019 · 7e54646 · 7e54646
1 parent 06da62b
commit 7e54646
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.7</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git 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
       }