From 7118ec3b02d995bb2778b80b427a6c4a4e953f53 Mon Sep 17 00:00:00 2001
From: relikd <info@relikd.de>
Date: Thu, 17 Sep 2020 16:41:18 +0200
Subject: [PATCH] Update to Xcode 12

---
 AppCheck.xcodeproj/project.pbxproj                        | 4 +++-
 .../xcshareddata/xcschemes/AppCheck.xcscheme              | 2 +-
 .../xcshareddata/xcschemes/GlassVPN.xcscheme              | 2 +-
 main/Push Notifications/UNNotification.swift              | 1 +
 main/Recordings/VCRecordings.swift                        | 8 ++++----
 main/TBCMain.swift                                        | 4 ++--
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/AppCheck.xcodeproj/project.pbxproj b/AppCheck.xcodeproj/project.pbxproj
index 1f3ec2e..885f8da 100644
--- a/AppCheck.xcodeproj/project.pbxproj
+++ b/AppCheck.xcodeproj/project.pbxproj
@@ -876,7 +876,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1130;
-				LastUpgradeCheck = 1010;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = relikd;
 				TargetAttributes = {
 					541AC5D32399498A00A769D7 = {
@@ -1204,6 +1204,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;
@@ -1268,6 +1269,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/AppCheck.xcodeproj/xcshareddata/xcschemes/AppCheck.xcscheme b/AppCheck.xcodeproj/xcshareddata/xcschemes/AppCheck.xcscheme
index 2dd6982..7f08cad 100644
--- a/AppCheck.xcodeproj/xcshareddata/xcschemes/AppCheck.xcscheme
+++ b/AppCheck.xcodeproj/xcshareddata/xcschemes/AppCheck.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/AppCheck.xcodeproj/xcshareddata/xcschemes/GlassVPN.xcscheme b/AppCheck.xcodeproj/xcshareddata/xcschemes/GlassVPN.xcscheme
index 25a3acb..1970eb4 100644
--- a/AppCheck.xcodeproj/xcshareddata/xcschemes/GlassVPN.xcscheme
+++ b/AppCheck.xcodeproj/xcshareddata/xcschemes/GlassVPN.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1200"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction
diff --git a/main/Push Notifications/UNNotification.swift b/main/Push Notifications/UNNotification.swift
index 61de3a5..6cefebe 100644
--- a/main/Push Notifications/UNNotification.swift	
+++ b/main/Push Notifications/UNNotification.swift	
@@ -9,6 +9,7 @@ enum NotificationRequestState {
 		case .authorized: self = .Authorized
 		case .provisional: self = .Provisional
 		case .notDetermined: fallthrough
+		case .ephemeral: fallthrough
 		@unknown default: self = .NotDetermined
 		}
 	}
diff --git a/main/Recordings/VCRecordings.swift b/main/Recordings/VCRecordings.swift
index 90c0a8e..944df2f 100644
--- a/main/Recordings/VCRecordings.swift
+++ b/main/Recordings/VCRecordings.swift
@@ -30,9 +30,9 @@ class VCRecordings: UIViewController, UINavigationControllerDelegate {
 				x.addSheet().addArrangedSubview(TinyMarkdown.load("tut-recording-1"))
 				x.addSheet().addArrangedSubview(TinyMarkdown.load("tut-recording-2"))
 				x.buttonTitleDone = "Got it"
-				x.present {
+				x.present(didClose: {
 					Prefs.DidShowTutorial.Recordings = true
-				}
+				})
 			}
 		}
 	}
@@ -55,9 +55,9 @@ class VCRecordings: UIViewController, UINavigationControllerDelegate {
 		let x = TutorialSheet()
 		x.addSheet().addArrangedSubview(TinyMarkdown.load("tut-recording-howto"))
 		x.buttonTitleDone = "Close"
-		x.present() {
+		x.present(didClose: {
 			Prefs.DidShowTutorial.RecordingHowTo = true
-		}
+		})
 	}
 	
 	
diff --git a/main/TBCMain.swift b/main/TBCMain.swift
index 36803ec..7485261 100644
--- a/main/TBCMain.swift
+++ b/main/TBCMain.swift
@@ -36,9 +36,9 @@ class TBCMain: UITabBarController {
 		let x = TutorialSheet()
 		x.addSheet().addArrangedSubview(TinyMarkdown.load("tut-welcome-1"))
 		x.addSheet().addArrangedSubview(TinyMarkdown.load("tut-welcome-2"))
-		x.present {
+		x.present(didClose: {
 			Prefs.DidShowTutorial.Welcome = true
-		}
+		})
 	}
 }