Merge branch 'release/1.7.2'

Blackjacx · Feb 23, 2021 · f42df27 · f42df27
2 parents cd02554 + 82284c2
commit f42df27
Show file tree

Hide file tree

Showing 14 changed files with 117 additions and 111 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -0,0 +1,5 @@
+## Contributing
+
+- If you found a **bug**, please open an **issue**.
+- If you have a **feature request**, please open an **issue**.
+- If you want to **contribute**, please submit a **pull request**.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,13 +1,6 @@
-## Changed
-- Resolve #123 - issue title
-
-## Fixed
-- Resolve #123 - issue title
-
-## Deleted
+## Issues
 - Resolve #123 - issue title
 
 ## How To Test
 - [ ] 
 - [ ] 
-- [ ] 
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@
 # macos
 **/.DS_Store
 **/.env
+**/.envrc
 
 ## CI
 codesigndoc_exports
@@ -58,13 +59,6 @@ xcuserdata/
 timeline.xctimeline
 playground.xcworkspace
 
-# Swift Package Manager
-#
-# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
-# Packages/
-# Package.pins
-.build/
-
 # CocoaPods
 #
 # We recommend against adding the Pods directory to your .gitignore. However
@@ -79,7 +73,12 @@ Pods/
 # Carthage/Checkouts
 Carthage/Build
 
-# SPM
+# Swift Package Manager
+#
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+# Package.pins
+.build/
 .swiftpm
 
 # fastlane

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## [1.7.2] - 2021-02-23
+* Xcode 12.4 migrations - [@blackjacx](https://github.com/blackjacx).
+* Disables SwiftLint - [@blackjacx](https://github.com/blackjacx).
+
 ## [1.7.1] - 2020-09-09
 * [#31](https://github.com/dbdrive/beiwagen/pull/31): Fix Cells Separator Inset - [@Blackjacx](https://github.com/blackjacx).
 

diff --git a/Example/SourceExample.xcodeproj/project.pbxproj b/Example/SourceExample.xcodeproj/project.pbxproj
@@ -196,7 +196,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 1130;
+				LastUpgradeCheck = 1240;
 				ORGANIZATIONNAME = "Stefan Herold";
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
@@ -365,6 +365,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -420,6 +421,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;

diff --git a/Example/SourceExample.xcodeproj/xcshareddata/xcschemes/Source_Example.xcscheme b/Example/SourceExample.xcodeproj/xcshareddata/xcschemes/Source_Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1240"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"